From 8103cadfc95fb76539bfccc893a2101ccb89ea90 Mon Sep 17 00:00:00 2001 From: Dominik Kaiser Date: Fri, 28 Jun 2024 15:09:32 +0200 Subject: [PATCH] Add data structures for tokenizing and parsing * Add data structures and helper functions for ast * Add data structures for tokenizing * Add helper functions for token structures * Include token.h in minishell.h * Add new/free functions for nodes/tokens to Makefile * Add UNREACHABLE macro to debug_tools.h --- Makefile | 3 +- include/ast.h | 79 +++++++++++++++++++++++++++++++++++++++++++ include/debug_tools.h | 3 +- include/minishell.h | 4 ++- include/token.h | 49 +++++++++++++++++++++++++++ src/debug_tools.c | 2 +- src/free_node.c | 59 ++++++++++++++++++++++++++++++++ src/free_token.c | 24 +++++++++++++ src/new_node.c | 72 +++++++++++++++++++++++++++++++++++++++ src/new_token.c | 52 ++++++++++++++++++++++++++++ 10 files changed, 343 insertions(+), 4 deletions(-) create mode 100644 include/ast.h create mode 100644 include/token.h create mode 100644 src/free_node.c create mode 100644 src/free_token.c create mode 100644 src/new_node.c create mode 100644 src/new_token.c diff --git a/Makefile b/Makefile index dfe7a30..41551ec 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,8 @@ LIBS = -L $(LIB_DIR)/libft -lft -lreadline HEADERS = -I include -I $(LIB_DIR)/libft VPATH := src -SRC := main.c debug_tools.c init.c signal_handling.c repl.c +SRC := main.c debug_tools.c init.c signal_handling.c repl.c new_token.c \ + free_token.c new_node.c free_node.c OBJ_DIR := _obj OBJ := $(addprefix $(OBJ_DIR)/, $(SRC:%.c=%.o)) diff --git a/include/ast.h b/include/ast.h new file mode 100644 index 0000000..e6ad25d --- /dev/null +++ b/include/ast.h @@ -0,0 +1,79 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ast.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dkaiser # include diff --git a/include/token.h b/include/token.h new file mode 100644 index 0000000..38e758f --- /dev/null +++ b/include/token.h @@ -0,0 +1,49 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* token.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dkaiser type == ASSIGN_NODE) + free_assign_node(node); + else if (node->type == PIPE_NODE) + free_pipe_node(node); + else if (node->type == CMD_NODE) + free_cmd_node(node); + else if (node->type == STRING_NODE) + free(node->content.string); + else + panic(UNREACHABLE); + free(node); +} + +static void free_assign_node(t_node *node) +{ + free(node->content.assign.var); + free(node->content.assign.value); +} + +static void free_pipe_node(t_node *node) +{ + free_node(node->content.pipe.left); + free_node(node->content.pipe.right); +} + +static void free_cmd_node(t_node *node) +{ + int i; + + i = 0; + while (node->content.cmd.args[i] != NULL) + { + free(node->content.cmd.args[i]); + i++; + } + free(node->content.cmd.args); + free(node->content.cmd.redirs[0].specifier); + free(node->content.cmd.redirs[1].specifier); +} diff --git a/src/free_token.c b/src/free_token.c new file mode 100644 index 0000000..9f5c4e9 --- /dev/null +++ b/src/free_token.c @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* free_token.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dkaiser type == STRING_TOKEN) + free(token->content.string); + if (token->previous != NULL) + token->previous->next = NULL; + if (token->next != NULL) + token->next->previous = NULL; + free(token); +} diff --git a/src/new_node.c b/src/new_node.c new file mode 100644 index 0000000..4cdbf9a --- /dev/null +++ b/src/new_node.c @@ -0,0 +1,72 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* new_node.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dkaiser type = type; + return (node); +} + +t_node *new_assign_node(char *var, char *value) +{ + t_node *node; + + node = new_node(ASSIGN_NODE); + if (node == NULL) + return (NULL); + node->content.assign.var = var; + node->content.assign.value = value; + return (node); +} + +t_node *new_pipe_node(t_node *left, t_node *right) +{ + t_node *node; + + node = new_node(PIPE_NODE); + if (node == NULL) + return (NULL); + node->content.pipe.left = left; + node->content.pipe.right = right; + return (node); +} + +t_node *new_cmd_node(char **args, t_redirection redirs[2]) +{ + t_node *node; + + node = new_node(CMD_NODE); + if (node == NULL) + return (NULL); + node->content.cmd.args = args; + node->content.cmd.redirs[0] = redirs[0]; + node->content.cmd.redirs[1] = redirs[1]; + return (node); +} + +t_node *new_string_node(char *string) +{ + t_node *node; + + node = new_node(STRING_NODE); + if (node == NULL) + return (NULL); + node->content.string = string; + return (node); +} diff --git a/src/new_token.c b/src/new_token.c new file mode 100644 index 0000000..92ff421 --- /dev/null +++ b/src/new_token.c @@ -0,0 +1,52 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* new_token.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dkaiser type = type; + token->previous = previous; + token->next = next; + if (previous != NULL) + token->previous->next = token; + if (next != NULL) + token->next->previous = token; + return (token); +} + +t_token *new_str_token(char *str, t_token *previous, t_token *next) +{ + t_token *token; + + token = new_token(STRING_TOKEN, previous, next); + if (token == NULL) + return (NULL); + token->content.string = str; + return (token); +} + +t_token *new_redir_token(int type, t_token *previous, t_token *next) +{ + t_token *token; + + token = new_token(REDIR_TOKEN, previous, next); + if (token == NULL) + return (NULL); + token->content.redir_type = type; + return (token); +} -- 2.47.2