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

update: added folding into expansion node if possible

Browse source
This commit is contained in:
maix0 2024-10-03 22:52:01 +02:00
parent 09dbd2de91
commit 142ac9c9e1
11 changed files with 278 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
allocator/include/aq/internal_vg_funcs.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/12 22:20:30 by maiboyer #+# #+# */
/* Updated: 2024/09/13 15:32:52 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:46:09 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,13 +16,13 @@
# include "me/types.h"
# ifndef NVALGRIND
# if _INCLUDE_VALGRIND
# ifndef _INCLUDE_VALGRIND
# define _INCLUDE_VALGRIND
# endif
# endif
# ifdef VGHEADER
# if _INCLUDE_VALGRIND
# ifndef _INCLUDE_VALGRIND
# define _INCLUDE_VALGRIND
# endif
# endif

3
parser/Filelist.parser.mk
View file

@ -1,8 +1,11 @@
SRC_FILES = \
passes \
passes/double_quote_parsing \
passes/fold_expansion \
passes/template_file \
token_lifetime \
tokenizer \
tokenizer_utils \
GEN_FILES = \
\

11
parser/include/parser/passes.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/02 18:43:41 by maiboyer #+# #+# */
/* Updated: 2024/10/03 21:32:32 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:31:21 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,9 +27,16 @@ struct s_ts_pass_def
t_error ts_apply_passes(t_vec_token ts, t_vec_token *out);
// This function is to apply stuff on doublequote meta token
// You shouldn't have to use it !
// It *may* disapear/change/whatever
t_error ts_dq_apply_passes(t_vec_token ts, t_vec_token *out);
// list passes function here
// this is a example one, does absolutly nothing lol
t_error do_fuck_all(t_vec_token input, t_vec_token *output);
t_error ts_do_fuck_all(t_vec_token input, t_vec_token *output);
t_error ts_fold_expension(t_vec_token input, t_vec_token *output);
t_error ts_double_string_pass(t_vec_token input, t_vec_token *output);
#endif /* PASSES_H */

