From 9f22aa59b67e6346b38480e4c7c7c569f37eb4ec Mon Sep 17 00:00:00 2001 From: matteo Date: Fri, 23 Jan 2026 19:43:54 +0100 Subject: [PATCH] fix(parser): building + clang format -- UNSTABLE --- src/parser/Makefile.am | 4 +++- src/parser/grammar.h | 29 +++++++++++++++-------------- src/parser/grammar_basic.h | 2 +- src/parser/parser.h | 3 ++- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 3b7b6f5..642414b 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -2,7 +2,9 @@ lib_LIBRARIES = libparser.a libparser_a_SOURCES = \ parser.c \ - parsing_utils.c + grammar.c \ + grammar_basic.c \ + grammar_advanced.c libparser_a_CPPFLAGS = -I$(top_srcdir)/src diff --git a/src/parser/grammar.h b/src/parser/grammar.h index fe31849..cd9e888 100644 --- a/src/parser/grammar.h +++ b/src/parser/grammar.h @@ -25,18 +25,19 @@ // === Structures -enum rule { - RULE_NULL, - RULE_INPUT, - RULE_LIST, - RULE_AND_OR, - RULE_PIPELINE, - RULE_COMMAND, - RULE_SIMPLE_COMMAND, - RULE_SHELL_COMMAND, - RULE_IF, - RULE_COMPOUND_LIST, - RULE_ELSE_CLAUSE +enum rule +{ + RULE_NULL, + RULE_INPUT, + RULE_LIST, + RULE_AND_OR, + RULE_PIPELINE, + RULE_COMMAND, + RULE_SIMPLE_COMMAND, + RULE_SHELL_COMMAND, + RULE_IF, + RULE_COMPOUND_LIST, + RULE_ELSE_CLAUSE }; // === Functions @@ -45,12 +46,12 @@ enum rule { * @return PARSER_INIT_SUCCESS on success PARSER_INIT_ERROR on error * @warning Do not use outside the parser */ - bool grammar_init(void); +bool grammar_init(void); /* @brief Closes the grammar submodule * @warning Do not use outside the parser */ - void grammar_close(void); +void grammar_close(void); /* @brief Acts as the entry point of the parser, calls parse_list * diff --git a/src/parser/grammar_basic.h b/src/parser/grammar_basic.h index 840f05d..7d9803a 100644 --- a/src/parser/grammar_basic.h +++ b/src/parser/grammar_basic.h @@ -1,8 +1,8 @@ #ifndef GRAMMAR_BASIC_H #define GRAMMAR_BASIC_H -#include "../utils/ast/ast.h" #include "../lexer/lexer.h" +#include "../utils/ast/ast.h" // === Functions diff --git a/src/parser/parser.h b/src/parser/parser.h index b51d2f5..a79497b 100644 --- a/src/parser/parser.h +++ b/src/parser/parser.h @@ -6,7 +6,8 @@ #include "../lexer/lexer.h" #include "../utils/ast/ast.h" -enum parser_state { +enum parser_state +{ PARSER_STATE_NOT_INITIALIZED = 0, PARSER_STATE_READY, PARSER_STATE_CLOSED