diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-06-18 13:44:38 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-06-18 13:44:38 +0200 |
| commit | abd0785ea2734201251609275b361557abc04553 (patch) | |
| tree | 0cd1ca8c45c8669a3f882207c642d9da2f7ed8d1 /src/lexer | |
| parent | 9aab4ace12a04d0c5477909e54bb43fefcd19f9c (diff) | |
| parent | 4d5e2f861331989f8de16e3b0458e45b34bd0b6f (diff) | |
| download | minishell-abd0785ea2734201251609275b361557abc04553.tar.gz minishell-abd0785ea2734201251609275b361557abc04553.tar.bz2 minishell-abd0785ea2734201251609275b361557abc04553.zip | |
Merge branch 'parse_cmd'
Diffstat (limited to 'src/lexer')
| -rw-r--r-- | src/lexer/lexer.c | 6 | ||||
| -rw-r--r-- | src/lexer/lexer_utils.c | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c index 2b1bdce..9b43616 100644 --- a/src/lexer/lexer.c +++ b/src/lexer/lexer.c @@ -9,9 +9,9 @@ int len_is_not_sep(char *input) { if (lexer_sep(input[i])) { - if (input[i + 1] == ' ') - while(input[++i] == ' ') - ; + //if (input[i + 1] == ' ') + // while(input[++i] == ' ') + // ; return(i); } if (input[i] == '\'' || input[i] == '"') diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index 616c0d3..3ee41ff 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -1,5 +1,6 @@ #include "lexer.h" +// check for append tag enum e_token_tag ret_token_sep_redir_append(char *input, int i) { if (input[i + 1] == '>') @@ -8,13 +9,14 @@ enum e_token_tag ret_token_sep_redir_append(char *input, int i) } +// return token tag corresponding to string id enum e_token_tag ret_token(char *input, int i) { if (input[i] == ';') - return(TAG_AND); - if (input[i] == '&') return(TAG_END); - if (input[i] == '|' && input[i + 1] == '|') + if (input[i] == '&') + return(TAG_AND); + if (input[i] == '|' && input[i + 1] == '|') return(TAG_OR); if(input[i] == '|') return(TAG_PIPE); @@ -30,6 +32,8 @@ enum e_token_tag ret_token(char *input, int i) } +// check is char is separator +// ft_strchr(";&|><()", input) int lexer_sep(char input) { char *sep; @@ -46,6 +50,7 @@ int lexer_sep(char input) return (0); } +// skip spaces int lexe_space(char *input) { int i; |