jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

multiple heredocs on one line word OK

Browse source
This commit is contained in:
Jack Halford 2017-02-15 00:00:39 +01:00
parent c764027070
commit 3f984ad498
7 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
42sh/src/exec/process_redirect.c
View file

@ -30,11 +30,9 @@ int process_redirect(t_process *p)
int i;
redirs = p->redirs;
DG("process redirect");
while (redirs)
{
redir = redirs->content;
DG("process redirect 2, type=[%i]", redir->type);
if (redir->n > 9)
return (bad_fd(redir->n));
i = 0;

1
42sh/src/job-control/job_wait.c
View file

@ -17,7 +17,6 @@ int job_wait(int id)
pid_t pid;
int status;
DG("gonna wait [%i]", id);
if (job_is_stopped(id))
return (0);
job_update_status();

1
42sh/src/lexer/lexer_end.c
View file

@ -4,7 +4,6 @@ int lexer_end(t_list **alst, t_lexer *lexer)
{
t_token *token;
DG("check");
if ((*alst && (lexer->state == QUOTE
|| lexer->state == DQUOTE
|| lexer->state == BQUOTE))

1
42sh/src/lexer/lexer_lex.c
View file

@ -44,7 +44,6 @@ int lexer_lex(t_list **alst, t_lexer *lexer)
{
t_token *token;
DG("check 01, state=[%i]", lexer->state);
if (lexer->str[lexer->pos] == 0)
return (lexer_end(alst, lexer));
if (!*alst)

1
42sh/src/lexer/lexer_sep.c
View file

@ -18,6 +18,7 @@ int lexer_sep(t_list **alst, t_lexer *lexer)
char c;
char cn;
lexer->state = DEFAULT;
if (*alst)
{
token = (*alst)->content;

8
42sh/src/lexer_dless.c
View file

@ -28,9 +28,11 @@ int lexer_dless(t_list **alst, t_lexer *lexer)
{
pop(&lexer->stack);
pop(&lexer->heredoc_stack);
return (0);
while (lexer->str[++lexer->pos])
;
}
while (lexer->str[lexer->pos])
token_append_char(heredoc_tok, lexer->str[lexer->pos++], 0, 0);
else
while (lexer->str[lexer->pos])
token_append_char(heredoc_tok, lexer->str[lexer->pos++], 0, 0);
return (lexer_end(alst, lexer));
}

5
42sh/src/main/main.c
View file

@ -54,25 +54,20 @@ int interactive_shell()
ast = NULL;
do {
ft_strappend(&lexer.str, readline(stack_to_prompt(lexer.stack)));
DG("check 0");
if (get_lexer_stack(lexer) == BACKSLASH)
pop(&lexer.stack);
else if (get_lexer_stack(lexer) == DLESS)
lexer.state = DLESS;
DG("check 1");
ltoken = ft_lstlast(token);
if (lexer_lex((token ? &ltoken : &token), &lexer))
return (1);
DG("check 2");
DG("[{mag}%s{eoc}] stack=[%i] state=[%i]", lexer.str, lexer.stack ? *(int*)lexer.stack->content : 0, lexer.state);
DG("check 3");
token_print(token);
} while (get_lexer_stack(lexer));
if (bquotes_expand(&token))
return (1);
if (!token)
return (0);
token_print(token);
if (ft_parse(&ast, &token))
return (1);
btree_print(STDBUG, ast, &ft_putast);