raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parser update

Browse source
This commit is contained in:
Maix0 2024-06-30 01:22:13 +02:00
parent bdc062b33a
commit 313652be47
1 changed files with 126 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

202
ast/src/from_node.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/17 12:41:56 by maiboyer #+# #+# */ /* Created: 2024/06/17 12:41:56 by maiboyer #+# #+# */
/* Updated: 2024/06/29 23:18:43 by maiboyer ### ########.fr */ /* Updated: 2024/06/30 00:52:11 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -471,7 +471,10 @@ t_error build_sym_command(t_parse_node self, t_const_str input, t_ast_node *out)
t_error build_sym_command_name(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_command_name(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_comment(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_comment(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_compound_statement(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_compound_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_elif_clause(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_else_clause(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_if_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_list(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_list(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_negated_command(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_negated_command(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_pipeline(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_pipeline(t_parse_node self, t_const_str input, t_ast_node *out);
@ -484,10 +487,6 @@ t_error build_sym_variable_assignment(t_parse_node self, t_const_str input, t_as
t_error build_sym_while_statement(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_while_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_word(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_word(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_if_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_elif_clause(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_else_clause(t_parse_node self, t_const_str input, t_ast_node *out);
/* FUNCTION THAT ARE NOT DONE */ /* FUNCTION THAT ARE NOT DONE */
t_error build_sym_arithmetic_binary_expression(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_arithmetic_binary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
@ -511,6 +510,7 @@ t_error build_sym_simple_expansion(t_parse_node self, t_const_str input, t_ast_n
t_error build_sym_heredoc_redirect(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_heredoc_redirect(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_file_redirect(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_file_redirect(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_extglob_pattern(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_extglob_pattern(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_file_descriptor(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_file_descriptor(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_number(t_parse_node self, t_const_str input, t_ast_node *out); t_error build_sym_number(t_parse_node self, t_const_str input, t_ast_node *out);
@ -524,79 +524,129 @@ t_error build_sym_heredoc_start(t_parse_node self, t_const_str input, t_ast_node
#include <stdio.h> #include <stdio.h>
// t_error build_sym_if_statement(t_parse_node self, t_const_str input, t_ast_node *out) t_error build_sym_if_statement(t_parse_node self, t_const_str input, t_ast_node *out)
// { {
// t_ast_node ret; t_ast_node ret;
// t_ast_node tmp; t_ast_node tmp;
// t_usize i; t_usize i;
// t_parse_node child; t_parse_node child;
//
// (void)(out); (void)(out);
// (void)(input); (void)(input);
// (void)(self); (void)(self);
// if (out == NULL) if (out == NULL)
// return (ERROR); return (ERROR);
// if (ts_node_grammar_symbol(self) != sym_if_statement) if (ts_node_grammar_symbol(self) != sym_if_statement)
// return (ERROR); return (ERROR);
// ret = ast_alloc(AST_IF); ret = ast_alloc(AST_IF);
// i = 0; i = 0;
// while (i < ts_node_child_count(self)) while (i < ts_node_child_count(self))
// { {
// i++; child = ts_node_child(self, i);
// } if (!ts_node_is_named(child) && (i++, true))
// return (*out = ret, NO_ERROR); continue;
// } if (ts_node_field_id_for_child(self, i) == field_condition)
// t_error build_sym_elif_clause(t_parse_node self, t_const_str input, t_ast_node *out) {
// { if (ast_from_node(child, input, &tmp))
// t_ast_node ret; return (ast_free(ret), ERROR);
// t_ast_node tmp; vec_ast_push(&ret->data.if_.condition, tmp);
// t_usize i; }
// t_parse_node child; if (ts_node_field_id_for_child(self, i) == field_body)
// {
// (void)(out); if (ast_from_node(child, input, &tmp))
// (void)(input); return (ast_free(ret), ERROR);
// (void)(self); vec_ast_push(&ret->data.if_.then, tmp);
// if (out == NULL) }
// return (ERROR); if (ts_node_field_id_for_child(self, i) == field_elif)
// if (ts_node_grammar_symbol(self) != sym_elif_clause) {
// return (ERROR); if (ast_from_node(child, input, &tmp))
// ret = ast_alloc(AST_ELIF); return (ast_free(ret), ERROR);
// i = 0; vec_ast_push(&ret->data.if_.elif_, tmp);
// while (i < ts_node_child_count(self)) }
// { if (ts_node_field_id_for_child(self, i) == field_else)
// // if (a) {
// i++; if (ast_from_node(child, input, &tmp))
// } return (ast_free(ret), ERROR);
// return (*out = ret, NO_ERROR); ret->data.if_.else_ = tmp;
// }
// } }
// t_error build_sym_else_clause(t_parse_node self, t_const_str input, t_ast_node *out) return (*out = ret, NO_ERROR);
// { }
// t_ast_node ret;
// t_ast_node tmp; t_error build_sym_elif_clause(t_parse_node self, t_const_str input, t_ast_node *out)
// t_usize i; {
// t_parse_node child; t_ast_node ret;
// t_ast_node tmp;
// (void)(out); t_usize i;
// (void)(input); t_parse_node child;
// (void)(self);
// if (out == NULL) (void)(out);
// return (ERROR); (void)(input);
// if (ts_node_grammar_symbol(self) != sym_else_clause) (void)(self);
// return (ERROR); if (out == NULL)
// ret = ast_alloc(AST_ELSE); return (ERROR);
// i = 0; if (ts_node_grammar_symbol(self) != sym_elif_clause)
// while (i < ts_node_child_count(self)) return (ERROR);
// { ret = ast_alloc(AST_ELIF);
// i++; i = 0;
// } while (i < ts_node_child_count(self))
// return (*out = ret, NO_ERROR); {
// } child = ts_node_child(self, i);
if (!ts_node_is_named(child) && (i++, true))
continue;
if (ts_node_field_id_for_child(self, i) == field_condition)
{
if (ast_from_node(child, input, &tmp))
return (ast_free(ret), ERROR);
vec_ast_push(&ret->data.elif.condition, tmp);
}
if (ts_node_field_id_for_child(self, i) == field_body)
{
if (ast_from_node(child, input, &tmp))
return (ast_free(ret), ERROR);
vec_ast_push(&ret->data.elif.then, tmp);
}
}
return (*out = ret, NO_ERROR);
}
t_error build_sym_else_clause(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
t_ast_node tmp;
t_usize i;
t_parse_node child;
(void)(out);
(void)(input);
(void)(self);
if (out == NULL)
return (ERROR);
if (ts_node_grammar_symbol(self) != sym_else_clause)
return (ERROR);
ret = ast_alloc(AST_ELSE);
i = 0;
while (i < ts_node_child_count(self))
{
child = ts_node_child(self, i);
if (!ts_node_is_named(child) && (i++, true))
continue;
if (ts_node_field_id_for_child(self, i) == field_body)
{
if (ast_from_node(child, input, &tmp))
return (ast_free(ret), ERROR);
vec_ast_push(&ret->data.else_.then, tmp);
}
}
return (*out = ret, NO_ERROR);
}
t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node *out) t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node *out)
{ {
t_ast_node ret; t_ast_node ret;
t_ast_node tmp; t_ast_node tmp;
t_const_str tmp_str;
t_parse_node temp_ast;
t_usize i; t_usize i;
(void)(out); (void)(out);
@ -614,9 +664,9 @@ t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node
continue; continue;
if (ts_node_field_id_for_child(self, i) == field_variable) if (ts_node_field_id_for_child(self, i) == field_variable)
{ {
if (ast_from_node(ts_node_child(self, i), input, &tmp)) temp_ast = ts_node_child(self, i);
return (ast_free(ret), ERROR); ret->data.for_.var_name =
vec_ast_push(&ret->data.for_.do_, tmp); str_substring(input, ts_node_start_byte(temp_ast), ts_node_end_byte(temp_ast) - ts_node_start_byte(temp_ast));
} }
if (ts_node_field_id_for_child(self, i) == field_value) if (ts_node_field_id_for_child(self, i) == field_value)
{ {