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

issue #46

Browse source
This commit is contained in:
Jack Halford 2017-02-27 16:59:28 +01:00
parent 4ea6fb5801
commit 9a29a9dcb3
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
42sh/libft

@ -1 +1 @@
Subproject commit 9aa3049dd23424807316a6f027589a95cdf1fcdd Subproject commit bfc8ca207ab4d39f0140322c0f1d368137304a3c

3
42sh/src/lexer/lexer_great.c
View file

@ -17,8 +17,9 @@ int lexer_great(t_list **alst, t_lexer *lexer)
t_token *token; t_token *token;
token = (*alst)->content; token = (*alst)->content;
if (token->type)
return (lexer_lex(&(*alst)->next, lexer));
token_append(token, lexer, 0, 0); token_append(token, lexer, 0, 0);
DG("lexer->str=[%s]", lexer->str);
lexer->pos++; lexer->pos++;
if (lexer->str[lexer->pos] == '&') if (lexer->str[lexer->pos] == '&')
{ {

3
42sh/src/lexer/lexer_greatand.c
View file

@ -18,6 +18,7 @@ int lexer_greatand(t_list **alst, t_lexer *lexer)
token = (*alst)->content; token = (*alst)->content;
token->type = TK_GREATAND; token->type = TK_GREATAND;
DG("lexer->str=[%s]", lexer->str + lexer->pos);
if (ft_isdigit(lexer->str[lexer->pos])) if (ft_isdigit(lexer->str[lexer->pos]))
{ {
token_append(token, lexer, 0, 0); token_append(token, lexer, 0, 0);
@ -32,5 +33,5 @@ int lexer_greatand(t_list **alst, t_lexer *lexer)
return (lexer_lex(&(*alst)->next, lexer)); return (lexer_lex(&(*alst)->next, lexer));
} }
lexer->state = DEFAULT; lexer->state = DEFAULT;
return (lexer_lex(alst, lexer)); return (lexer_lex(&(*alst)->next, lexer));
} }

2
42sh/src/lexer/lexer_less.c
View file

@ -17,6 +17,8 @@ int lexer_less(t_list **alst, t_lexer *lexer)
t_token *token; t_token *token;
token = (*alst)->content; token = (*alst)->content;
if (token->type)
return (lexer_lex(&(*alst)->next, lexer));
token_append(token, lexer, 0, 0); token_append(token, lexer, 0, 0);
lexer->pos++; lexer->pos++;
if (lexer->str[lexer->pos] == '&') if (lexer->str[lexer->pos] == '&')

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

@ -62,7 +62,7 @@ int interactive_shell()
ltoken = ft_lstlast(token); ltoken = ft_lstlast(token);
if (lexer_lex(token ? &ltoken : &token, &lexer)) if (lexer_lex(token ? &ltoken : &token, &lexer))
return (1); return (1);
//token_print(token); token_print(token);
} while (get_lexer_stack(lexer)); } while (get_lexer_stack(lexer));
// if (bquotes_expand(&token)) // if (bquotes_expand(&token))
// return (1); // return (1);