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

update: moved yarn and fixed leak

Browse source
This commit is contained in:
maix0 2024-10-08 13:44:54 +02:00
parent 9e6ae52a30
commit a9a4417919
6 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
parser/src/passes.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/02 18:41:16 by maiboyer #+# #+# */
/* Updated: 2024/10/07 18:15:14 by rparodi ### ########.fr */
/* Updated: 2024/10/08 13:40:48 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,6 +15,7 @@
#include "me/types.h"
#include "me/vec/vec_token.h"
#include "parser/token.h"
#include <stdio.h>
/// This is a list what of kind of passes we need to make on the tokenstream
/// they'll all have the same function signature, basically taking a token
@ -71,7 +72,7 @@ t_error ts_apply_passes(t_vec_token ts, t_vec_token *out)
else
me_printf("Applied '%s' pass\n", g_ts_passes[i].name);
ts = next;
ts_print(&ts);
//ts_print(&ts);
i++;
}
return (*out = ts, NO_ERROR);
@ -103,7 +104,7 @@ t_error ts_dq_apply_passes(t_vec_token ts, t_vec_token *out)
else
me_printf("Applied '%s' dq_pass\n", g_ts_dq_passes[i].name);
ts = next;
ts_print(&ts);
//ts_print(&ts);
i++;
}
return (*out = ts, NO_ERROR);

4
parser/src/passes/fold_cmd.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/02 19:04:32 by maiboyer #+# #+# */
/* Updated: 2024/10/07 16:45:41 by maiboyer ### ########.fr */
/* Updated: 2024/10/08 13:40:23 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -46,7 +46,7 @@ t_error ts_fold_cmd(t_vec_token input, t_vec_token *output)
if (_is_cmd_node(input.buffer[i].type))
{
j = 0;
tmp = token_new(TOK_CMD);
tmp = token_new_meta(TOK_CMD);
while (i + j < input.len \
&& _is_cmd_node(input.buffer[i + j].type))
vec_token_push(&tmp.subtokens, token_clone(&input.buffer[i + j++]));

23
parser/src/token_utils.c
View file

@ -6,34 +6,37 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/06 13:33:12 by maiboyer #+# #+# */
/* Updated: 2024/10/06 13:33:48 by maiboyer ### ########.fr */
/* Updated: 2024/10/08 13:40:57 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/types.h"
#include "parser/token.h"
#include <stdio.h>
t_str token_name(t_token *token);
t_token token_clone(t_token *tok)
{
t_token out;
t_token ret;
t_usize i;
out = token_new_none();
out.type = tok->type;
ret = token_new_none();
ret.type = tok->type;
if (tok->string.buf != NULL)
{
out.string = string_new(tok->string.capacity);
string_push(&out.string, tok->string.buf);
ret.string = string_new(tok->string.capacity);
string_push(&ret.string, tok->string.buf);
}
if (tok->subtokens.buffer != NULL)
{
out.subtokens = vec_token_new(tok->subtokens.capacity, token_free);
ret.subtokens = vec_token_new(tok->subtokens.capacity, token_free);
i = 0;
while (i < tok->subtokens.len)
vec_token_push(&out.subtokens, \
token_clone(&tok->subtokens.buffer[i++]));
vec_token_push(&ret.subtokens, token_clone(&tok->subtokens.buffer[i++]));
}
return (out);
return (ret);
}
bool token_is_noquote(enum e_token ttype)

30
parser/src/yarn/yarn.c Normal file
View file

@ -0,0 +1,30 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* yarn.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/07 18:04:13 by rparodi #+# #+# */
/* Updated: 2024/10/07 18:14:22 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/printf/printf.h"
#include "me/types.h"
#include "me/vec/vec_token.h"
#include "parser/token.h"
t_error yarn(t_vec_token *list, enum e_token type, t_vec_token *output)
{
size_t i;
i = 0;
if (!list[0].buffer || !output->buffer)
return (ERROR);
while (list[i].buffer == NULL)
{
i++;
}
return (NO_ERROR);
}