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

WIP

Browse source
This commit is contained in:
Maix0 2024-06-29 15:22:04 +02:00
parent 14647f3671
commit d81c14b930
5 changed files with 178 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

28
allocator/src/me_alloc/functions1.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/14 18:02:12 by maiboyer #+# #+# */
/* Updated: 2024/05/24 13:54:11 by maiboyer ### ########.fr */
/* Updated: 2024/06/28 19:44:43 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,7 +16,6 @@
#include "aq/allocator.h"
#include "aq/internal_vg_funcs.h"
#include "aq/melloc_interal.h"
#include "valgrind/valgrind.h"
#include <assert.h>
#include <errno.h>
@ -24,8 +23,6 @@
#include <stdio.h>
#include <string.h>
#define eprintf(...) fprintf(stderr, __VA_ARGS__)
void *__libc_malloc(t_usize size);
void *__libc_calloc(t_usize size, t_usize elem);
void *__libc_realloc(void *ptr, t_usize size);
@ -98,21 +95,18 @@ void merge_blocks(t_page *page)
did_merge = false;
while (cur != NULL && next != NULL)
{
(vg_mem_defined(cur, sizeof(*cur)),
vg_mem_defined(next, sizeof(*next)));
(vg_mem_defined(cur, sizeof(*cur)), vg_mem_defined(next, sizeof(*next)));
if (!cur->used && !next->used)
{
did_merge = true;
cur->size += sizeof(*cur);
cur->size += next->size;
(vg_mem_no_access(cur, sizeof(*cur)),
vg_mem_no_access(next, sizeof(*next)));
(vg_mem_no_access(cur, sizeof(*cur)), vg_mem_no_access(next, sizeof(*next)));
next = get_next_block(cur, false);
}
else
{
(vg_mem_no_access(cur, sizeof(*cur)),
vg_mem_no_access(next, sizeof(*next)));
(vg_mem_no_access(cur, sizeof(*cur)), vg_mem_no_access(next, sizeof(*next)));
cur = next;
next = get_next_block(cur, false);
}
@ -197,7 +191,7 @@ t_error alloc_new_page(struct s_allocator_melloc *alloc, t_usize page_size)
page_size = round_to_pow2(page_size, PAGE_POW_2);
if (alloc->list == NULL && alloc_page_list(&alloc->list))
return (eprintf("Oups\n"), ERROR);
return (ERROR);
list = alloc->list;
while (list)
{
@ -243,8 +237,7 @@ void *m_malloc(struct s_allocator_melloc *self, t_usize size)
return (m_realloc(self, NULL, size));
}
void *m_alloc_array(struct s_allocator_melloc *self, t_usize size,
t_usize count)
void *m_alloc_array(struct s_allocator_melloc *self, t_usize size, t_usize count)
{
if (size != 0 && count > SIZE_MAX / size)
return (m_alloc_error(self, "Alloc array overflow"));
@ -292,14 +285,12 @@ void *m_realloc(struct s_allocator_melloc *self, void *ptr, t_usize size)
next = get_next_block(chunk, false);
vg_mem_defined(next, sizeof(*next));
vg_mem_defined(chunk, sizeof(*chunk));
if (next != NULL && !next->used &&
chunk->size + next->size + sizeof(*next) >= size)
if (next != NULL && !next->used && chunk->size + next->size + sizeof(*next) >= size)
{
old_size = chunk->size;
chunk->size += next->size + sizeof(*next);
vg_mem_undefined(next, next->size + sizeof(*next));
vg_block_resize((void *)chunk + sizeof(*chunk), old_size,
chunk->size);
vg_block_resize((void *)chunk + sizeof(*chunk), old_size, chunk->size);
vg_mem_no_access(chunk, sizeof(*chunk));
return (ptr);
}
@ -316,8 +307,7 @@ void *m_realloc(struct s_allocator_melloc *self, void *ptr, t_usize size)
}
}
void *m_realloc_array(struct s_allocator_melloc *self, void *ptr, t_usize size,
t_usize count)
void *m_realloc_array(struct s_allocator_melloc *self, void *ptr, t_usize size, t_usize count)
{
if (size != 0 && count > SIZE_MAX / size)
return (m_alloc_error(self, "Realloc array overflow"));

6
ast/include/ast/ast_raw_structs.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/14 17:46:58 by maiboyer #+# #+# */
/* Updated: 2024/06/23 16:35:56 by maiboyer ### ########.fr */
/* Updated: 2024/06/29 14:44:04 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -125,6 +125,7 @@ struct s_ast_command
t_vec_ast cmd_word;
t_vec_ast suffixes_redirections;
t_ast_terminator_kind term;
bool bang;
};
/// If Statement
@ -270,6 +271,7 @@ struct s_ast_subshell
t_vec_ast body;
t_ast_terminator_kind term;
t_vec_ast suffixes_redirections;
bool bang;
};
/// Brace block
@ -281,6 +283,7 @@ struct s_ast_compound_statement
t_vec_ast body;
t_ast_terminator_kind term;
t_vec_ast suffixes_redirections;
bool bang;
};
/// Variable Assignment
@ -291,6 +294,7 @@ struct s_ast_variable_assignment
{
t_str name;
t_ast_node value;
bool bang;
};
/// File Redirection

200
ast/src/from_node.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/17 12:41:56 by maiboyer #+# #+# */
/* Updated: 2024/06/24 17:38:03 by maiboyer ### ########.fr */
/* Updated: 2024/06/29 15:04:55 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -238,6 +238,7 @@ t_ast_node ast_alloc(t_ast_node_kind kind)
ret->data.command.prefixes = vec_ast_new(16, ast_free);
ret->data.command.suffixes_redirections = vec_ast_new(16, ast_free);
ret->data.command.term = AST_TERM_NONE;
ret->data.command.bang = false;
}
if (kind == AST_COMMAND_SUBSTITUTION)
{
@ -326,9 +327,10 @@ t_ast_node ast_alloc(t_ast_node_kind kind)
}
if (kind == AST_SUBSHELL)
{
ret->data.list.term = AST_TERM_NONE;
ret->data.subshell.term = AST_TERM_NONE;
ret->data.subshell.body = vec_ast_new(16, ast_free);
ret->data.subshell.suffixes_redirections = vec_ast_new(16, ast_free);
ret->data.subshell.bang = false;
}
if (kind == AST_UNTIL)
{
@ -341,6 +343,7 @@ t_ast_node ast_alloc(t_ast_node_kind kind)
{
ret->data.variable_assignment.name = NULL;
ret->data.variable_assignment.value = NULL;
ret->data.variable_assignment.bang = false;
}
if (kind == AST_WHILE)
{
@ -390,11 +393,16 @@ t_error ast_from_node(t_parse_node node, t_const_str input, t_ast_node *out);
t_error build_sym__bare_dollar(t_parse_node self, t_const_str input, t_ast_node *out);
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_comment(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_program(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_raw_string(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_string_content(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_subshell(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_variable_assignment(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_compound_statement(t_parse_node self, t_const_str input, t_ast_node *out);
/* FUNCTION THAT ARE NOT DONE */
@ -408,8 +416,6 @@ t_error build_sym_arithmetic_unary_expression(t_parse_node self, t_const_str inp
t_error build_sym_case_item(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_case_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_command_substitution(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_do_group(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);
@ -427,24 +433,162 @@ t_error build_sym_heredoc_end(t_parse_node self, t_const_str input, t_ast_node *
t_error build_sym_heredoc_redirect(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_heredoc_start(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_negated_command(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_pipeline(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_redirected_statement(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_regex(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_simple_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_simple_heredoc_body(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_subshell(t_parse_node self, t_const_str input, t_ast_node *out);
t_error build_sym_variable_assignments(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);
#include <stdio.h>
void _add_negation(t_ast_node *node)
{
if (node == NULL || *node == NULL)
return;
if ((*node)->kind == AST_PIPELINE)
(*node)->data.pipeline.bang = true;
if ((*node)->kind == AST_COMMAND)
(*node)->data.command.bang = true;
if ((*node)->kind == AST_SUBSHELL)
(*node)->data.subshell.bang = true;
if ((*node)->kind == AST_COMPOUND_STATEMENT)
(*node)->data.compound_statement.bang = true;
if ((*node)->kind == AST_VARIABLE_ASSIGNMENT)
(*node)->data.variable_assignment.bang = true;
}
t_ast_terminator_kind _select_term(t_const_str input, t_usize term_start_byte, t_usize term_end_byte)
{
char term_start;
char term_end;
term_end = '\0';
if (term_end_byte != term_start_byte)
term_end = input[term_end_byte];
term_start = input[term_start_byte];
if (term_start == '&' && term_end == '\0')
return (AST_TERM_FORK);
if (term_start == ';' && term_end == '\0')
return (AST_TERM_SEMI);
if (term_start == ';' && term_end == ';')
return (AST_TERM_DOUBLE_SEMI);
if (term_start == '\n')
return (AST_TERM_NEWLINE);
return (AST_TERM_NONE);
}
t_error build_sym_negated_command(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
// t_ast_node tmp;
// t_usize i;
(void)(out);
(void)(input);
(void)(self);
if (out == NULL)
return (ERROR);
if (ts_node_grammar_symbol(self) != sym_negated_command)
return (ERROR);
if (ts_node_named_child_count(self) != 1)
return (ERROR);
if (ast_from_node(ts_node_named_child(self, 0), input, &ret))
return (ERROR);
_add_negation(&ret);
return (*out = ret, NO_ERROR);
}
t_error build_sym_compound_statement(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
t_ast_node tmp;
t_usize i;
t_ast_terminator_kind term;
(void)(out);
(void)(input);
(void)(self);
if (out == NULL)
return (ERROR);
if (ts_node_grammar_symbol(self) != sym_compound_statement)
return (ERROR);
ret = ast_alloc(AST_COMPOUND_STATEMENT);
i = 0;
while (i < ts_node_named_child_count(self))
{
if (ts_node_field_id_for_child(self, i) == field_terminator && ret->data.compound_statement.body.len != 0)
{
term = _select_term(input, ts_node_start_byte(ts_node_named_child(self, i)), ts_node_end_byte(ts_node_named_child(self, i)));
ast_set_term(&ret->data.compound_statement.body.buffer[ret->data.compound_statement.body.len - 1], term);
}
else
{
if (ast_from_node(ts_node_named_child(self, i), input, &tmp))
return (ast_free(ret), ERROR);
vec_ast_push(&ret->data.compound_statement.body, tmp);
}
i++;
}
return (*out = ret, NO_ERROR);
}
t_error build_sym_subshell(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
t_ast_node tmp;
t_usize i;
t_ast_terminator_kind term;
(void)(out);
(void)(input);
(void)(self);
if (out == NULL)
return (ERROR);
if (ts_node_grammar_symbol(self) != sym_subshell)
return (ERROR);
ret = ast_alloc(AST_SUBSHELL);
// ret->data.subshell.body
i = 0;
while (i < ts_node_named_child_count(self))
{
if (ts_node_field_id_for_child(self, i) == field_terminator && ret->data.subshell.body.len != 0)
{
term = _select_term(input, ts_node_start_byte(ts_node_named_child(self, i)), ts_node_end_byte(ts_node_named_child(self, i)));
ast_set_term(&ret->data.subshell.body.buffer[ret->data.subshell.body.len - 1], term);
}
else
{
if (ast_from_node(ts_node_named_child(self, i), input, &tmp))
return (ast_free(ret), ERROR);
vec_ast_push(&ret->data.subshell.body, tmp);
}
i++;
}
return (*out = ret, NO_ERROR);
}
t_error build_sym_comment(t_parse_node self, t_const_str input, t_ast_node *out)
{
(void)(out);
(void)(input);
(void)(self);
if (out == NULL)
return (ERROR);
if (ts_node_grammar_symbol(self) != sym_comment)
return (ERROR);
*out = ast_alloc(AST_EMPTY);
return (NO_ERROR);
}
t_error build_sym_variable_assignment(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
t_ast_node ret;
t_parse_node temp_ast;
//t_str temp_str;
(void)(self);
(void)(input);
@ -454,40 +598,23 @@ t_error build_sym_variable_assignment(t_parse_node self, t_const_str input, t_as
if (ts_node_grammar_symbol(self) != sym_variable_assignment)
return (ERROR);
ret = ast_alloc(AST_VARIABLE_ASSIGNMENT);
//temp_str = str_substring(input, ts_node_start_byte(self), ts_node_end_byte(self) - ts_node_start_byte(self));
// temp_str = str_substring(input, ts_node_start_byte(self), ts_node_end_byte(self) - ts_node_start_byte(self));
if (ts_node_named_child_count(self) >= 1)
{
temp_ast = ts_node_named_child(self, 0);
if (ts_node_grammar_symbol(temp_ast) != sym_variable_name)
return (ast_free(ret), ERROR);
ret->data.variable_assignment.name = str_substring(input, ts_node_start_byte(temp_ast), ts_node_end_byte(temp_ast) - ts_node_start_byte(temp_ast));
ret->data.variable_assignment.name =
str_substring(input, ts_node_start_byte(temp_ast), ts_node_end_byte(temp_ast) - ts_node_start_byte(temp_ast));
}
if (ts_node_named_child_count(self) > 1){
if (ast_from_node(ts_node_named_child(self, 1) ,input,&ret->data.variable_assignment.value))
if (ts_node_named_child_count(self) > 1)
{
if (ast_from_node(ts_node_named_child(self, 1), input, &ret->data.variable_assignment.value))
return (ast_free(ret), ERROR);
}
return (*out = ret, NO_ERROR);
}
t_error build_sym_variable_name(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
t_str temp_str;
(void)(self);
(void)(input);
(void)(out);
if (out == NULL)
return (ERROR);
if (ts_node_grammar_symbol(self) != sym_string)
return (ERROR);
ret = ast_alloc(AST_RAW_STRING);
temp_str = str_substring(input, ts_node_start_byte(self), ts_node_end_byte(self) - ts_node_start_byte(self));
ret->data.raw_string.str = temp_str;
ret->data.raw_string.len = str_len(temp_str);
return (*out = ret, NO_ERROR);
}
t_error build_sym__bare_dollar(t_parse_node self, t_const_str input, t_ast_node *out)
{
t_ast_node ret;
@ -635,7 +762,7 @@ t_error build_sym_command_name(t_parse_node self, t_const_str input, t_ast_node
return (ast_from_node(ts_node_named_child(self, 0), input, out));
}
static inline t_vec_ast *_vec_command(t_ast_command *val, t_usize i)
t_vec_ast *_vec_command(t_ast_command *val, t_usize i)
{
if (i == 0)
return (&val->prefixes);
@ -647,7 +774,7 @@ static inline t_vec_ast *_vec_command(t_ast_command *val, t_usize i)
return (NULL);
}
static inline void _append_redirection(t_ast_node node, t_ast_node redirection)
void _append_redirection(t_ast_node node, t_ast_node redirection)
{
t_vec_ast *vec;
@ -692,7 +819,6 @@ t_error build_sym_word(t_parse_node self, t_const_str input, t_ast_node *out)
temp_str = str_substring(input, ts_node_start_byte(self), ts_node_end_byte(self) - ts_node_start_byte(self));
temp->data.raw_string.str = temp_str;
temp->data.raw_string.len = str_len(temp_str);
printf("temp_str = '%s'\n", temp_str);
vec_ast_push(&ret->data.word.inner, temp);
return (*out = ret, NO_ERROR);
}
@ -928,10 +1054,6 @@ t_error ast_from_node(t_parse_node node, t_const_str input, t_ast_node *out)
return (build_sym_subshell(node, input, out));
if (ts_node_grammar_symbol(node) == sym_variable_assignment)
return (build_sym_variable_assignment(node, input, out));
// if (ts_node_grammar_symbol(node) == sym_variable_assignments)
// return (build_sym_variable_assignments(node, input, out));
if (ts_node_grammar_symbol(node) == sym_variable_name)
return (build_sym_variable_name(node, input, out));
if (ts_node_grammar_symbol(node) == sym_while_statement)
return (build_sym_while_statement(node, input, out));
if (ts_node_grammar_symbol(node) == sym_word)

4
parser/static/types/type_non_terminal_alias_map.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/14 19:17:54 by maiboyer #+# #+# */
/* Updated: 2024/06/23 18:43:22 by maiboyer ### ########.fr */
/* Updated: 2024/06/29 15:16:43 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,7 @@
typedef struct s_non_terminal_alias_map_array
{
uint16_t a[9];
uint16_t a[10];
} t_non_terminal_alias_map_array;
#endif // TYPE_NON_TERMINAL_ALIAS_MAP_H

2
tree-sitter-sh/grammar.js
View file

@ -66,7 +66,7 @@ module.exports = grammar({
$.file_descriptor,
$._empty_value,
$._concat,
$.variable_name, // Variable name followed by an operator like '=' or '+='
$.variable_name,
$.regex,
$._expansion_word,
$.extglob_pattern,