diff options
| author | nass1pro <nass1pro@gmail.com> | 2020-06-14 09:39:13 +0200 |
|---|---|---|
| committer | nass1pro <nass1pro@gmail.com> | 2020-06-14 09:39:13 +0200 |
| commit | 1d455c5b8ba3ecd7fa0b0a5a6718bc6cd7fbd8d9 (patch) | |
| tree | d8f54d290f2e301ff689dae879305eee5d2a0394 /src | |
| parent | cadd588473f82cdbbfdb7210bddd22262561faf3 (diff) | |
| download | minishell-1d455c5b8ba3ecd7fa0b0a5a6718bc6cd7fbd8d9.tar.gz minishell-1d455c5b8ba3ecd7fa0b0a5a6718bc6cd7fbd8d9.tar.bz2 minishell-1d455c5b8ba3ecd7fa0b0a5a6718bc6cd7fbd8d9.zip | |
Change LTAG -> TAG in lexer.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/lexer/lexer.c | 8 | ||||
| -rw-r--r-- | src/lexer/lexer_utils.c | 18 | ||||
| -rw-r--r-- | src/parse/parse.c | 7 |
3 files changed, 18 insertions, 15 deletions
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c index 47856c5..29cea9c 100644 --- a/src/lexer/lexer.c +++ b/src/lexer/lexer.c @@ -97,7 +97,7 @@ enum e_token_tag token_verif_stick(t_token *lst_token) if (i > 0) if (lst_token->content[i - 1] == ' ') return(lst_token->tag); - return(lst_token->tag | LTAG_STICK); + return(lst_token->tag | TAG_STICK); } enum e_token_tag token_str_or_cote(t_token *lst_token) @@ -109,17 +109,17 @@ enum e_token_tag token_str_or_cote(t_token *lst_token) { if(lst_token->content[i] == '\'') { - lst_token->tag = LTAG_STR_SINGLE; + lst_token->tag = TAG_STR_SINGLE; return(token_verif_stick(lst_token)); } if(lst_token->content[i] == '"') { - lst_token->tag = LTAG_STR_DOUBLE; + lst_token->tag = TAG_STR_DOUBLE; return(token_verif_stick(lst_token)); } else { - lst_token->tag = LTAG_STR; + lst_token->tag = TAG_STR; return(token_verif_stick(lst_token)); } i++; diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index 986db50..c6bf54a 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -3,29 +3,29 @@ enum e_token_tag ret_token_sep_redir_append(char *input, int i) { if (input[i + 1] == '>') - return(LTAG_REDIR_APPEND); - return (LTAG_REDIR_OUT); + return(TAG_REDIR_APPEND); + return (TAG_REDIR_OUT); } enum e_token_tag ret_token(char *input, int i) { if (input[i] == ';') - return(LTAG_AND); + return(TAG_AND); if (input[i] == '&') - return(LTAG_END); + return(TAG_END); if (input[i] == '|' && input[i + 1] == '|') - return(LTAG_OR); + return(TAG_OR); if(input[i] == '|') - return(LTAG_PIPE); + return(TAG_PIPE); if (input[i] == '>') return(ret_token_sep_redir_append(input,i)); if (input[i] == '<') - return(LTAG_REDIR_IN); + return(TAG_REDIR_IN); if (input[i] == '(') - return(LTAG_PARENT_OPEN); + return(TAG_PARENT_OPEN); if (input[i] == ')') - return(LTAG_PARENT_CLOSE); + return(TAG_PARENT_CLOSE); return(0); } diff --git a/src/parse/parse.c b/src/parse/parse.c index 6f9c99b..a240377 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -6,11 +6,14 @@ #include "parse.h" #include <stdio.h> -t_ast *parse(t_ftlst *lst) + + +t_ret *parse(t_ftlst *lst) { t_ret *ret; + if(!(ret = malloc(sizeof(t_ret) * 1))) + return(NULL); ret->rest = lst; - ret = return NULL; } |