aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornass1pro <nass1pro@gmail.com>2020-06-15 17:49:27 +0200
committernass1pro <nass1pro@gmail.com>2020-06-15 17:49:27 +0200
commit6bb9eafa5fe8de5194801ab5ff3bd898a853c9fb (patch)
tree6e667a244de358394448d28b89032304d741b4dd
parentb72b43e5715424f01626f31f74f0c0d83d7bfb24 (diff)
downloadminishell-6bb9eafa5fe8de5194801ab5ff3bd898a853c9fb.tar.gz
minishell-6bb9eafa5fe8de5194801ab5ff3bd898a853c9fb.tar.bz2
minishell-6bb9eafa5fe8de5194801ab5ff3bd898a853c9fb.zip
change name function
-rw-r--r--include/lexer.h2
-rw-r--r--src/lexer/lexer.c2
-rw-r--r--src/lexer/trim.c7
-rwxr-xr-xsrc/parse/parse.c6
4 files changed, 13 insertions, 4 deletions
diff --git a/include/lexer.h b/include/lexer.h
index 5886035..effc94c 100644
--- a/include/lexer.h
+++ b/include/lexer.h
@@ -45,4 +45,6 @@ void token_destroy(t_token *token);
void token_destroy_lst(t_ftlst *tokens);
void token_destroy_lst2(t_ftlst *tokens1, t_ftlst *tokens2);
+t_ftlst *lexe_trim_out(t_ftlst *lst);
+
#endif
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 1d520c7..3df47f6 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -175,5 +175,5 @@ t_ftlst *lexer(char *input)
*lst = NULL;
*lst = create_token_list(input, lst);
/* i = ft_lstsize(*lst); */
- return (*lst);
+ return (lexe_trim_out(lst));
}
diff --git a/src/lexer/trim.c b/src/lexer/trim.c
new file mode 100644
index 0000000..9fbb6cc
--- /dev/null
+++ b/src/lexer/trim.c
@@ -0,0 +1,7 @@
+
+#include "lexer.h"
+
+t_ftlst *lexe_trim_out(t_ftlst *lst)
+{
+ return (lst);
+}
diff --git a/src/parse/parse.c b/src/parse/parse.c
index b9cc514..ff8dbc1 100755
--- a/src/parse/parse.c
+++ b/src/parse/parse.c
@@ -29,16 +29,16 @@ t_ret *parse(t_ftlst *input)
tag = ((t_token *)ret->rest->data)->tag;
if (parse_cmd_str_true_false(tag))
{
- ret->ast = parse_cmd(ret->ast, ret->rest);
+ ret->ast = push_cmd(ret->ast, ret->rest);
if (ret->rest != NULL)
ret->rest = ret->rest->next;
}
else if (parse_redir_true_false(tag))
{
- ret->ast = parse_redir(ret->ast, ret->rest);
+ ret->ast = push_redir(ret->ast, ret->rest);
ret->rest = ret->rest->next;
if (ret->rest != NULL)
- ret->ast = parse_redir(ret->ast, ret->rest);
+ ret->ast = push_redir(ret->ast, ret->rest);
tag = ((t_token *)ret->rest->data)->tag;
//while(tag & TAG_IS_STR && tag & TAG_STICK)
}