diff options
| author | nass1pro <nass1pro@gmail.com> | 2020-07-17 10:36:50 +0200 |
|---|---|---|
| committer | nass1pro <nass1pro@gmail.com> | 2020-07-17 10:36:50 +0200 |
| commit | ddcd109e6eeb3e077f581f056a83624bd6823d65 (patch) | |
| tree | 78ab3375858d13e2670806341b066ab3260e8b1b | |
| parent | fa48f7393222175c6e62ed8c78f2be3f9d5904b3 (diff) | |
| download | minishell-ddcd109e6eeb3e077f581f056a83624bd6823d65.tar.gz minishell-ddcd109e6eeb3e077f581f056a83624bd6823d65.tar.bz2 minishell-ddcd109e6eeb3e077f581f056a83624bd6823d65.zip | |
lexer OK
| -rw-r--r-- | src/lexer/lexer.c | 4 | ||||
| -rw-r--r-- | src/lexer/trim.c | 13 | ||||
| -rw-r--r-- | src/parse/parse.c | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c index 7bacb9f..ca4c933 100644 --- a/src/lexer/lexer.c +++ b/src/lexer/lexer.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/07/16 08:18:25 by nahaddac #+# #+# */ -/* Updated: 2020/07/16 11:39:11 by nahaddac ### ########.fr */ +/* Updated: 2020/07/17 10:18:24 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -173,6 +173,6 @@ t_ftlst *lexer(char *input) return (NULL); lst = NULL; lst = create_token_list(input, &lst); - //lst = lexe_trim_out(lst); + lst = lexe_trim_out(lst); return (lst); } diff --git a/src/lexer/trim.c b/src/lexer/trim.c index 710dc14..8160ca6 100644 --- a/src/lexer/trim.c +++ b/src/lexer/trim.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/07/16 08:18:36 by nahaddac #+# #+# */ -/* Updated: 2020/07/16 10:28:57 by nahaddac ### ########.fr */ +/* Updated: 2020/07/17 10:18:51 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,16 +19,13 @@ char *del_space(t_token *tk) char *s; i = 0; - while(tk->content[++i] != '\0') + while(tk->content[i] != '\0') { - if(tk->content[i] == '\\' && tk->content[i + 1] == ' ') - { - i += 2; - if (tk->content[i] == '\0') - tk->tag = tk->tag | TAG_STICK; - } + if(tk->content[i] == '\\') + return tk->content; if(tk->content[i] == ' ') break; + i++; } s = ft_strsubf(tk->content, 0, i); return(s); diff --git a/src/parse/parse.c b/src/parse/parse.c index 5633a23..69cba8d 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 18:09:04 by nahaddac #+# #+# */ -/* Updated: 2020/07/14 11:48:42 by nahaddac ### ########.fr */ +/* Updated: 2020/07/17 10:36:39 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ |