From fbce14ef34ac245ccee2817e7458a2bd7b61ede8 Mon Sep 17 00:00:00 2001 From: "ariard@student.42.fr" Date: Sun, 19 Feb 2017 16:55:06 +0100 Subject: [PATCH] modifs gestion d'erreur --- 42sh/eewfew | 0 42sh/includes/.parser.h.swn | Bin 16384 -> 20480 bytes 42sh/includes/parser.h | 12 +++++- 42sh/sample/error.sh | 1 + 42sh/sample/while.sh | 5 ++- 42sh/src/main/shell_script.c | 2 +- 42sh/src/parser/.eval_sym.c.swn | Bin 0 -> 24576 bytes 42sh/src/parser/add_cmd.c | 2 +- 42sh/src/parser/add_loop.c | 2 +- 42sh/src/parser/add_sep.c | 4 +- 42sh/src/parser/aggregate_sym.c | 9 ++--- 42sh/src/parser/build_tree.c | 2 +- 42sh/src/parser/error_syntax.c | 67 +++++++++++++++++++++++++------- 42sh/src/parser/eval_sym.c | 6 ++- 42sh/src/parser/ft_parse.c | 4 +- 42sh/src/parser/tree_wrapper.c | 3 +- 42sh/wefwe | 1 + 42sh/wfewef | 0 18 files changed, 89 insertions(+), 31 deletions(-) create mode 100644 42sh/eewfew create mode 100644 42sh/sample/error.sh create mode 100644 42sh/src/parser/.eval_sym.c.swn create mode 100644 42sh/wefwe create mode 100644 42sh/wfewef diff --git a/42sh/eewfew b/42sh/eewfew new file mode 100644 index 00000000..e69de29b diff --git a/42sh/includes/.parser.h.swn b/42sh/includes/.parser.h.swn index ccd9ee3b6c7158678ac574c293719a7fc2be918f..da1db700233da91d73f0d43480a6fea46ebc891d 100644 GIT binary patch delta 392 zcmZo@U~E{xD3xRo=IN_op=ZDV1Of~Ur*^K4_!_Oi@WFnfls21jk#T{M;YRQ6{QS%e z^*|L&AZ0+XVX~lrxF8FJ!ypKymv5F7IL<#wfrYn=k%1u%Bn>oj!)8H+*-Tm-tPBin zK>Qsj{1S+t0r68H-VMaNfOr}ZPX*#Mmd)3cdKg(Ufnf4m6-%MiqN4nw+{BXP49@g; zFlVx#nzSZDSfK!z))+=z?qzpSj4FXQO%D*^Er wpt>VKd>Duq0P%bvt^wjGAdUoLJ0MmAVvu=vc{e)>)bmdMsieR8r_vWj00Nv^JOBUy delta 184 zcmZozz}V2hD3xRo=IN_op=ZDV1Of~UQnOb?aQiASC<#xL(q=O%vM4Yz*yz2TpPz}L z9;ku|qznkQPZksq-|QipCDPF8QV7tD$HimddtGV@CJzY0dXS` zhXJtw5c31^LuLksjX=BshB&zTx=0RRI?C>sC( diff --git a/42sh/includes/parser.h b/42sh/includes/parser.h index b0613516..c453cc6f 100644 --- a/42sh/includes/parser.h +++ b/42sh/includes/parser.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/01 12:15:54 by jhalford #+# #+# */ -/* Updated: 2017/02/18 20:06:02 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:29:14 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -163,6 +163,16 @@ typedef struct s_stackmatch t_stackmatch; extern t_stackmatch g_stackmatch[]; +struct s_errormatch +{ + t_type token; + char *error; +}; + +typedef struct s_errormatch t_errormatch; + +extern t_errormatch g_errormatch[]; + int ft_parse2(t_btree **ast, t_list **token); int ft_parse(t_btree **ast, t_list **token); diff --git a/42sh/sample/error.sh b/42sh/sample/error.sh new file mode 100644 index 00000000..0cf7ff3a --- /dev/null +++ b/42sh/sample/error.sh @@ -0,0 +1 @@ +ls ; pwd | | diff --git a/42sh/sample/while.sh b/42sh/sample/while.sh index c6a6867c..26568e98 100644 --- a/42sh/sample/while.sh +++ b/42sh/sample/while.sh @@ -4,5 +4,8 @@ do do pwd done - pwd ; ls + while ls + do + pwd + done done diff --git a/42sh/src/main/shell_script.c b/42sh/src/main/shell_script.c index 5b907c72..32f9899d 100644 --- a/42sh/src/main/shell_script.c +++ b/42sh/src/main/shell_script.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/22 23:06:34 by ariard #+# #+# */ -/* Updated: 2017/02/17 23:27:06 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:02:17 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/.eval_sym.c.swn b/42sh/src/parser/.eval_sym.c.swn new file mode 100644 index 0000000000000000000000000000000000000000..291aa4f1d31b5030e5fdac6377db64f43ce44530 GIT binary patch literal 24576 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 Z-788g$yy?Zitm?Xf$W6VLoe$I{|(u?4W0l1 literal 0 HcmV?d00001 diff --git a/42sh/src/parser/add_cmd.c b/42sh/src/parser/add_cmd.c index dbd3ddd9..fd7bfaf4 100644 --- a/42sh/src/parser/add_cmd.c +++ b/42sh/src/parser/add_cmd.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 20:49:15 by ariard #+# #+# */ -/* Updated: 2017/02/18 18:56:15 by ariard ### ########.fr */ +/* Updated: 2017/02/18 20:12:23 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_loop.c b/42sh/src/parser/add_loop.c index dbfc7533..0067faa9 100644 --- a/42sh/src/parser/add_loop.c +++ b/42sh/src/parser/add_loop.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 22:17:14 by ariard #+# #+# */ -/* Updated: 2017/02/18 20:10:08 by ariard ### ########.fr */ +/* Updated: 2017/02/18 20:12:26 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_sep.c b/42sh/src/parser/add_sep.c index 3d7e8923..fb7dcb1e 100644 --- a/42sh/src/parser/add_sep.c +++ b/42sh/src/parser/add_sep.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 19:12:07 by ariard #+# #+# */ -/* Updated: 2017/02/18 20:06:47 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:48:44 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,6 +21,8 @@ int add_sep(t_btree **ast, t_list **lst) DG("add sep"); if (isloop(ast) == 1) return (add_loop_sep(ast, lst)); + if (!*ast) + gen_node(ast); node = (*ast)->item; token = (*lst)->content; // if (node->type != TK_DO) diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c index 6f6933cc..d1020a8c 100644 --- a/42sh/src/parser/aggregate_sym.c +++ b/42sh/src/parser/aggregate_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 17:39:18 by ariard #+# #+# */ -/* Updated: 2017/02/18 16:58:05 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:48:12 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -179,7 +179,6 @@ t_aggrematch g_aggrematch[] = {COMPLETE_COMMAND, NEWLINE_LIST, COMPLETE_COMMANDS, COMPLETE_COMMANDS}, {COMPLETE_COMMAND, LINEBREAK, COMPLETE_COMMANDS, 0}, {COMPLETE_COMMANDS, LINEBREAK, PROGRAM, LINEBREAK}, -// voir decoupe separateur au lexer {0, 0, 0, 0}, }; @@ -188,8 +187,8 @@ int aggregate_sym(t_sym **stack, t_sym *new_sym, t_parstate *state) int i; i = 0; -// DG("aggregate head %s && sym %s", -// read_state(**stack), read_state(*new_sym)); + DG("aggregate head %s && sym %s", + read_state(**stack), read_state(*new_sym)); while (g_aggrematch[i].top) { if (*new_sym == g_aggrematch[i].top @@ -201,7 +200,7 @@ int aggregate_sym(t_sym **stack, t_sym *new_sym, t_parstate *state) if (g_aggrematch[i].erase_sym) { pop_stack(stack, g_aggrematch[i].erase_sym); -// DG("stack after pop: %s", read_state(**stack)); + DG("stack after pop: %s", read_state(**stack)); } if (eval_sym(**stack, *new_sym)) return ((*state = ERROR)); diff --git a/42sh/src/parser/build_tree.c b/42sh/src/parser/build_tree.c index 7fc287f0..a5d73447 100644 --- a/42sh/src/parser/build_tree.c +++ b/42sh/src/parser/build_tree.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 18:32:59 by ariard #+# #+# */ -/* Updated: 2017/02/18 18:43:50 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:35:25 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/error_syntax.c b/42sh/src/parser/error_syntax.c index 9bacf149..83003a69 100644 --- a/42sh/src/parser/error_syntax.c +++ b/42sh/src/parser/error_syntax.c @@ -6,28 +6,67 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 20:15:35 by ariard #+# #+# */ -/* Updated: 2017/02/13 22:09:03 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:35:56 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ #include "parser.h" -int error_syntax(t_list **lst) +t_errormatch g_errormatch[] = +{ + {TK_NEWLINE, "newline"}, + {TK_SEMI, ";"}, + {TK_PIPE, "|"}, + {TK_AMP, "&"}, + {TK_LESS, "<"}, + {TK_GREAT, ">"}, + {TK_DGREAT, ">>"}, + {TK_LESSAND, "<&"}, + {TK_GREATAND, ">&"}, + {TK_LESSGREAT, "<>"}, + {TK_CLOBBER, ">|"}, + {TK_DLESS, "<<"}, + {TK_DLESSDASH, "<<-"}, + {TK_AND_IF, "&&"}, + {TK_OR_IF, "||"}, + {TK_DSEMI, ";;"}, + {TK_IF, "if"}, + {TK_THEN, "then"}, + {TK_ELSE, "else"}, + {TK_ELIF, "elif"}, + {TK_FI, "fi"}, + {TK_DO, "do"}, + {TK_DONE, "done"}, + {TK_CASE, "case"}, + {TK_ESAC, "esac"}, + {TK_WHILE, "while"}, + {TK_UNTIL, "until"}, + {TK_FOR, "for"}, + {TK_LBRACE, "{"}, + {TK_RBRACE, "}"}, + {TK_BANG, "!"}, + {TK_IN, "in"}, + {0, NULL}, +}; + +int error_syntax(t_list **lst) { t_token *token; + int i; token = (*lst)->content; - if (token->type == TK_SEMI) - ft_putstr_fd("syntax error near unexepected token ';'", 2); - else if (token->type == TK_WORD) - ft_putstr_fd("syntax error near unexepected token 'word'", 2); - else if (token->type == TK_GREAT) - ft_putstr_fd("syntax error near unexepected token '>'", 2); - else if (token->type == TK_NEWLINE) - ft_putstr_fd("syntax error near unexepected token 'newline'", 2); - else if (token->type == TK_LESS) - ft_putstr_fd("syntax error near unexepected token '<'", 2); - else - ft_putstr_fd("grammar error, notify ariard", 2); + i = 0; + while (g_errormatch[i].token) + { + if (g_errormatch[i].token == token->type) + { + ft_putstr_fd("syntax error near unexpetcted token `", 2); + ft_putstr_fd(g_errormatch[i].error, 2); + ft_putstr_fd("'", 2); + return (1); + } + i++; + } + ft_putstr_fd("grammar error, notify ariard", 2); return (1); } diff --git a/42sh/src/parser/eval_sym.c b/42sh/src/parser/eval_sym.c index e56fce59..6f059bfa 100644 --- a/42sh/src/parser/eval_sym.c +++ b/42sh/src/parser/eval_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 16:26:30 by ariard #+# #+# */ -/* Updated: 2017/02/18 18:50:18 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:53:14 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -196,6 +196,7 @@ t_stackmatch g_stackmatch[] = {TK_WHILE, NEWLINE_LIST}, {TK_WHILE, PIPE_SEMI_SEQUENCE}, {TK_WHILE, TK_DO}, + {TK_WHILE, COMPOUND_LIST}, {TK_UNTIL, LINEBREAK}, {TK_UNTIL, TK_BANG}, {TK_UNTIL, SEPARATOR_OP}, @@ -265,6 +266,7 @@ t_stackmatch g_stackmatch[] = {LINEBREAK, CMD_SUPERIOR}, {LINEBREAK, PIPE_SEMI_SEQUENCE}, {LINEBREAK, COMPOUND_LIST}, + {LINEBREAK, PROGRAM}, {NEWLINE_LIST, TK_DO}, {NEWLINE_LIST, CMD_NAME}, {NEWLINE_LIST, NEWLINE_LIST}, @@ -390,6 +392,7 @@ t_stackmatch g_stackmatch[] = {WHILE_CLAUSE, NEWLINE_LIST}, {WHILE_CLAUSE, PIPE_SEMI_SEQUENCE}, {WHILE_CLAUSE, TK_DO}, + {WHILE_CLAUSE, COMPOUND_LIST}, {ELSE_PART, COMPOUND_LIST}, {IF_CLAUSE, LINEBREAK}, {IF_CLAUSE, TK_BANG}, @@ -439,6 +442,7 @@ t_stackmatch g_stackmatch[] = {COMPOUND_COMMAND, PIPE_SEMI_SEQUENCE}, {COMPOUND_COMMAND, FUNC}, {COMPOUND_COMMAND, TK_DO}, + {COMPOUND_COMMAND, COMPOUND_LIST}, {COMMAND, TK_WHILE}, {COMMAND, LINEBREAK}, {COMMAND, TK_DO}, diff --git a/42sh/src/parser/ft_parse.c b/42sh/src/parser/ft_parse.c index bd0a89c9..2410bf7e 100644 --- a/42sh/src/parser/ft_parse.c +++ b/42sh/src/parser/ft_parse.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 14:30:22 by ariard #+# #+# */ -/* Updated: 2017/02/18 18:06:45 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:54:31 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -58,7 +58,7 @@ int ft_parse2(t_btree **ast, t_list **token) ft_putstr("success"); build_tree(ast, token); btree_print(STDBUG, *ast, &ft_putast); - if (end_instruction(*stack) && !(*token)->next) + if ((end_instruction(*stack) && !(*token)->next) || *stack == PROGRAM) insert_linebreak(token); else ft_lst_delif(token, (*token)->content, &ft_addrcmp, &token_free); diff --git a/42sh/src/parser/tree_wrapper.c b/42sh/src/parser/tree_wrapper.c index fb69e072..505f2050 100644 --- a/42sh/src/parser/tree_wrapper.c +++ b/42sh/src/parser/tree_wrapper.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 18:57:44 by ariard #+# #+# */ -/* Updated: 2017/02/18 20:06:49 by ariard ### ########.fr */ +/* Updated: 2017/02/19 16:34:17 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,7 +25,6 @@ int gen_node(t_btree **ast) if (!*ast) { - DG("node create"); *ast = btree_create_node(&item, sizeof(item)); ((t_astnode *)(*ast)->item)->data.token = NULL; ((t_astnode *)(*ast)->item)->data.redir.word.word = NULL; diff --git a/42sh/wefwe b/42sh/wefwe new file mode 100644 index 00000000..ce09b016 --- /dev/null +++ b/42sh/wefwe @@ -0,0 +1 @@ +/Users/ariard/Projects/42sh diff --git a/42sh/wfewef b/42sh/wfewef new file mode 100644 index 00000000..e69de29b