Merge pull request #6 from Maix0/maix/norminette

Maix/norminette
This commit is contained in:
Maix0 2024-05-01 17:40:11 +02:00 committed by GitHub
commit 1330a26f0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -6,23 +6,13 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/25 16:13:52 by maiboyer #+# #+# */ /* Created: 2024/04/25 16:13:52 by maiboyer #+# #+# */
<<<<<<< HEAD:parser/src/create_language.c /* Updated: 2024/05/01 17:38:14 by maiboyer ### ########.fr */
/* Updated: 2024/05/01 15:52:38 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../static/headers/constants.h" #include "../static/headers/constants.h"
#include "../static/headers/symbols.h" #include "../static/headers/symbols.h"
#include "../parse_types.h" #include "../parse_types.h"
=======
/* Updated: 2024/04/30 16:37:30 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "./static/headers/constants.h"
#include "./static/headers/symbols.h"
#include "./parse_types.h"
>>>>>>> master:parser/create_language.c
const uint16_t *create_parse_table(void); const uint16_t *create_parse_table(void);
const uint16_t *create_small_parse_table(void); const uint16_t *create_small_parse_table(void);