4
parser/include/parser/token.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/26 17:59:23 by maiboyer #+# #+# */
/* Updated: 2024/10/03 21:33:14 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:30:42 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,7 +26,7 @@ enum e_token
TOK_DOLLAR, // dollar == $
TOK_DQUOTE, // double quote string
TOK_DRCARRET, // double right carret == >>
TOK_EXPENSION, // an expension == $<no_quote_word>
TOK_EXPENSION, // an expension == $<no_quote_word>; the $ is not in .string
TOK_LCARRET, // left carret == <
TOK_LPAREN, // left parenthesis == (
TOK_NQUOTE, // no quote string

30
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/03 21:32:14 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:41:08 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -43,7 +43,8 @@
// bellow is some function to apply all the different passes !
static const struct s_ts_pass_def g_ts_passes[] = {
{do_fuck_all, "does nothing lol"},
{ts_double_string_pass, "double string parser"},
{ts_fold_expension, "fold expansion"},
};
t_error ts_apply_passes(t_vec_token ts, t_vec_token *out)
@ -65,3 +66,28 @@ t_error ts_apply_passes(t_vec_token ts, t_vec_token *out)
}
return (*out = ts, NO_ERROR);
}
static const struct s_ts_pass_def g_ts_dq_passes[] = {
{ts_do_fuck_all, "does nothing lol"},
{ts_fold_expension, "fold expansion"},
};
t_error ts_dq_apply_passes(t_vec_token ts, t_vec_token *out)
{
t_usize i;
t_vec_token next;
i = 0;
while (i < sizeof(g_ts_dq_passes) / sizeof(g_ts_dq_passes[0]))
{
if (g_ts_dq_passes[i].fn == NULL)
return (vec_token_free(ts), ERROR);
if ((g_ts_dq_passes[i].fn)(ts, &next))
return (me_eprintf("failed on '%s' dq token pass\n", g_ts_dq_passes[i].name), ERROR);
else
me_printf("Applied '%s' dq_pass\n", g_ts_dq_passes[i].name);
ts = next;
i++;
}
return (*out = ts, NO_ERROR);
}

98
parser/src/passes/double_quote_parsing.c Normal file
View file

@ -0,0 +1,98 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* double_quote_parsing.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/02 19:04:32 by maiboyer #+# #+# */
/* Updated: 2024/10/03 22:43:27 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/string/string.h"
#include "parser/passes.h"
#include "me/types.h"
#include "me/vec/vec_token.h"
#include "parser/token.h"
#include "me/char/char.h"
void push_token_and_create_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s);
void push_token_and_set_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s);
t_error _parse_dquote_inner(t_token dquote, t_vec_token *append)
{
t_token ctok;
t_token out;
t_usize i;
char c;
out = token_new_meta(TOK_DQUOTE);
i = 0;
ctok = token_new_none();
while (dquote.string.buf[i] != '\0')
{
c = dquote.string.buf[i++];
if (me_isspace(c))
{
if (ctok.type == TOK_NONE)
ctok = token_new(TOK_WHITESPACE);
if (ctok.type != TOK_WHITESPACE)
{
vec_token_push(&out.subtokens, ctok);
ctok = token_new(TOK_WHITESPACE);
}
string_push_char(&ctok.string, c);
}
else if (c == '$')
push_token_and_create_new(&out.subtokens, &ctok, TOK_DOLLAR, "$");
else
{
if (ctok.type == TOK_NONE)
ctok = token_new(TOK_NQUOTE);
if (ctok.type != TOK_NQUOTE)
{
vec_token_push(&out.subtokens, ctok);
ctok = token_new(TOK_NQUOTE);
}
string_push_char(&ctok.string, c);
}
};
if (ctok.type != TOK_NONE)
vec_token_push(&out.subtokens, ctok);
if (ts_dq_apply_passes(out.subtokens, &out.subtokens))
return (ERROR);
return (vec_token_push(append, out), NO_ERROR);
}
/// There is a few rules the rest of the tokenizer machinery assumes
/// theses function follows:
/// - the input vec WILL be freed when the function return, even in
/// case of error
/// - the output vector isn't populated if the function returns an error,
/// thus it shouldn't be freed in case of error
/// - the output tokens may not be direct copy of the input tokens,
/// but need to be cloned (different allocations for stuff)
t_error ts_double_string_pass(t_vec_token input, t_vec_token *output)
{
t_vec_token out;
t_usize i;
i = 0;
out = vec_token_new(input.len, token_free);
while (i < input.len)
{
if (input.buffer[i].type == TOK_DQUOTE)
{
if (_parse_dquote_inner(input.buffer[i], &out))
return (vec_token_free(input), ERROR);
}
else
vec_token_push(&out, token_clone(&input.buffer[i]));
i++;
}
vec_token_free(input);
return (*output = out, NO_ERROR);
}

54
parser/src/passes/fold_expansion.c Normal file
View file

@ -0,0 +1,54 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* fold_expansion.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/02 19:04:32 by maiboyer #+# #+# */
/* Updated: 2024/10/03 22:50:40 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/types.h"
#include "me/vec/vec_token.h"
#include "parser/passes.h"
#include "parser/token.h"
/// This is a sample pass
///
/// There is a few rules the rest of the tokenizer machinery assumes
/// theses function follows:
/// - the input vec WILL be freed when the function return, even in
/// case of error
/// - the output vector isn't populated if the function returns an error,
/// thus it shouldn't be freed in case of error
/// - the output tokens may not be direct copy of the input tokens,
/// but need to be cloned (different allocations for stuff)
t_error ts_fold_expension(t_vec_token input, t_vec_token *output)
{
t_vec_token out;
t_usize i;
t_token tmp;
i = 0;
out = vec_token_new(input.len, token_free);
while (i < input.len)
{
if (i + 1 >= input.len)
vec_token_push(&out, token_clone(&input.buffer[i]));
else if (input.buffer[i].type == TOK_DOLLAR \
&& (input.buffer[i + 1].type == TOK_DOLLAR \
|| input.buffer[i + 1].type == TOK_NQUOTE))
{
tmp = token_clone(&input.buffer[++i]);
tmp.type= TOK_EXPENSION;
vec_token_push(&out, tmp);
}
else
vec_token_push(&out, token_clone(&input.buffer[i]));
i++;
}
vec_token_free(input);
return (*output = out, NO_ERROR);
}

4
parser/src/passes/template_file.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/03 21:37:04 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:23:40 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -25,7 +25,7 @@
/// thus it shouldn't be freed in case of error
/// - the output tokens may not be direct copy of the input tokens,
/// but need to be cloned (different allocations for stuff)
t_error do_fuck_all(t_vec_token input, t_vec_token *output)
t_error ts_do_fuck_all(t_vec_token input, t_vec_token *output)
{
t_vec_token out;
t_usize i;

28
parser/src/tokenizer.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/30 19:39:39 by maiboyer #+# #+# */
/* Updated: 2024/10/03 21:31:57 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:44:57 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,26 +16,10 @@
#include "me/vec/vec_token.h"
#include "parser/token.h"
static void push_token_and_create_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s)
{
t_token tmp;
if (tok->type != TOK_NONE)
vec_token_push(tokens, *tok);
*tok = token_new_none();
tmp = token_new(ttype);
string_push(&tmp.string, s);
vec_token_push(tokens, tmp);
}
static void push_token_and_set_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s)
{
if (tok->type != TOK_NONE)
vec_token_push(tokens, *tok);
*tok = token_new(ttype);
string_push(&tok->string, s);
}
void push_token_and_create_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s);
void push_token_and_set_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s);
static void handle_quote(t_vec_token *ret, char chr, t_token *tok, char *quote)
{
@ -68,7 +52,7 @@ static void handle_noquote(t_vec_token *ret, char chr, t_token *tok, char *quote
else if (chr == ')')
push_token_and_create_new(ret, tok, TOK_RPAREN, ")");
else if (chr == ';')
push_token_and_create_new(ret, tok, TOK_RPAREN, ";");
push_token_and_create_new(ret, tok, TOK_SEMICOLON, ";");
else if (me_isspace(chr))
push_token_and_create_new(ret, tok, TOK_WHITESPACE, " ");
else

46
parser/src/tokenizer_utils.c Normal file
View file

@ -0,0 +1,46 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* tokenizer_utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/03 22:07:25 by maiboyer #+# #+# */
/* Updated: 2024/10/03 22:08:14 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/char/char.h"
#include "me/string/string.h"
#include "me/types.h"
#include "me/vec/vec_token.h"
#include "parser/token.h"
// These *should* be stable-ish, just copy the definition into the files to
// use them
void push_token_and_create_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s);
void push_token_and_set_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s);
void push_token_and_create_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s)
{
t_token tmp;
if (tok->type != TOK_NONE)
vec_token_push(tokens, *tok);
*tok = token_new_none();
tmp = token_new(ttype);
string_push(&tmp.string, s);
vec_token_push(tokens, tmp);
}
void push_token_and_set_new(\
t_vec_token *tokens, t_token *tok, enum e_token ttype, t_const_str s)
{
if (tok->type != TOK_NONE)
vec_token_push(tokens, *tok);
*tok = token_new(ttype);
string_push(&tok->string, s);
}

29
sources/main.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */
/* Updated: 2024/10/03 21:32:41 by maiboyer ### ########.fr */
/* Updated: 2024/10/03 22:47:05 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -102,11 +102,29 @@ void print_node_data(t_node *t, t_usize depth)
*/
t_str token_name(t_token *out);
void func(t_usize i, t_token *token, void *state)
void func(t_usize i, t_token *token, void *vdepth)
{
(void)(state);
(void)(i);
printf("["COL_GREEN"%10s"RESET"] '"COL_YELLOW"%s"RESET"'\n", token_name(token), token->string.buf);
t_usize depth;
t_string sdepth;
depth = 0;
if (vdepth != NULL)
depth = *(t_usize *)vdepth;
sdepth = string_new(16);
i = 0;
while (i++ < depth)
string_push_char(&sdepth, '\t');
if (token->subtokens.buffer != NULL)
{
depth++;
printf("%s[" COL_GREEN "%10s"RESET"]\n", sdepth.buf ,token_name(token));
vec_token_iter(&token->subtokens, func, &depth);
}
else
printf("%s[" COL_GREEN "%10s"RESET"] '"COL_YELLOW"%s"RESET"'\n",\
sdepth.buf ,token_name(token), token->string.buf);
string_free(sdepth);
}
void parse_str(t_state *state)
@ -117,6 +135,7 @@ void parse_str(t_state *state)
if (ts_apply_passes(tokens, &tokens))
return ;
vec_token_iter(&tokens, func, NULL);
vec_token_free(tokens);
}
t_i32 main(t_i32 argc, t_str argv[], t_str envp[])