From: Dominik Kaiser <dkaiser@2-C-5.42heilbronn.de>
Date: Sun, 11 Aug 2024 09:18:26 +0000 (+0200)
Subject: Merge changes from main into parser branch
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=8cf2aec82f98094d8175c5e5daaaa115f9b64fc2;p=42%2Fminishell.git

Merge changes from main into parser branch
---

8cf2aec82f98094d8175c5e5daaaa115f9b64fc2
diff --cc Makefile
index a56ada3,4ac27f7..3450e3c
--- a/Makefile
+++ b/Makefile
@@@ -12,8 -12,7 +12,8 @@@ HEADERS =  -I include -I $(LIB_DIR)/lib
  
  VPATH   := src
  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 parser.c parse_cmd.c \
-            print_ast.c
 -           free_token.c new_node.c free_node.c tokenizer.c
++           free_token.c new_node.c free_node.c tokenizer.c parser.c \
++           parse_cmd.c print_ast.c
  
  OBJ_DIR := _obj
  OBJ     := $(addprefix $(OBJ_DIR)/, $(SRC:%.c=%.o))
diff --cc include/minishell.h
index b21acbc,c108d93..4f04682
--- a/include/minishell.h
+++ b/include/minishell.h
@@@ -6,7 -6,7 +6,7 @@@
  /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/06/22 17:14:49 by dkaiser           #+#    #+#             */
- /*   Updated: 2024/08/02 13:55:48 by dkaiser          ###   ########.fr       */
 -/*   Updated: 2024/08/08 17:10:12 by dkaiser          ###   ########.fr       */
++/*   Updated: 2024/08/11 10:59:16 by dkaiser          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */
  
diff --cc include/token.h
index 72ca5e5,d7ff9f9..49d51e1
--- a/include/token.h
+++ b/include/token.h
@@@ -3,10 -3,10 +3,10 @@@
  /*                                                        :::      ::::::::   */
  /*   token.h                                            :+:      :+:    :+:   */
  /*                                                    +:+ +:+         +:+     */
- /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
+ /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/06/27 13:27:18 by dkaiser           #+#    #+#             */
- /*   Updated: 2024/08/02 14:13:19 by dkaiser          ###   ########.fr       */
 -/*   Updated: 2024/08/05 13:23:27 by chuhlig          ###   ########.fr       */
++/*   Updated: 2024/08/11 11:00:22 by dkaiser          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */
  
@@@ -45,7 -45,6 +45,8 @@@ t_token						*new_redir_token(int type
  								t_token *next);
  
  void						free_token(t_token *token);
 +void						free_token_and_connect(t_token *token);
 +void						free_tokens(t_token *tokens);
+ void						tokenizer(char *s, t_token **token_list);
  
 -#endif
 +#endif