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

regenerated stuff

Browse source
This commit is contained in:
maix0 2024-09-26 18:31:56 +02:00
parent c284eb3786
commit 2e811bcec2
61 changed files with 1022 additions and 1697 deletions
Download patch file Download diff file Expand all files Collapse all files

2
parser/Filelist.parser.mk
View file

@ -1,5 +1,5 @@
SRC_FILES = \
\
token \
GEN_FILES = \
\

96
parser/Makefile
View file

@ -1,30 +1,96 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
# Parser.mk :+: :+: :+: #
# +:+ +:+ +:+ #
# By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ #
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2023/11/12 11:05:05 by rparodi #+# #+# #
# Updated: 2024/07/23 20:58:57 by maiboyer ### ########.fr #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/08/02 18:57:55 by maiboyer ### ########.fr #
# #
# **************************************************************************** #
BUILD_DIR ?= ../build/
ANAME = parser
all:
@$(MAKE) --no-print-directory -f Parser.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libparser.a
@#$(MAKE) --no-print-directory -f Grammar.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libgmr.a
BUILD_DIR = ../build
SRC_DIR = ./src
GEN_DIR = ./generic
libparser.a:
@$(MAKE) --no-print-directory -f Parser.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libparser.a
BONUS_FLAGS =
NAME = lib$(ANAME).a
LIB_NAME ?=
TARGET = $(BUILD_DIR)/$(NAME)
CC ?= cc
CFLAGS = -Wall -Wextra -Werror -MMD -I./include -I../includes -I../output/include -I$(SRC_DIR)
CFLAGS += $(CFLAGS_ADDITIONAL)
#CFLAGS += -fsanitize=address -fno-omit-frame-pointer -fsanitize-address-use-after-return=runtime -fno-common -fsanitize-address-use-after-scope
libgmr.a:
@$(MAKE) --no-print-directory -f Grammar.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libgmr.a
# SRC_FILES = lib
# GEN_FILES =
# TODO: change from only lib.c to filelist
-include Filelist.$(ANAME).mk
SRC = $(addsuffix .c,$(addprefix $(SRC_DIR)/,$(SRC_FILES)) $(addprefix $(GEN_DIR)/,$(GEN_FILES)))
OBJ = $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES)))
DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES)))
INCLUDES =
GREEN = \033[32m
GREY = \033[0;90m
RED = \033[0;31m
GOLD = \033[38;5;220m
END = \033[0m
.PHONY: all clean fclean re
all: $(NAME)
$(NAME): $(TARGET)
$(TARGET): $(OBJ)
@#echo "ar rcs $(BUILD_DIR)/$(NAME) <OBJS...>"
@echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)'
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)
$(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(dir $@)
@echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
$(BUILD_DIR)/$(ANAME)/%.o: $(GEN_DIR)/%.c
@mkdir -p $(dir $@)
@echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
clean:
@- $(foreach LIB,$(LIBS), \
make clean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\
)
$(if $(LIB_NAME),,\
rm -rf $(BUILD_DIR) \
)
fclean: clean
@- $(foreach LIB,$(LIBS), \
make fclean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\
)
rm -f $(BUILD_DIR)/$(NAME)
re:
@$(MAKE) --no-print-directory fclean
@$(MAKE) --no-print-directory all
build_filelist:
@$(MAKE) --no-print-directory -f Parser.mk build_filelist
@$(MAKE) --no-print-directory -f Grammar.mk build_filelist
@rm -f Filelist.$(ANAME).mk
@printf '%-78s\\\n' "SRC_FILES =" > Filelist.$(ANAME).mk
@tree $(SRC_DIR) -ifF | rg '$(SRC_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk
@echo "" >> Filelist.$(ANAME).mk
@printf '%-78s\\\n' "GEN_FILES =" >> Filelist.$(ANAME).mk
@tree $(GEN_DIR) -ifF | rg '$(GEN_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk
@echo "" >> Filelist.$(ANAME).mk
@echo -e '$(GREY) Populating $(GREEN) Filelist.$(ANAME).mk$(END)'
%.h: ;
.PHONY: all bonus clean fclean re libparser.a libgmr.a build_filelist
-include $(DEPS)

96
parser/Parser.mk
View file

@ -1,96 +0,0 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Parser.mk :+: :+: :+: #
# +:+ +:+ +:+ #
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/08/02 18:57:55 by maiboyer ### ########.fr #
# #
# **************************************************************************** #
ANAME = parser
BUILD_DIR = ../build
SRC_DIR = ./src
GEN_DIR = ./generic
BONUS_FLAGS =
NAME = lib$(ANAME).a
LIB_NAME ?=
TARGET = $(BUILD_DIR)/$(NAME)
CC ?= cc
CFLAGS = -Wall -Wextra -Werror -MMD -I./include -I../includes -I../output/include -I$(SRC_DIR)
CFLAGS += $(CFLAGS_ADDITIONAL)
#CFLAGS += -fsanitize=address -fno-omit-frame-pointer -fsanitize-address-use-after-return=runtime -fno-common -fsanitize-address-use-after-scope
# SRC_FILES = lib
# GEN_FILES =
# TODO: change from only lib.c to filelist
-include Filelist.$(ANAME).mk
SRC = $(addsuffix .c,$(addprefix $(SRC_DIR)/,$(SRC_FILES)) $(addprefix $(GEN_DIR)/,$(GEN_FILES)))
OBJ = $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES)))
DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES)))
INCLUDES =
GREEN = \033[32m
GREY = \033[0;90m
RED = \033[0;31m
GOLD = \033[38;5;220m
END = \033[0m
.PHONY: all clean fclean re
all: $(NAME)
$(NAME): $(TARGET)
$(TARGET): $(OBJ)
@#echo "ar rcs $(BUILD_DIR)/$(NAME) <OBJS...>"
@echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)'
@ar rcs $(BUILD_DIR)/$(NAME) $(OBJ)
$(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c
@mkdir -p $(dir $@)
@echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
$(BUILD_DIR)/$(ANAME)/%.o: $(GEN_DIR)/%.c
@mkdir -p $(dir $@)
@echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)'
@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
clean:
@- $(foreach LIB,$(LIBS), \
make clean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\
)
$(if $(LIB_NAME),,\
rm -rf $(BUILD_DIR) \
)
fclean: clean
@- $(foreach LIB,$(LIBS), \
make fclean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\
)
rm -f $(BUILD_DIR)/$(NAME)
re:
@$(MAKE) --no-print-directory fclean
@$(MAKE) --no-print-directory all
build_filelist:
@rm -f Filelist.$(ANAME).mk
@printf '%-78s\\\n' "SRC_FILES =" > Filelist.$(ANAME).mk
@tree $(SRC_DIR) -ifF | rg '$(SRC_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk
@echo "" >> Filelist.$(ANAME).mk
@printf '%-78s\\\n' "GEN_FILES =" >> Filelist.$(ANAME).mk
@tree $(GEN_DIR) -ifF | rg '$(GEN_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk
@echo "" >> Filelist.$(ANAME).mk
@echo -e '$(GREY) Populating $(GREEN) Filelist.$(ANAME).mk$(END)'
%.h: ;
-include $(DEPS)

20
parser/include/parser/_token.h Normal file
View file

@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* _token.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/25 11:38:28 by rparodi #+# #+# */
/* Updated: 2024/09/26 18:21:45 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef _TOKEN_H
# define _TOKEN_H
# include "me/types.h"
typedef struct s_token t_token;
#endif

24
parser/includes/token/token.h → parser/include/parser/token.h
View file

@ -3,17 +3,20 @@
/* ::: :::::::: */
/* token.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/25 11:38:28 by rparodi #+# #+# */
/* Updated: 2024/09/25 16:32:40 by rparodi ### ########.fr */
/* Created: 2024/09/26 17:59:23 by maiboyer #+# #+# */
/* Updated: 2024/09/26 18:29:25 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef TOKEN_H
# define TOKEN_H
#define TOKEN_H
#include "parser/_token.h"
#include "me/string/string.h"
#include "me/vec/vec_token.h"
enum e_token
{
@ -30,10 +33,13 @@ enum e_token
WHITESPACE
};
typedef struct s_token
struct s_token
{
t_string raw;
enum e_token TokenType;
} t_token;
t_vec_token subtokens;
t_string string;
enum e_token type;
};
#endif
#endif /* TOKEN_H */

4
parser/token/token.c → parser/src/token.c
View file

@ -6,11 +6,11 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/25 16:27:03 by rparodi #+# #+# */
/* Updated: 2024/09/25 16:59:36 by rparodi ### ########.fr */
/* Updated: 2024/09/26 17:56:08 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "parser/token/token.h"
#include "parser/token.h"
#include "me/string/string.h"
#include "me/types.h"
#include <stdio.h>