aboutsummaryrefslogtreecommitdiff
path: root/src/lexer/lexer.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-06-15 13:12:34 +0200
committerCharles <sircharlesaze@gmail.com>2020-06-15 13:12:34 +0200
commitb8623ff168880845c745da62f7e9a840f0541809 (patch)
tree23ca8f41c6bdeb5f4fb3a229ee03a7f76c931eb0 /src/lexer/lexer.c
parent11a719bab26b3ccccbd219decab2d0cf77021004 (diff)
parenta7dae7d30b7087bcd9972792a2ee1248e081cfce (diff)
downloadminishell-b8623ff168880845c745da62f7e9a840f0541809.tar.gz
minishell-b8623ff168880845c745da62f7e9a840f0541809.tar.bz2
minishell-b8623ff168880845c745da62f7e9a840f0541809.zip
Merge branch 'parser'
Diffstat (limited to 'src/lexer/lexer.c')
-rw-r--r--src/lexer/lexer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 29cea9c..079d77d 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -109,7 +109,7 @@ enum e_token_tag token_str_or_cote(t_token *lst_token)
{
if(lst_token->content[i] == '\'')
{
- lst_token->tag = TAG_STR_SINGLE;
+ return (lst_token->tag = TAG_STR_SINGLE);
return(token_verif_stick(lst_token));
}
if(lst_token->content[i] == '"')
@@ -132,11 +132,12 @@ t_token *push_token_enum_and_trim(t_token *lst_token)
enum e_token_tag tk;
tk = ret_token(lst_token->content, 0);
+
if (tk == 0)
- {
lst_token->tag = token_str_or_cote(lst_token);
- }
- /* printf("%s-, %d\n",lst_token->content, (int)lst_token->tag); */
+ else
+ lst_token->tag = tk;
+ //printf("%s-, %d\n",lst_token->content, lst_token->tag);
return (lst_token);
}
@@ -173,6 +174,5 @@ t_ftlst *lexer(char *input)
return(0);
*lst = create_token_list(input, lst);
/* i = ft_lstsize(*lst); */
- free(lst);
- return (0);
+ return (*lst);
}