Merge branch 'pda_execution' of https://github.com/jzck/minishell into pda_execution
This commit is contained in:
commit
510a0c303a
1 changed files with 10 additions and 6 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2016/12/03 12:06:45 by jhalford #+# #+# */
|
||||
/* Updated: 2017/03/05 16:03:31 by wescande ### ########.fr */
|
||||
/* Updated: 2017/03/05 17:15:52 by wescande ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -26,14 +26,20 @@ int lexer_number(t_list **alst, t_lexer *lexer)
|
|||
return (lexer_lex(alst, lexer));
|
||||
}
|
||||
else if (ft_isdigit(lexer->str[lexer->pos])
|
||||
&& (ft_isdigit(lexer->str[lexer->pos + 1])
|
||||
|| lexer->str[lexer->pos + 1] == '>'
|
||||
|| lexer->str[lexer->pos + 1] == '<'))
|
||||
&& ft_isdigit(lexer->str[lexer->pos + 1]))
|
||||
{
|
||||
token_append(token, lexer, 0, 0);
|
||||
lexer->pos++;
|
||||
return (lexer_number(alst, lexer));
|
||||
}
|
||||
else if (ft_isdigit(lexer->str[lexer->pos])
|
||||
&& (lexer->str[lexer->pos + 1] == '>'
|
||||
|| lexer->str[lexer->pos + 1] == '<'))
|
||||
{
|
||||
token_append(token, lexer, 0, 0);
|
||||
lexer->pos++;
|
||||
return (lexer_lex(&(*alst)->next, lexer));
|
||||
}
|
||||
else
|
||||
{
|
||||
token->type = TK_WORD;
|
||||
|
|
@ -41,8 +47,6 @@ int lexer_number(t_list **alst, t_lexer *lexer)
|
|||
lexer->pos++;
|
||||
return (lexer_lex(alst, lexer));
|
||||
}
|
||||
lexer->state = DEFAULT;
|
||||
return (lexer_lex(alst, lexer));
|
||||
}
|
||||
/*
|
||||
int lexer_number(t_list **alst, t_lexer *lexer)
|
||||
|
|
|
|||
Loading…
Reference in a new issue