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

updated yarn with comments

Browse source
This commit is contained in:
maix0 2024-10-08 15:48:06 +02:00
parent d8700f45f3
commit 8d39324a7e
1 changed files with 45 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

73
parser/src/yarn/yarn.c
View file

@ -6,17 +6,17 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/07 18:04:13 by rparodi #+# #+# */ /* Created: 2024/10/07 18:04:13 by rparodi #+# #+# */
/* Updated: 2024/10/08 15:32:12 by maiboyer ### ########.fr */ /* Updated: 2024/10/08 15:47:39 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ast/ast.h"
#include "me/types.h" #include "me/types.h"
#include "me/vec/vec_token.h" #include "me/vec/vec_token.h"
#include "parser/token.h" #include "parser/token.h"
#include "ast/ast.h"
#include <stdio.h> #include <stdio.h>
int _get_precedance(t_token *token) int _get_precedance(t_token *token)
{ {
if (!token) if (!token)
return (-1); return (-1);
@ -26,56 +26,73 @@ int _get_precedance(t_token *token)
return (1); return (1);
return (0); return (0);
} }
t_str token_name(t_token *token); t_str token_name(t_token *token);
/// la fonction doit prendre une t_token de type TOK_CMD qui contient que deux type de subtokens TOK_WORD ou TOK_REDIR
/// un TOK_WORD == un arguemnt
/// un TOK_REDIR == une redirection
/// les deux sont dans le bonne ordre.
/// il faut push les TOK_REDIR dans ast_node->data.command.prefix;
/// let TOK_WORD dans ast_node->data.command.arguements;
/// les noms peuvent etre different idk
/// a terme la fonction utilisera t_error et tt;
t_ast_node ast_from_cmd(t_token tok); t_ast_node ast_from_cmd(t_token tok);
t_ast_node ast_from_op(t_token tok, t_vec_ast *out);
/// en fonction de op, qui peut etre: TOK_AND TOK_PIPE TOK_OR
/// choisir le bon ast_node a faire (t_ast_node->data.list + set operator ou t_asdt_node->data.pipeline)
/// pop deux element de output_queue. pour l'instant la fonction doit print une error si il n'y as pas asser d'element
/// utilise me_abort(MSG) pour faire un abort et print le msg + la stacktrace.
///
/// a terme la fonction utilisera t_error et tt;
t_ast_node ast_from_op(t_token tok, t_vec_ast *output_queue);
t_error yarn(t_vec_token ts, t_vec_ast *out) t_error yarn(t_vec_token ts, t_vec_ast *out)
{ {
t_token tmp; t_token tok;
t_token op; t_token op;
t_vec_ast output_queue; t_vec_ast output_queue;
t_vec_token operator_stack; t_vec_token stack;
output_queue = vec_ast_new(16, ast_free);; output_queue = vec_ast_new(16, ast_free);
operator_stack = vec_token_new(16, token_free);; stack = vec_token_new(16, token_free);
while (!vec_token_pop_front(&ts, &tmp)) while (!vec_token_pop_front(&ts, &tok))
{ {
if (tmp.type == TOK_CMD) if (tok.type == TOK_CMD)
vec_ast_push(&output_queue, ast_from_cmd(tmp)); vec_ast_push(&output_queue, ast_from_cmd(tok));
else if (tmp.type == TOK_OR || tmp.type == TOK_AND || tmp.type == TOK_PIPE) else if (tok.type == TOK_LPAREN)
vec_token_push(&stack, tok);
else if (tok.type == TOK_OR || tok.type == TOK_AND || tok.type == TOK_PIPE)
{ {
while (vec_token_last(&operator_stack) != NULL && vec_token_last(&operator_stack)->type != TOK_LPAREN && _get_precedance(vec_token_last(&operator_stack)) > _get_precedance(&tmp)) while (vec_token_last(&stack) != NULL && vec_token_last(&stack)->type != TOK_LPAREN && _get_precedance(vec_token_last(&stack)) > _get_precedance(&tok))
{ {
vec_token_pop(&operator_stack, &op); vec_token_pop(&stack, &op);
vec_ast_push(&output_queue, ast_from_op(op, &output_queue)); vec_ast_push(&output_queue, ast_from_op(op, &output_queue));
} }
vec_token_push(&operator_stack, tmp); vec_token_push(&stack, tok);
} }
else if (tmp.type == TOK_LPAREN) else if (tok.type == TOK_RPAREN)
vec_token_push(&operator_stack, tmp);
else if (tmp.type == TOK_RPAREN)
{ {
token_free(tmp); token_free(tok);
while (vec_token_last(&operator_stack) != NULL && vec_token_last(&operator_stack)->type != TOK_LPAREN) // ici il faut modifier pour push dans un ast_node->data.subshell
// je m'occuperai de ca ce soir/after
while (vec_token_last(&stack) != NULL && vec_token_last(&stack)->type != TOK_LPAREN)
{ {
vec_token_pop(&operator_stack, &op); vec_token_pop(&stack, &op);
vec_ast_push(&output_queue, ast_from_op(op, &output_queue)); vec_ast_push(&output_queue, ast_from_op(op, &output_queue));
} }
if (!(vec_token_last(&operator_stack) != NULL && vec_token_last(&operator_stack)->type == TOK_LPAREN)) if (!(vec_token_last(&stack) != NULL && vec_token_last(&stack)->type == TOK_LPAREN))
return (ERROR); return (ERROR);
vec_token_pop(&operator_stack, &tmp); vec_token_pop(&stack, &tok);
token_free(tmp); token_free(tok);
} }
} }
while (!vec_token_pop(&operator_stack, &op)) while (!vec_token_pop(&stack, &op))
{ {
if (op.type == TOK_LPAREN) if (op.type == TOK_LPAREN)
return (token_free(tmp), ERROR); return (token_free(tok), ERROR);
vec_ast_push(&output_queue, ast_from_op(op, &output_queue)); vec_ast_push(&output_queue, ast_from_op(op, &output_queue));
} }
vec_token_free(ts); vec_token_free(ts);
vec_token_free(operator_stack); vec_token_free(stack);
return (*out = output_queue, NO_ERROR); return (*out = output_queue, NO_ERROR);
} }