From b5710182b87b17c14cabb5f178f0516ff7676177 Mon Sep 17 00:00:00 2001 From: nass1pro Date: Sun, 14 Jun 2020 15:52:25 +0200 Subject: Added parse cmd draft --- src/parse/cmd_parse.c | 3 +++ src/parse/parse.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 src/parse/cmd_parse.c (limited to 'src/parse') diff --git a/src/parse/cmd_parse.c b/src/parse/cmd_parse.c new file mode 100644 index 0000000..78ce593 --- /dev/null +++ b/src/parse/cmd_parse.c @@ -0,0 +1,3 @@ + + +#include "parser.h" diff --git a/src/parse/parse.c b/src/parse/parse.c index 92797c8..a3e9526 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -4,16 +4,61 @@ */ #include "parser.h" +#include "lexer.h" // stdio.h est deja include dans minishell.h temporairement // (comme ca on doit le retirer a un seul endroit a la fin) +int parse_cmd_str_true_fale(enum e_token_tag tag) +{ + if (tag & TAG_STR || tag & TAG_STR_DOUBLE || tag & TAG_STR_SINGLE) + return (1); + return(0); +} + + +t_ast *parse_cmd(t_ast *ast, t_ftlst *rest) +{ + t_ftlst *new; + + new = rest->data; + if (ast == NULL) + { + ast = ast_new(AST_CMD); + ast->cmd_argv = ft_lstnew((t_token *)rest->data); + } + else + { + new = ft_lstnew(rest->data); + ft_lstpush_back(&ast->cmd_argv, (void *)new); + } + return (ast); +} -t_ret *parse(t_ftlst *input) +t_ret *parse(t_ftlst *input) { - t_ret *ret; + t_ret *ret; + t_ret *first; + enum e_token_tag tag; if(!(ret = malloc(sizeof(t_ret) * 1))) return(NULL); ret->rest = input; + ret->ast = NULL; + ret->unexpected = NULL; + first = ret; + + while (ret->rest != NULL) + { + tag = ((t_token *)ret->rest->data)->tag; + if (parse_cmd_str_true_fale(tag)) + ret->ast = parse_cmd(ret->ast, ret->rest); + ret->rest = ret->rest->next; + } + 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; + } + free(ret->ast); return NULL; } -- cgit From 72ee131562574c4a6cb69800cdd81268b52ace84 Mon Sep 17 00:00:00 2001 From: nass1pro Date: Sun, 14 Jun 2020 17:31:01 +0200 Subject: Change file cmd --- src/parse/cmd_parse.c | 27 +++++++++++++++++++++++++++ src/parse/parse.c | 29 ++++------------------------- 2 files changed, 31 insertions(+), 25 deletions(-) (limited to 'src/parse') diff --git a/src/parse/cmd_parse.c b/src/parse/cmd_parse.c index 78ce593..07070a1 100644 --- a/src/parse/cmd_parse.c +++ b/src/parse/cmd_parse.c @@ -1,3 +1,30 @@ #include "parser.h" + + +int parse_cmd_str_true_false(enum e_token_tag tag) +{ + if (tag & TAG_STR || tag & TAG_STR_DOUBLE || tag & TAG_STR_SINGLE) + return (1); + return(0); +} + + +t_ast *parse_cmd(t_ast *ast, t_ftlst *rest) +{ + t_ftlst *new; + + new = rest->data; + if (ast == NULL) + { + ast = ast_new(AST_CMD); + ast->cmd_argv = ft_lstnew((t_token *)rest->data); + } + else + { + new = ft_lstnew(rest->data); + ft_lstpush_back(&ast->cmd_argv, (void *)new); + } + return (ast); +} diff --git a/src/parse/parse.c b/src/parse/parse.c index a3e9526..4fc0aa7 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -8,31 +8,7 @@ // stdio.h est deja include dans minishell.h temporairement // (comme ca on doit le retirer a un seul endroit a la fin) -int parse_cmd_str_true_fale(enum e_token_tag tag) -{ - if (tag & TAG_STR || tag & TAG_STR_DOUBLE || tag & TAG_STR_SINGLE) - return (1); - return(0); -} - - -t_ast *parse_cmd(t_ast *ast, t_ftlst *rest) -{ - t_ftlst *new; - new = rest->data; - if (ast == NULL) - { - ast = ast_new(AST_CMD); - ast->cmd_argv = ft_lstnew((t_token *)rest->data); - } - else - { - new = ft_lstnew(rest->data); - ft_lstpush_back(&ast->cmd_argv, (void *)new); - } - return (ast); -} t_ret *parse(t_ftlst *input) { @@ -50,7 +26,10 @@ t_ret *parse(t_ftlst *input) while (ret->rest != NULL) { tag = ((t_token *)ret->rest->data)->tag; - if (parse_cmd_str_true_fale(tag)) + printf("%d\n", tag); + if (parse_redir_true_false(tag)) + ; + if (parse_cmd_str_true_false(tag)) ret->ast = parse_cmd(ret->ast, ret->rest); ret->rest = ret->rest->next; } -- cgit From a7dae7d30b7087bcd9972792a2ee1248e081cfce Mon Sep 17 00:00:00 2001 From: nass1pro Date: Mon, 15 Jun 2020 13:00:24 +0200 Subject: ADD redir_parse draft --- src/parse/cmd_parse.c | 3 ++- src/parse/parse.c | 45 ++++++++++++++++++++++++++++++++++++--------- src/parse/redir_parse.c | 27 +++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 10 deletions(-) mode change 100644 => 100755 src/parse/cmd_parse.c mode change 100644 => 100755 src/parse/parse.c create mode 100755 src/parse/redir_parse.c (limited to 'src/parse') diff --git a/src/parse/cmd_parse.c b/src/parse/cmd_parse.c old mode 100644 new mode 100755 index 07070a1..562cea3 --- a/src/parse/cmd_parse.c +++ b/src/parse/cmd_parse.c @@ -18,12 +18,13 @@ t_ast *parse_cmd(t_ast *ast, t_ftlst *rest) new = rest->data; if (ast == NULL) { + ast = ast_new(AST_CMD); ast->cmd_argv = ft_lstnew((t_token *)rest->data); } else { - new = ft_lstnew(rest->data); + new = ft_lstnew((t_token *)rest->data); ft_lstpush_back(&ast->cmd_argv, (void *)new); } return (ast); diff --git a/src/parse/parse.c b/src/parse/parse.c old mode 100644 new mode 100755 index 4fc0aa7..bb19bea --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -15,6 +15,7 @@ t_ret *parse(t_ftlst *input) t_ret *ret; t_ret *first; enum e_token_tag tag; + int i = 0; if(!(ret = malloc(sizeof(t_ret) * 1))) return(NULL); @@ -26,18 +27,44 @@ t_ret *parse(t_ftlst *input) while (ret->rest != NULL) { tag = ((t_token *)ret->rest->data)->tag; - printf("%d\n", tag); - if (parse_redir_true_false(tag)) - ; if (parse_cmd_str_true_false(tag)) + { ret->ast = parse_cmd(ret->ast, ret->rest); - ret->rest = ret->rest->next; + } + else if (parse_redir_true_false(tag)) + { + ret->ast = parse_redir(ret->ast, ret->rest); + ret->rest = ret->rest->next; + if (ret->rest != NULL) + ret->ast = parse_redir(ret->ast, ret->rest); + printf("%s\n","ici" ); + ret->rest = ret->rest->next; + if (ret->rest != NULL) + { + tag = ((t_token *)ret->rest->data)->tag; + if(tag & TAG_IS_STR & TAG_STICK) + ret->ast = parse_redir(ret->ast, ret->rest); + } + } + if (ret->rest != NULL) + ret->rest = ret->rest->next; } 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; - } - free(ret->ast); + { + printf("%s\n", ((t_token *)ret->ast->cmd_argv->data)->content); + ret->ast->cmd_argv = ret->ast->cmd_argv->next; + } + while(ret->ast->redirs != NULL) + { + if (i == 0) + { + printf("redir"); + i++; + } + printf("%s\n", ((t_token *)ret->ast->redirs->data)->content); + ret->ast->redirs = ret->ast->redirs->next; + } + ast_destroy(ret->ast); + ft_lstdestroy(&ret->rest, (void (*)(void*))token_destroy); return NULL; } diff --git a/src/parse/redir_parse.c b/src/parse/redir_parse.c new file mode 100755 index 0000000..bdcb3ab --- /dev/null +++ b/src/parse/redir_parse.c @@ -0,0 +1,27 @@ + +#include "parser.h" + +int parse_redir_true_false(enum e_token_tag tag) +{ + if (tag & TAG_IS_REDIR) + return (1); + return (0); +} + +t_ast *parse_redir(t_ast *ast, t_ftlst *rest) +{ + t_ftlst *new; + + new = rest->data; + if (ast == NULL) + { + ast = ast_new(AST_CMD); + ast->redirs = ft_lstnew((t_token *)rest->data); + } + else + { + new = ft_lstnew((t_token *)rest->data); + ft_lstpush_back(&ast->redirs, (void *)new); + } + return (ast); +} -- cgit