From 179898160d7a6c3d0c6032c78c8731a23631c2aa Mon Sep 17 00:00:00 2001 From: nass1pro Date: Tue, 16 Jun 2020 12:37:32 +0200 Subject: Test main.c --- src/main.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 55f50c0..777f1e9 100644 --- a/src/main.c +++ b/src/main.c @@ -44,8 +44,20 @@ int main(int argc, char **argv, char **envp) ft_lstiter(lex_out, token_debug); - t_ret *parser_out = parse(lex_out); - + t_ret *ret = parse(lex_out); + + printf("===========cmd=============\n"); + while(ret->ast->cmd_argv != NULL) + { + printf("[%s]\n", ((t_token *)ret->ast->cmd_argv->data)->content); + ret->ast->cmd_argv = ret->ast->cmd_argv->next; + } + printf("=========redir============\n"); + while(ret->ast->redirs != NULL) + { + printf("[%s]\n", ((t_token *)ret->ast->redirs->data)->content); + ret->ast->redirs = ret->ast->redirs->next; + } /* printf("%p\n", parser_out->ast->cmd_argv); */ /* printf("%p\n", parser_out->ast->redirs); */ -- cgit From 904a7c07b31267b2336b144336fc6ff54627f6d0 Mon Sep 17 00:00:00 2001 From: nass1pro Date: Tue, 16 Jun 2020 13:21:57 +0200 Subject: Update parse --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 777f1e9..ee00e00 100644 --- a/src/main.c +++ b/src/main.c @@ -42,7 +42,7 @@ int main(int argc, char **argv, char **envp) { t_ftlst *lex_out = lexer(ft_strdup(argv[2])); - ft_lstiter(lex_out, token_debug); + //ft_lstiter(lex_out, token_debug); t_ret *ret = parse(lex_out); -- cgit From 0fa76e9e49a70ab9acb128845b3b0b09607133a8 Mon Sep 17 00:00:00 2001 From: nass1pro Date: Tue, 16 Jun 2020 14:35:15 +0200 Subject: Update redire in parse --- src/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index ee00e00..a22c733 100644 --- a/src/main.c +++ b/src/main.c @@ -40,11 +40,12 @@ int main(int argc, char **argv, char **envp) if (argc == 3 && ft_strcmp(argv[1], "-c") == 0) { + //printf("%s\n", argv[2]); t_ftlst *lex_out = lexer(ft_strdup(argv[2])); - //ft_lstiter(lex_out, token_debug); + ft_lstiter(lex_out, token_debug); - t_ret *ret = parse(lex_out); + t_ret *ret = parse(lex_out); printf("===========cmd=============\n"); while(ret->ast->cmd_argv != NULL) -- cgit From 0eb7a660c0f6eef4ae163b91791908b670dc1d5a Mon Sep 17 00:00:00 2001 From: nass1pro Date: Tue, 16 Jun 2020 14:40:38 +0200 Subject: main for testing --- src/main.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index a22c733..d410405 100644 --- a/src/main.c +++ b/src/main.c @@ -43,30 +43,18 @@ int main(int argc, char **argv, char **envp) //printf("%s\n", argv[2]); t_ftlst *lex_out = lexer(ft_strdup(argv[2])); - ft_lstiter(lex_out, token_debug); - - t_ret *ret = parse(lex_out); - - printf("===========cmd=============\n"); - while(ret->ast->cmd_argv != NULL) - { - printf("[%s]\n", ((t_token *)ret->ast->cmd_argv->data)->content); - ret->ast->cmd_argv = ret->ast->cmd_argv->next; - } - printf("=========redir============\n"); - while(ret->ast->redirs != NULL) - { - printf("[%s]\n", ((t_token *)ret->ast->redirs->data)->content); - ret->ast->redirs = ret->ast->redirs->next; - } + //ft_lstiter(lex_out, token_debug); + + t_ret *parser_out = parse(lex_out); + /* printf("%p\n", parser_out->ast->cmd_argv); */ /* printf("%p\n", parser_out->ast->redirs); */ /* ft_lstiter(parser_out->ast->cmd_argv, token_debug); */ /* ft_lstiter(parser_out->ast->redirs, token_debug); */ - //int eval_out = eval_cmd(env, path, parser_out->ast); - //(void)eval_out; + int eval_out = eval_cmd(env, path, parser_out->ast); + (void)eval_out; } ft_htdestroy(path, free); -- cgit