diff --git a/Minishell.mk b/Minishell.mk index 597a0e09..2fce1588 100644 --- a/Minishell.mk +++ b/Minishell.mk @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/04/28 17:28:30 by maiboyer #+# #+# # -# Updated: 2024/05/01 10:34:21 by maiboyer ### ########.fr # +# Updated: 2024/05/02 15:14:11 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -55,7 +55,7 @@ END = \033[0m all: @$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" CC=$(CC) libme.a - @$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a + @$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" -j "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a @$(MAKE) -f./Minishell.mk $(NAME) # Bonus (make bonus) diff --git a/includes/app/node/handle_concat.h b/includes/app/node/handle_concat.h new file mode 100644 index 00000000..174ed05c --- /dev/null +++ b/includes/app/node/handle_concat.h @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* handle_concat.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 15:49:12 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 15:52:16 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef HANDLE_CONCAT_H +#define HANDLE_CONCAT_H + +#include "app/state.h" +#include "app/node.h" +#include "me/types.h" + +t_error handle_concat(t_node *self, t_utils *shcat, t_str *ret); + +#endif /* HANDLE_CONCAT_H */ diff --git a/includes/app/node/handle_raw_word.h b/includes/app/node/handle_raw_word.h new file mode 100644 index 00000000..5ece8af0 --- /dev/null +++ b/includes/app/node/handle_raw_word.h @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* handle_raw_word.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 15:58:01 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 15:58:48 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef HANDLE_RAW_WORD_H +#define HANDLE_RAW_WORD_H + +#include "app/node.h" +#include "app/state.h" + +t_error handle_raw_string(t_node *self, t_utils *shcat, t_str *ret); + +#endif /* HANDLE_RAW_WORD_H */ diff --git a/includes/app/node/handle_word.h b/includes/app/node/handle_word.h new file mode 100644 index 00000000..7b418966 --- /dev/null +++ b/includes/app/node/handle_word.h @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* handle_word.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 16:00:11 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 16:00:40 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef HANDLE_WORD_H +#define HANDLE_WORD_H + +#include "app/state.h" +#include "app/node.h" +#include "me/types.h" + +t_error handle_word(t_node *self, t_utils *shcat, t_str *ret); + +#endif /* HANDLE_WORD_H */ diff --git a/includes/app/state.h b/includes/app/state.h new file mode 100644 index 00000000..96e465bb --- /dev/null +++ b/includes/app/state.h @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* state.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 15:49:56 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 15:51:38 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef STATE_H +#define STATE_H + +#include "app/node.h" +#include "me/types.h" + +typedef struct s_parser +{ + t_first_parser *parser; +} t_parser; + +typedef struct s_utils +{ + t_str name_shell; + t_str str_input; + t_str *strs_input; + t_str *path; + t_str *envp; + t_parser parser; + t_node current_node; +} t_utils; + +#endif /* STATE_H */ diff --git a/includes/minishell.h b/includes/minishell.h index 9238fda0..aa22bae0 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,57 +6,41 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 14:41:15 by rparodi #+# #+# */ -/* Updated: 2024/04/30 16:41:57 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 15:51:57 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef MINISHELL_H #define MINISHELL_H -# include "me/types.h" -# include "app/node.h" +#include "app/node.h" +#include "app/state.h" +#include "me/types.h" -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -# define PATH_FILES "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" - -typedef struct s_parser -{ - t_first_parser *parser; -} t_parser; - -typedef struct s_utils -{ - t_str name_shell; - t_str str_input; - t_str *strs_input; - t_str *path; - t_str *envp; - t_parser parser; - t_node current_node; -} t_utils; +#define PATH_FILES "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" t_i32 main(t_i32 argc, t_str argv[], t_str arge[]); void ft_other_cmd(t_utils *shcat, t_usize i, t_usize prev_i); t_i32 ft_strcmp(const char *s1, const char *s2); t_i32 ft_check_type_operators(t_str operators); -t_str *ft_split(t_const_str s, t_i8 c); +t_str *ft_split(t_const_str s, t_i8 c); t_str ft_strdup(t_const_str s); -char *ft_strjoin(char const *s1, char const *s2); -void *ft_calloc(t_usize nmemb, t_usize size); +char *ft_strjoin(char const *s1, char const *s2); +void *ft_calloc(t_usize nmemb, t_usize size); size_t ft_strlen(t_const_str s); -t_usize ft_strlcpy(t_str dst, t_const_str src, t_usize size); -void *ft_memset(void *s, t_i32 c, t_usize n); +t_usize ft_strlcpy(t_str dst, t_const_str src, t_usize size); +void *ft_memset(void *s, t_i32 c, t_usize n); void ft_bzero(void *s, t_usize n); void ft_free_strs(t_str *strs); void ft_pwd(void); diff --git a/parser/Makefile b/parser/Makefile index c4ff27d9..fe6a30c7 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # -# Updated: 2024/05/01 15:52:16 by maiboyer ### ########.fr # +# Updated: 2024/05/02 15:00:49 by maiboyer ### ########.fr # # # # **************************************************************************** # diff --git a/parser/parse_types.h b/parser/parse_types.h index 0241e275..a5826211 100644 --- a/parser/parse_types.h +++ b/parser/parse_types.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 23:01:45 by maiboyer #+# #+# */ -/* Updated: 2024/04/29 16:41:40 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 14:37:53 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,6 +35,10 @@ # include "parser/types/types_symbol.h" # include "parser/types/types_symbol_metadata.h" +#ifndef inline +#define inline __inline__ +#endif + static inline bool lex_skip(t_state_id state_value, t_lexer *lexer, t_lexer_state *s) { diff --git a/parser/src/api.h b/parser/src/api.h index 5705e317..9dbcc7a1 100644 --- a/parser/src/api.h +++ b/parser/src/api.h @@ -46,6 +46,10 @@ uint32_t capacity; \ } +#ifndef inline +# define inline __inline__ +#endif + /// Initialize an array. #define array_init(self) \ ((self)->size = 0, (self)->capacity = 0, (self)->contents = NULL) @@ -1866,4 +1870,4 @@ t_parse_node ts_node_new(const t_first_tree *, const t_subtree *, t_length, typedef uint64_t t_parser_clock; typedef uint64_t t_parser_duration; -#endif // TREE_SITTER_TREE_H_ \ No newline at end of file +#endif // TREE_SITTER_TREE_H_ diff --git a/parser/static/alias_sequences/alias_sequences.h b/parser/static/alias_sequences/alias_sequences.h index c9b8b028..594831c9 100644 --- a/parser/static/alias_sequences/alias_sequences.h +++ b/parser/static/alias_sequences/alias_sequences.h @@ -24,4 +24,4 @@ void alias_sequences_0(t_alias_sequences_array *v); void alias_sequences_1(t_alias_sequences_array *v); void alias_sequences_2(t_alias_sequences_array *v); -#endif // ALIAS_SEQUENCES_H +#endif diff --git a/parser/static/char_set/charset_inline.h b/parser/static/char_set/charset_inline.h index c72c66d0..34d357b8 100644 --- a/parser/static/char_set/charset_inline.h +++ b/parser/static/char_set/charset_inline.h @@ -35,4 +35,4 @@ static inline t_char_range *sym_word_character_set_1(void) return (val); } -#endif // CHARSET_INLINE_H +#endif diff --git a/parser/static/external_scanner_states/external_scanner_states.h b/parser/static/external_scanner_states/external_scanner_states.h index fbd3122f..b943927f 100644 --- a/parser/static/external_scanner_states/external_scanner_states.h +++ b/parser/static/external_scanner_states/external_scanner_states.h @@ -53,4 +53,4 @@ void external_scanner_states_29(t_external_scanner_states_array *v); void external_scanner_states_30(t_external_scanner_states_array *v); void external_scanner_states_31(t_external_scanner_states_array *v); -#endif // EXTERNAL_SCANNER_STATES_H +#endif diff --git a/parser/static/external_scanner_symbol_map/external_scanner_symbol_map.h b/parser/static/external_scanner_symbol_map/external_scanner_symbol_map.h index 368719b8..840eff7a 100644 --- a/parser/static/external_scanner_symbol_map/external_scanner_symbol_map.h +++ b/parser/static/external_scanner_symbol_map/external_scanner_symbol_map.h @@ -23,4 +23,4 @@ void external_scanner_symbol_map_0(t_external_scanner_symbol_map_array *v); void external_scanner_symbol_map_1(t_external_scanner_symbol_map_array *v); -#endif // EXTERNAL_SCANNER_SYMBOL_MAP_H +#endif diff --git a/parser/static/field_map_entries/field_map_entries.h b/parser/static/field_map_entries/field_map_entries.h index 47256c41..5c383df7 100644 --- a/parser/static/field_map_entries/field_map_entries.h +++ b/parser/static/field_map_entries/field_map_entries.h @@ -36,4 +36,4 @@ void field_map_entries_12(t_field_map_entries_array *v); void field_map_entries_13(t_field_map_entries_array *v); void field_map_entries_14(t_field_map_entries_array *v); -#endif // FIELD_MAP_ENTRIES_H +#endif diff --git a/parser/static/field_map_slices/field_map_slices.h b/parser/static/field_map_slices/field_map_slices.h index 41a82578..7ef9b9ce 100644 --- a/parser/static/field_map_slices/field_map_slices.h +++ b/parser/static/field_map_slices/field_map_slices.h @@ -29,4 +29,4 @@ void field_map_slices_5(t_field_map_slices_array *v); void field_map_slices_6(t_field_map_slices_array *v); void field_map_slices_7(t_field_map_slices_array *v); -#endif // FIELD_MAP_SLICES_H +#endif diff --git a/parser/static/field_names/field_names.h b/parser/static/field_names/field_names.h index e2cdc2c3..c478edaa 100644 --- a/parser/static/field_names/field_names.h +++ b/parser/static/field_names/field_names.h @@ -22,4 +22,4 @@ void field_names_0(t_field_names_array *v); -#endif // FIELD_NAMES_H +#endif diff --git a/parser/static/headers/constants.h b/parser/static/headers/constants.h index 2f4b59b0..32ddc8a5 100644 --- a/parser/static/headers/constants.h +++ b/parser/static/headers/constants.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/14 19:17:54 by maiboyer #+# #+# */ -/* Updated: 2024/04/14 19:18:20 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 14:39:56 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,4 +24,4 @@ # define MAX_ALIAS_SEQUENCE_LENGTH 8 # define PRODUCTION_ID_COUNT 159 -#endif // CONSTANTS_H +#endif diff --git a/parser/static/headers/external_scanner_symbol_identifiers.h b/parser/static/headers/external_scanner_symbol_identifiers.h index 8347c939..2ef12d11 100644 --- a/parser/static/headers/external_scanner_symbol_identifiers.h +++ b/parser/static/headers/external_scanner_symbol_identifiers.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/14 19:17:54 by maiboyer #+# #+# */ -/* Updated: 2024/04/14 19:18:20 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 14:40:04 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -45,4 +45,4 @@ enum e_external_scanner_symbol_identifiers { ts_external_token___error_recovery = 28, }; -#endif // EXTERNAL_SCANNER_SYMBOL_IDENTIFIERS_H +#endif diff --git a/parser/static/headers/field_identifiers.h b/parser/static/headers/field_identifiers.h index 4c8dda5f..dc4d4c33 100644 --- a/parser/static/headers/field_identifiers.h +++ b/parser/static/headers/field_identifiers.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/14 19:17:54 by maiboyer #+# #+# */ -/* Updated: 2024/04/14 19:18:20 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 14:40:12 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,4 +35,4 @@ enum e_field_identifiers { field_variable = 19, }; -#endif // FIELD_IDENTIFIERS_H +#endif diff --git a/parser/static/headers/symbols.h b/parser/static/headers/symbols.h index fc28178c..4183a2ac 100644 --- a/parser/static/headers/symbols.h +++ b/parser/static/headers/symbols.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/14 19:17:54 by maiboyer #+# #+# */ -/* Updated: 2024/04/14 19:18:20 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 14:40:22 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -295,4 +295,4 @@ enum e_symbols { aux_sym__concatenation_in_expansion_repeat1 = 279, }; -#endif // SYMBOLS_H +#endif diff --git a/parser/static/lex_funcs/lex_keywords/create_table/lex_keywords_array.h b/parser/static/lex_funcs/lex_keywords/create_table/lex_keywords_array.h index 338ca357..0f8b7af2 100644 --- a/parser/static/lex_funcs/lex_keywords/create_table/lex_keywords_array.h +++ b/parser/static/lex_funcs/lex_keywords/create_table/lex_keywords_array.h @@ -27,4 +27,4 @@ void lex_keywords_array_2(t_lex_keywords_array *v); void lex_keywords_array_3(t_lex_keywords_array *v); void lex_keywords_array_4(t_lex_keywords_array *v); -#endif // LEX_KEYWORDS_ARRAY_H +#endif diff --git a/parser/static/lex_funcs/lex_keywords/inline.h b/parser/static/lex_funcs/lex_keywords/inline.h index fa03b145..0d8b6700 100644 --- a/parser/static/lex_funcs/lex_keywords/inline.h +++ b/parser/static/lex_funcs/lex_keywords/inline.h @@ -19,4 +19,4 @@ # include "../../headers/constants.h" # include "../../../parse_types.h" -#endif // INLINE_H +#endif diff --git a/parser/static/lex_funcs/lex_keywords/lex_keywords_funcs.h b/parser/static/lex_funcs/lex_keywords/lex_keywords_funcs.h index 27f4833f..d9e936e4 100644 --- a/parser/static/lex_funcs/lex_keywords/lex_keywords_funcs.h +++ b/parser/static/lex_funcs/lex_keywords/lex_keywords_funcs.h @@ -124,4 +124,4 @@ bool lex_keywords_s95(t_lexer *lexer, t_lexer_state *s); bool lex_keywords_s96(t_lexer *lexer, t_lexer_state *s); bool lex_keywords_default(t_lexer *lexer, t_lexer_state *s); -#endif // LEX_KEYWORDS_FUNCS_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/create_table/lex_normal_array.h b/parser/static/lex_funcs/lex_normal/create_table/lex_normal_array.h index 638e64be..ab8269fd 100644 --- a/parser/static/lex_funcs/lex_normal/create_table/lex_normal_array.h +++ b/parser/static/lex_funcs/lex_normal/create_table/lex_normal_array.h @@ -70,4 +70,4 @@ void lex_normal_array_45(t_lex_normal_array *v); void lex_normal_array_46(t_lex_normal_array *v); void lex_normal_array_47(t_lex_normal_array *v); -#endif // LEX_NORMAL_ARRAY_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline.h b/parser/static/lex_funcs/lex_normal/inline.h index 91bc4c19..91c3b7f2 100644 --- a/parser/static/lex_funcs/lex_normal/inline.h +++ b/parser/static/lex_funcs/lex_normal/inline.h @@ -66,4 +66,4 @@ # include "./inline/inline_impl45.h" # include "./inline/inline_impl46.h" -#endif // INLINE_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl0.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl0.h index e0bc93a5..09d82fcb 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl0.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl0.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map84(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL0_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl1.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl1.h index a8c117a2..603f6ade 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl1.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl1.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map236(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL1_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl10.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl10.h index 31e7020b..d3cc367f 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl10.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl10.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map281(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL10_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl11.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl11.h index c01fb963..a6fd9160 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl11.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl11.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map286(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL11_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl12.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl12.h index a9e50c4a..352b28a0 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl12.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl12.h @@ -81,4 +81,4 @@ static inline bool lex_normal_map291(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL12_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl13.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl13.h index 6554a610..83d724f8 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl13.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl13.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map296(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL13_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl14.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl14.h index d633e574..8f81187c 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl14.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl14.h @@ -81,4 +81,4 @@ static inline bool lex_normal_map401(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL14_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl15.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl15.h index c739f885..4aac6a3b 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl15.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl15.h @@ -88,4 +88,4 @@ static inline bool lex_normal_map406(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL15_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl16.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl16.h index 5556ab04..c1195d7e 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl16.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl16.h @@ -85,4 +85,4 @@ static inline bool lex_normal_map411(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL16_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl17.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl17.h index 54aaf8b3..284968be 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl17.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl17.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map416(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL17_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl18.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl18.h index a9e7f107..ff658a3d 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl18.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl18.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map421(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL18_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl19.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl19.h index 22a53934..f5b9d76d 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl19.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl19.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map426(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL19_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl2.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl2.h index 063988fd..a1308250 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl2.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl2.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map241(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL2_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl20.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl20.h index 98017bac..5e137b44 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl20.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl20.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map431(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL20_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl21.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl21.h index 6331f6c3..dd5b085a 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl21.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl21.h @@ -79,4 +79,4 @@ static inline bool lex_normal_map436(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL21_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl22.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl22.h index 36b1b477..829f3afa 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl22.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl22.h @@ -74,4 +74,4 @@ static inline bool lex_normal_map441(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL22_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl23.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl23.h index 5e91ea8f..c3eb1665 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl23.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl23.h @@ -76,4 +76,4 @@ static inline bool lex_normal_map446(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL23_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl24.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl24.h index 735b1e56..a478dae6 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl24.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl24.h @@ -74,4 +74,4 @@ static inline bool lex_normal_map451(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL24_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl25.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl25.h index 467d6015..3b1679e2 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl25.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl25.h @@ -71,4 +71,4 @@ static inline bool lex_normal_map456(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL25_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl26.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl26.h index 3c2fe645..f36851c1 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl26.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl26.h @@ -78,4 +78,4 @@ static inline bool lex_normal_map461(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL26_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl27.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl27.h index 5fed206f..15ed8779 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl27.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl27.h @@ -78,4 +78,4 @@ static inline bool lex_normal_map466(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL27_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl28.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl28.h index fe9d32ad..364a10c6 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl28.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl28.h @@ -78,4 +78,4 @@ static inline bool lex_normal_map471(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL28_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl29.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl29.h index 003c3d24..7d6d5053 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl29.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl29.h @@ -75,4 +75,4 @@ static inline bool lex_normal_map476(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL29_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl3.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl3.h index 88e12a2f..3ff00029 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl3.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl3.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map246(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL3_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl30.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl30.h index 6d757ed0..ec14fe2c 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl30.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl30.h @@ -74,4 +74,4 @@ static inline bool lex_normal_map485(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL30_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl31.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl31.h index 2417e0fd..4033a4ad 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl31.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl31.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map530(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL31_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl32.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl32.h index 7a46e16a..91d2aa8b 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl32.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl32.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map535(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL32_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl33.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl33.h index f51ca329..ccf9b45e 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl33.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl33.h @@ -83,4 +83,4 @@ static inline bool lex_normal_map540(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL33_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl34.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl34.h index 8c69424f..93473d16 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl34.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl34.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map880(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL34_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl35.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl35.h index 4dfa5a0d..e080383c 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl35.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl35.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map885(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL35_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl36.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl36.h index 3a53c699..f03d2cdb 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl36.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl36.h @@ -81,4 +81,4 @@ static inline bool lex_normal_map890(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL36_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl37.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl37.h index 7f1abf44..ab3d726b 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl37.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl37.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map895(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL37_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl38.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl38.h index 63030271..9668056a 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl38.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl38.h @@ -81,4 +81,4 @@ static inline bool lex_normal_map900(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL38_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl39.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl39.h index 64779fba..1e4e4f27 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl39.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl39.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map905(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL39_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl4.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl4.h index c025baff..0b2ccbe3 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl4.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl4.h @@ -81,4 +81,4 @@ static inline bool lex_normal_map251(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL4_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl40.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl40.h index a58874a4..78446496 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl40.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl40.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map910(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL40_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl41.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl41.h index 6d607134..ff8c199f 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl41.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl41.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map915(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL41_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl42.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl42.h index f565c9e0..fbaef31f 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl42.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl42.h @@ -79,4 +79,4 @@ static inline bool lex_normal_map920(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL42_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl43.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl43.h index ea7ec7db..c0b68030 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl43.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl43.h @@ -78,4 +78,4 @@ static inline bool lex_normal_map925(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL43_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl44.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl44.h index 5387db72..3952a277 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl44.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl44.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map930(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL44_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl45.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl45.h index f46c03d3..aec15863 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl45.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl45.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map935(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL45_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl46.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl46.h index b6ae2f3a..133a514b 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl46.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl46.h @@ -63,4 +63,4 @@ static inline bool lex_normal_map939(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL46_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl5.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl5.h index 14edb722..709e2517 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl5.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl5.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map256(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL5_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl6.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl6.h index 56e4083b..0b93f43e 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl6.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl6.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map261(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL6_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl7.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl7.h index 36361a6f..bbc0a29f 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl7.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl7.h @@ -82,4 +82,4 @@ static inline bool lex_normal_map266(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL7_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl8.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl8.h index 340748af..c5e0456f 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl8.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl8.h @@ -80,4 +80,4 @@ static inline bool lex_normal_map271(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL8_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/inline/inline_impl9.h b/parser/static/lex_funcs/lex_normal/inline/inline_impl9.h index c19e770b..00f78756 100644 --- a/parser/static/lex_funcs/lex_normal/inline/inline_impl9.h +++ b/parser/static/lex_funcs/lex_normal/inline/inline_impl9.h @@ -81,4 +81,4 @@ static inline bool lex_normal_map276(t_lexer *lexer, \ return (advance_map_inner(map, sizeof(map) / sizeof(*map), \ lexer, s)); } -#endif // INLINE_IMPL9_H +#endif diff --git a/parser/static/lex_funcs/lex_normal/lex_normal_funcs.h b/parser/static/lex_funcs/lex_normal/lex_normal_funcs.h index 847e61d5..05b0312f 100644 --- a/parser/static/lex_funcs/lex_normal/lex_normal_funcs.h +++ b/parser/static/lex_funcs/lex_normal/lex_normal_funcs.h @@ -990,4 +990,4 @@ bool lex_normal_s957(t_lexer *lexer, t_lexer_state *s); bool lex_normal_s958(t_lexer *lexer, t_lexer_state *s); bool lex_normal_default(t_lexer *lexer, t_lexer_state *s); -#endif // LEX_NORMAL_FUNCS_H +#endif diff --git a/parser/static/lex_modes/lex_modes.h b/parser/static/lex_modes/lex_modes.h index 07a2648a..43f61973 100644 --- a/parser/static/lex_modes/lex_modes.h +++ b/parser/static/lex_modes/lex_modes.h @@ -405,4 +405,4 @@ void lex_modes_381(t_lex_modes_array *v); void lex_modes_382(t_lex_modes_array *v); void lex_modes_383(t_lex_modes_array *v); -#endif // LEX_MODES_H +#endif diff --git a/parser/static/non_terminal_alias_map/non_terminal_alias_map.h b/parser/static/non_terminal_alias_map/non_terminal_alias_map.h index 27b2aba5..63170a65 100644 --- a/parser/static/non_terminal_alias_map/non_terminal_alias_map.h +++ b/parser/static/non_terminal_alias_map/non_terminal_alias_map.h @@ -22,4 +22,4 @@ void non_terminal_alias_map_0(t_non_terminal_alias_map_array *v); -#endif // NON_TERMINAL_ALIAS_MAP_H +#endif diff --git a/parser/static/parse_actions_entries/parse_actions_entries.h b/parser/static/parse_actions_entries/parse_actions_entries.h index a7a8ddd3..e9da9dc7 100644 --- a/parser/static/parse_actions_entries/parse_actions_entries.h +++ b/parser/static/parse_actions_entries/parse_actions_entries.h @@ -858,4 +858,4 @@ void parse_actions_entries_834(t_parse_actions_entries_array *v); void parse_actions_entries_835(t_parse_actions_entries_array *v); void parse_actions_entries_836(t_parse_actions_entries_array *v); -#endif // PARSE_ACTIONS_ENTRIES_H +#endif diff --git a/parser/static/parse_table/parse_table.h b/parser/static/parse_table/parse_table.h index 9094f9f9..14b63cb3 100644 --- a/parser/static/parse_table/parse_table.h +++ b/parser/static/parse_table/parse_table.h @@ -2352,4 +2352,4 @@ void parse_table_2328(t_parse_table_array *v); void parse_table_2329(t_parse_table_array *v); void parse_table_2330(t_parse_table_array *v); -#endif // PARSE_TABLE_H +#endif diff --git a/parser/static/primary_state_ids/primary_state_ids.h b/parser/static/primary_state_ids/primary_state_ids.h index 2bd81d9e..e2826cfc 100644 --- a/parser/static/primary_state_ids/primary_state_ids.h +++ b/parser/static/primary_state_ids/primary_state_ids.h @@ -405,4 +405,4 @@ void primary_state_ids_381(t_primary_state_ids_array *v); void primary_state_ids_382(t_primary_state_ids_array *v); void primary_state_ids_383(t_primary_state_ids_array *v); -#endif // PRIMARY_STATE_IDS_H +#endif diff --git a/parser/static/small_parse_table/small_parse_table.h b/parser/static/small_parse_table/small_parse_table.h index 7e9bd245..dd5010ee 100644 --- a/parser/static/small_parse_table/small_parse_table.h +++ b/parser/static/small_parse_table/small_parse_table.h @@ -16241,4 +16241,4 @@ void small_parse_table_16217(t_small_parse_table_array *v); void small_parse_table_16218(t_small_parse_table_array *v); void small_parse_table_16219(t_small_parse_table_array *v); -#endif // SMALL_PARSE_TABLE_H +#endif diff --git a/parser/static/small_parse_table_map/small_parse_table_map.h b/parser/static/small_parse_table_map/small_parse_table_map.h index 0fd48ca1..50f5842c 100644 --- a/parser/static/small_parse_table_map/small_parse_table_map.h +++ b/parser/static/small_parse_table_map/small_parse_table_map.h @@ -379,4 +379,4 @@ void small_parse_table_map_355(t_small_parse_table_map_array *v); void small_parse_table_map_356(t_small_parse_table_map_array *v); void small_parse_table_map_357(t_small_parse_table_map_array *v); -#endif // SMALL_PARSE_TABLE_MAP_H +#endif diff --git a/parser/static/symbols_metadata/symbols_metadata.h b/parser/static/symbols_metadata/symbols_metadata.h index 84c44283..b228087d 100644 --- a/parser/static/symbols_metadata/symbols_metadata.h +++ b/parser/static/symbols_metadata/symbols_metadata.h @@ -35,4 +35,4 @@ void symbols_metadata_11(t_symbols_metadata_array *v); void symbols_metadata_12(t_symbols_metadata_array *v); void symbols_metadata_13(t_symbols_metadata_array *v); -#endif // SYMBOLS_METADATA_H +#endif diff --git a/parser/static/symbols_names/symbols_names.h b/parser/static/symbols_names/symbols_names.h index 99b9120b..3f270229 100644 --- a/parser/static/symbols_names/symbols_names.h +++ b/parser/static/symbols_names/symbols_names.h @@ -35,4 +35,4 @@ void symbols_names_11(t_symbols_names_array *v); void symbols_names_12(t_symbols_names_array *v); void symbols_names_13(t_symbols_names_array *v); -#endif // SYMBOLS_NAMES_H +#endif diff --git a/parser/static/types/type_alias_sequences.h b/parser/static/types/type_alias_sequences.h index 088ab50f..461dcf68 100644 --- a/parser/static/types/type_alias_sequences.h +++ b/parser/static/types/type_alias_sequences.h @@ -24,4 +24,4 @@ typedef struct s_alias_sequences_array t_symbol a[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH]; } t_alias_sequences_array; -#endif // TYPE_ALIAS_SEQUENCES_H +#endif diff --git a/parser/static/types/type_external_scanner_states.h b/parser/static/types/type_external_scanner_states.h index 6e3cd4e3..ff2c1abe 100644 --- a/parser/static/types/type_external_scanner_states.h +++ b/parser/static/types/type_external_scanner_states.h @@ -24,4 +24,4 @@ typedef struct s_external_scanner_states_array bool a[131][EXTERNAL_TOKEN_COUNT]; } t_external_scanner_states_array; -#endif // TYPE_EXTERNAL_SCANNER_STATES_H +#endif diff --git a/parser/static/types/type_external_scanner_symbol_map.h b/parser/static/types/type_external_scanner_symbol_map.h index 63edefa1..b90425eb 100644 --- a/parser/static/types/type_external_scanner_symbol_map.h +++ b/parser/static/types/type_external_scanner_symbol_map.h @@ -24,4 +24,4 @@ typedef struct s_external_scanner_symbol_map_array t_symbol a[EXTERNAL_TOKEN_COUNT]; } t_external_scanner_symbol_map_array; -#endif // TYPE_EXTERNAL_SCANNER_SYMBOL_MAP_H +#endif diff --git a/parser/static/types/type_field_map_entries.h b/parser/static/types/type_field_map_entries.h index b8beba53..dfcc68cb 100644 --- a/parser/static/types/type_field_map_entries.h +++ b/parser/static/types/type_field_map_entries.h @@ -24,4 +24,4 @@ typedef struct s_field_map_entries_array t_field_map_entry a[287]; } t_field_map_entries_array; -#endif // TYPE_FIELD_MAP_ENTRIES_H +#endif diff --git a/parser/static/types/type_field_map_slices.h b/parser/static/types/type_field_map_slices.h index 85ac8a03..23d56e34 100644 --- a/parser/static/types/type_field_map_slices.h +++ b/parser/static/types/type_field_map_slices.h @@ -24,4 +24,4 @@ typedef struct s_field_map_slices_array t_field_map_slice a[PRODUCTION_ID_COUNT]; } t_field_map_slices_array; -#endif // TYPE_FIELD_MAP_SLICES_H +#endif diff --git a/parser/static/types/type_field_names.h b/parser/static/types/type_field_names.h index 5bbcfdf2..9d9358fe 100644 --- a/parser/static/types/type_field_names.h +++ b/parser/static/types/type_field_names.h @@ -24,4 +24,4 @@ typedef struct s_field_names_array const char *a[20]; } t_field_names_array; -#endif // TYPE_FIELD_NAMES_H +#endif diff --git a/parser/static/types/type_lex_keywords.h b/parser/static/types/type_lex_keywords.h index d8726473..c17261c4 100644 --- a/parser/static/types/type_lex_keywords.h +++ b/parser/static/types/type_lex_keywords.h @@ -24,4 +24,4 @@ typedef struct s_lex_keywords_array void *a[97]; } t_lex_keywords_array; -#endif // TYPE_LEX_KEYWORDS_H +#endif diff --git a/parser/static/types/type_lex_modes.h b/parser/static/types/type_lex_modes.h index b0e00dcb..3520e021 100644 --- a/parser/static/types/type_lex_modes.h +++ b/parser/static/types/type_lex_modes.h @@ -24,4 +24,4 @@ typedef struct s_lex_modes_array t_lex_modes a[STATE_COUNT]; } t_lex_modes_array; -#endif // TYPE_LEX_MODES_H +#endif diff --git a/parser/static/types/type_lex_normal.h b/parser/static/types/type_lex_normal.h index e9a3b345..c5716d2b 100644 --- a/parser/static/types/type_lex_normal.h +++ b/parser/static/types/type_lex_normal.h @@ -24,4 +24,4 @@ typedef struct s_lex_normal_array void *a[959]; } t_lex_normal_array; -#endif // TYPE_LEX_NORMAL_H +#endif diff --git a/parser/static/types/type_non_terminal_alias_map.h b/parser/static/types/type_non_terminal_alias_map.h index d60ddd71..c421365c 100644 --- a/parser/static/types/type_non_terminal_alias_map.h +++ b/parser/static/types/type_non_terminal_alias_map.h @@ -24,4 +24,4 @@ typedef struct s_non_terminal_alias_map_array uint16_t a[5]; } t_non_terminal_alias_map_array; -#endif // TYPE_NON_TERMINAL_ALIAS_MAP_H +#endif diff --git a/parser/static/types/type_parse_actions_entries.h b/parser/static/types/type_parse_actions_entries.h index e2c3d840..858832c4 100644 --- a/parser/static/types/type_parse_actions_entries.h +++ b/parser/static/types/type_parse_actions_entries.h @@ -24,4 +24,4 @@ typedef struct s_parse_actions_entries_array t_parse_action_entry a[16731]; } t_parse_actions_entries_array; -#endif // TYPE_PARSE_ACTIONS_ENTRIES_H +#endif diff --git a/parser/static/types/type_parse_table.h b/parser/static/types/type_parse_table.h index 3b54a38d..34968e75 100644 --- a/parser/static/types/type_parse_table.h +++ b/parser/static/types/type_parse_table.h @@ -24,4 +24,4 @@ typedef struct s_parse_table_array uint16_t a[LARGE_STATE_COUNT][SYMBOL_COUNT]; } t_parse_table_array; -#endif // TYPE_PARSE_TABLE_H +#endif diff --git a/parser/static/types/type_primary_state_ids.h b/parser/static/types/type_primary_state_ids.h index 90ddabd0..3f89a88b 100644 --- a/parser/static/types/type_primary_state_ids.h +++ b/parser/static/types/type_primary_state_ids.h @@ -24,4 +24,4 @@ typedef struct s_primary_state_ids_array t_state_id a[STATE_COUNT]; } t_primary_state_ids_array; -#endif // TYPE_PRIMARY_STATE_IDS_H +#endif diff --git a/parser/static/types/type_small_parse_table.h b/parser/static/types/type_small_parse_table.h index ed64222b..02602093 100644 --- a/parser/static/types/type_small_parse_table.h +++ b/parser/static/types/type_small_parse_table.h @@ -24,4 +24,4 @@ typedef struct s_small_parse_table_array uint16_t a[324397]; } t_small_parse_table_array; -#endif // TYPE_SMALL_PARSE_TABLE_H +#endif diff --git a/parser/static/types/type_small_parse_table_map.h b/parser/static/types/type_small_parse_table_map.h index bf049554..76239a5e 100644 --- a/parser/static/types/type_small_parse_table_map.h +++ b/parser/static/types/type_small_parse_table_map.h @@ -24,4 +24,4 @@ typedef struct s_small_parse_table_map_array uint32_t a[7143]; } t_small_parse_table_map_array; -#endif // TYPE_SMALL_PARSE_TABLE_MAP_H +#endif diff --git a/parser/static/types/type_symbols_metadata.h b/parser/static/types/type_symbols_metadata.h index 9ca9f3eb..2f69c79b 100644 --- a/parser/static/types/type_symbols_metadata.h +++ b/parser/static/types/type_symbols_metadata.h @@ -24,4 +24,4 @@ typedef struct s_symbols_metadata_array t_symbol_metadata a[280]; } t_symbols_metadata_array; -#endif // TYPE_SYMBOLS_METADATA_H +#endif diff --git a/parser/static/types/type_symbols_names.h b/parser/static/types/type_symbols_names.h index 012cc118..a794c2f4 100644 --- a/parser/static/types/type_symbols_names.h +++ b/parser/static/types/type_symbols_names.h @@ -24,4 +24,4 @@ typedef struct s_symbols_names_array const char *a[281]; } t_symbols_names_array; -#endif // TYPE_SYMBOLS_NAMES_H +#endif diff --git a/parser/static/types/type_unique_symbols_map.h b/parser/static/types/type_unique_symbols_map.h index 7d7012af..14af08bd 100644 --- a/parser/static/types/type_unique_symbols_map.h +++ b/parser/static/types/type_unique_symbols_map.h @@ -24,4 +24,4 @@ typedef struct s_unique_symbols_map_array t_symbol a[280]; } t_unique_symbols_map_array; -#endif // TYPE_UNIQUE_SYMBOLS_MAP_H +#endif diff --git a/parser/static/unique_symbols_map/unique_symbols_map.h b/parser/static/unique_symbols_map/unique_symbols_map.h index 7d42910e..bc4389b7 100644 --- a/parser/static/unique_symbols_map/unique_symbols_map.h +++ b/parser/static/unique_symbols_map/unique_symbols_map.h @@ -35,4 +35,4 @@ void unique_symbols_map_11(t_unique_symbols_map_array *v); void unique_symbols_map_12(t_unique_symbols_map_array *v); void unique_symbols_map_13(t_unique_symbols_map_array *v); -#endif // UNIQUE_SYMBOLS_MAP_H +#endif diff --git a/sources/exec/handle_concat.c b/sources/exec/handle_concat.c new file mode 100644 index 00000000..ce4d5f1b --- /dev/null +++ b/sources/exec/handle_concat.c @@ -0,0 +1,52 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* handle_concat.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 15:05:06 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 16:01:52 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "app/node/handle_concat.h" +#include "app/node.h" +#include "app/node/handle_raw_word.h" +#include "app/node/handle_word.h" +#include "app/state.h" +#include "gmr/symbols.h" +#include "me/buffered_str/buf_str.h" +#include "me/types.h" + +t_error node_get_string(t_node *self, t_utils *shcat, t_str *ret) +{ + if (self->kind == sym_word) + return (handle_word(self, shcat, ret)); + if (self->kind == sym_raw_string) + return (handle_raw_string(self, shcat, ret)); + return (ERROR); +} + +t_error handle_concat(t_node *self, t_utils *shcat, t_str *ret) +{ + t_buffer_str out; + t_usize i; + t_str tmp; + + (void)(shcat); + if (self == NULL || ret == NULL || self->kind != sym_concatenation) + return (ERROR); + out = alloc_new_buffer(16); + i = 0; + while (i < self->childs_count) + { + if (node_get_string(&self->childs[i], shcat, &tmp)) + return (str_free(out), ERROR); + push_str_buffer(&out, tmp); + free(tmp); + i++; + } + *ret = out.buf; + return (NO_ERROR); +} diff --git a/sources/exec/handle_raw_word.c b/sources/exec/handle_raw_word.c new file mode 100644 index 00000000..ad93ca50 --- /dev/null +++ b/sources/exec/handle_raw_word.c @@ -0,0 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* handle_raw_word.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 15:57:33 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 16:03:09 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "app/node/handle_raw_word.h" +#include "app/node.h" +#include "app/state.h" +#include "gmr/symbols.h" +#include "me/string/str_len.h" +#include "me/string/str_substring.h" +#include "me/types.h" + +t_error handle_raw_string(t_node *self, t_utils *shcat, t_str *ret) +{ + t_str tmp; + t_usize i; + + (void)(shcat); + if (self == NULL || ret == NULL || self->kind != sym_raw_string) + return (ERROR); + tmp = node_getstr(self); + i = str_len(tmp); + *ret = str_substring(tmp, 1, i - 2); + return (NO_ERROR); +} diff --git a/sources/exec/handle_word.c b/sources/exec/handle_word.c new file mode 100644 index 00000000..2b8f2c6b --- /dev/null +++ b/sources/exec/handle_word.c @@ -0,0 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* handle_word.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/05/02 15:59:04 by maiboyer #+# #+# */ +/* Updated: 2024/05/02 16:00:00 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "app/node/handle_word.h" +#include "app/state.h" +#include "gmr/symbols.h" +#include "me/string/str_clone.h" +#include "me/types.h" + +t_error handle_word(t_node *self, t_utils *shcat, t_str *ret) +{ + (void)(shcat); + if (self == NULL || ret == NULL || self->kind != sym_word) + return (ERROR); + *ret = str_clone(node_getstr(self)); + return (NO_ERROR); +} diff --git a/sources/main.c b/sources/main.c index f2b8df4d..33740396 100644 --- a/sources/main.c +++ b/sources/main.c @@ -6,13 +6,14 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */ -/* Updated: 2024/05/02 14:18:02 by maiboyer ### ########.fr */ +/* Updated: 2024/05/02 15:26:55 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #include "../includes/minishell.h" #include "app/node.h" #include "app/signal_handler.h" +#include "gmr/symbols.h" #include "me/string/str_len.h" #include "parser/api.h" @@ -74,9 +75,30 @@ void ft_check(t_utils *shcat, char **input) } } +t_error handle_concat(t_node *self, t_utils* shcat, t_str *ret); + +void print_node_concat(t_node *self) +{ + if (self->kind != sym_concatenation) + { + t_usize i = 0; + while (i < self->childs_count) + print_node_concat(&self->childs[i++]); + } + else + { + t_str ret; + if (handle_concat(self, NULL, &ret)) + return ((void)printf("ERROR\n")); + printf("concat value = '%s'\n", ret); + free(ret); + } +} + void exec_shcat(t_utils *shcat) { print_node_data(&shcat->current_node, 0); + print_node_concat(&shcat->current_node); free_node(shcat->current_node); } diff --git a/src.list b/src.list index f0e11998..41fb1256 100644 --- a/src.list +++ b/src.list @@ -1,3 +1,6 @@ +exec/handle_concat.c +exec/handle_raw_word.c +exec/handle_word.c ft_cmd.c ft_echo.c ft_exit.c diff --git a/symbol_list b/symbol_list new file mode 100644 index 00000000..40c9c6bc --- /dev/null +++ b/symbol_list @@ -0,0 +1,110 @@ + sym_word = 1, + sym__special_character = 102, + sym_string_content = 104, + sym_raw_string = 105, + sym_ansi_c_string = 106, + sym_comment = 146, + sym__comment_word = 147, + sym_heredoc_start = 153, + sym_simple_heredoc_body = 154, + sym__heredoc_body_beginning = 155, + sym_heredoc_content = 156, + sym_heredoc_end = 157, + sym_file_descriptor = 158, + sym__empty_value = 159, + sym__concat = 160, + sym_variable_name = 161, + sym_test_operator = 162, + sym_regex = 163, + sym__regex_no_slash = 164, + sym__regex_no_space = 165, + sym__expansion_word = 166, + sym_extglob_pattern = 167, + sym__bare_dollar = 168, + sym__brace_start = 169, + sym__immediate_double_hash = 170, + sym__external_expansion_sym_hash = 171, + sym__external_expansion_sym_bang = 172, + sym__external_expansion_sym_equal = 173, + sym___error_recovery = 174, + sym_program = 175, + sym__statements = 176, + sym__statement_not_pipeline = 178, + sym_redirected_statement = 179, + sym_for_statement = 180, + sym_c_style_for_statement = 181, + sym__for_body = 182, + sym__c_expression = 183, + sym__c_expression_not_assignment = 184, + sym__c_variable_assignment = 185, + sym__c_unary_expression = 186, + sym__c_binary_expression = 187, + sym__c_postfix_expression = 188, + sym__c_parenthesized_expression = 189, + sym_while_statement = 190, + sym_do_group = 191, + sym_if_statement = 192, + sym_elif_clause = 193, + sym_else_clause = 194, + sym_case_statement = 195, + sym_case_item = 196, + sym_last_case_item = 197, + sym_function_definition = 198, + sym_compound_statement = 199, + sym_subshell = 200, + sym_pipeline = 201, + sym_list = 202, + sym_negated_command = 203, + sym_test_command = 204, + sym__test_command_binary_expression = 205, + sym_declaration_command = 206, + sym_unset_command = 207, + sym_command = 208, + sym_command_name = 209, + sym_variable_assignment = 210, + sym_variable_assignments = 211, + sym_subscript = 212, + sym_file_redirect = 213, + sym_heredoc_redirect = 214, + sym__heredoc_pipeline = 215, + sym__heredoc_expression = 216, + sym__heredoc_body = 218, + sym_heredoc_body = 219, + sym__simple_heredoc_body = 220, + sym_herestring_redirect = 221, + sym__expression = 222, + sym_binary_expression = 223, + sym_ternary_expression = 224, + sym_unary_expression = 225, + sym_postfix_expression = 226, + sym_parenthesized_expression = 227, + sym_arithmetic_expansion = 228, + sym_brace_expression = 229, + sym__arithmetic_expression = 230, + sym__arithmetic_literal = 231, + sym__arithmetic_binary_expression = 232, + sym__arithmetic_ternary_expression = 233, + sym__arithmetic_unary_expression = 234, + sym__arithmetic_postfix_expression = 235, + sym__arithmetic_parenthesized_expression = 236, + sym_concatenation = 237, + sym_string = 238, + sym_translated_string = 239, + sym_array = 240, + sym_number = 241, + sym_simple_expansion = 242, + sym_expansion = 243, + sym__expansion_body = 244, + sym__expansion_expression = 245, + sym__expansion_regex = 246, + sym__expansion_regex_replacement = 247, + sym__expansion_regex_removal = 248, + sym__expansion_max_length = 249, + sym__expansion_max_length_expression = 250, + sym__expansion_max_length_binary_expression = 251, + sym__expansion_operator = 252, + sym__concatenation_in_expansion = 253, + sym_command_substitution = 254, + sym_process_substitution = 255, + sym__extglob_blob = 256, + sym__c_terminator = 257,