Fixing by removing debug code in parser

6 files changed, 43 insertions, 26 deletions

diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 079d77d..1d520c7 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -172,6 +172,7 @@ t_ftlst        			*lexer(char *input)
 	lst = malloc(sizeof(t_ftlst *) * 1);
 	if (!lst)
 		return(0);
+	*lst = NULL;
 	*lst = create_token_list(input, lst);
 	/* i = ft_lstsize(*lst); */
 	return (*lst);
diff --git a/src/main.c b/src/main.c
index 8fa91b3..3bbc58b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/28 11:45:44 by cacharle          #+#    #+#             */
-/*   Updated: 2020/06/15 13:12:21 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/15 13:43:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,6 +21,14 @@
 #include "parser.h"
 #include "eval.h"
 
+void token_debug(void *v)
+{
+	t_token *t;
+
+	t= v;
+	printf("[%4d] (%s)\n", t->tag, t->content);
+}
+
 int main(int argc, char **argv, char **envp)
 {
 	t_path	path;
@@ -29,12 +37,20 @@ int main(int argc, char **argv, char **envp)
 	env = env_from_array(envp);
 	path = path_update(NULL, env_search(env, "PATH"));
 
+
 	if (argc == 3 && ft_strcmp(argv[1], "-c") == 0)
 	{
-		t_ftlst *lex_out = lexer(argv[2]);
+		t_ftlst *lex_out = lexer(ft_strdup(argv[2]));
+
+		ft_lstiter(lex_out, token_debug);
 
 		t_ret *parser_out = parse(lex_out);
 
+		printf("%p\n", parser_out->ast->cmd_argv);
+		printf("%p\n", parser_out->ast->redirs);
+
+		/* ft_lstiter(parser_out->ast->cmd_argv, token_debug); */
+
 		int eval_out = eval_cmd(env, path, parser_out->ast);
 		(void)eval_out;
 	}
diff --git a/src/parse/cmd_parse.c b/src/parse/cmd_parse.c
index 562cea3..8b52d0a 100755
--- a/src/parse/cmd_parse.c
+++ b/src/parse/cmd_parse.c
@@ -15,17 +15,16 @@ t_ast 				*parse_cmd(t_ast *ast, t_ftlst *rest)
 {
     t_ftlst         *new;
 
-    new = rest->data;
+    /* new = rest->data; */
 	if (ast == NULL)
     {
-
         ast = ast_new(AST_CMD);
         ast->cmd_argv = ft_lstnew((t_token *)rest->data);
     }
     else
     {
         new = ft_lstnew((t_token *)rest->data);
-        ft_lstpush_back(&ast->cmd_argv, (void *)new);
+        ft_lstpush_back(&ast->cmd_argv, new);
     }
     return (ast);
 }
diff --git a/src/parse/parse.c b/src/parse/parse.c
index a0d981f..87478ac 100755
--- a/src/parse/parse.c
+++ b/src/parse/parse.c
@@ -13,7 +13,7 @@
 t_ret					*parse(t_ftlst *input)
 {
 	t_ret 				*ret;
-	/* t_ret 				*first; */
+	t_ret 				*first;
 	enum e_token_tag 	tag;
 	int 				i = 0;
 
@@ -22,7 +22,7 @@ t_ret					*parse(t_ftlst *input)
 	ret->rest = input;
 	ret->ast = NULL;
 	ret->unexpected = NULL;
-	/* first = ret; */
+	first = ret;
 
 	while (ret->rest != NULL)
 	{
@@ -49,22 +49,23 @@ t_ret					*parse(t_ftlst *input)
 		if (ret->rest != NULL)
 			ret->rest = ret->rest->next;
 	}
-    while(ret->ast->cmd_argv != NULL)
-     {
-		 /* printf("%s\n", ((t_token *)ret->ast->cmd_argv->data)->content); */
-         ret->ast->cmd_argv = ret->ast->cmd_argv->next;
-     }
-	 while(ret->ast->redirs != NULL)
-	 {
-		 if (i == 0)
-		 {
-			 /* printf("redir"); */
-			 i++;
-		 }
-		 /* printf("%s\n", ((t_token *)ret->ast->redirs->data)->content); */
-		 ret->ast->redirs = ret->ast->redirs->next;
-	 }
+
+	/* while(ret->ast->cmd_argv != NULL) */
+	/* { */
+		/* printf("%s\n", ((t_token *)ret->ast->cmd_argv->data)->content); */
+	/* 	ret->ast->cmd_argv = ret->ast->cmd_argv->next; */
+	/* } */
+	/* while(ret->ast->redirs != NULL) */
+	/* { */
+	/* 	if (i == 0) */
+	/* 	{ */
+			/* printf("redir"); */
+		/* 	i++; */
+		/* } */
+		/* printf("%s\n", ((t_token *)ret->ast->redirs->data)->content); */
+	/* 	ret->ast->redirs = ret->ast->redirs->next; */
+	/* } */
 	/* ast_destroy(ret->ast); */
 	/* ft_lstdestroy(&ret->rest, (void (*)(void*))token_destroy); */
-	return NULL;
+	return first;
 }
diff --git a/src/parse/redir_parse.c b/src/parse/redir_parse.c
index bdcb3ab..c92d639 100755
--- a/src/parse/redir_parse.c
+++ b/src/parse/redir_parse.c
@@ -12,7 +12,7 @@ t_ast 				*parse_redir(t_ast *ast, t_ftlst *rest)
 {
     t_ftlst         *new;
 
-    new = rest->data;
+    /* new = rest->data; */
 	if (ast == NULL)
     {
         ast = ast_new(AST_CMD);
@@ -21,7 +21,7 @@ t_ast 				*parse_redir(t_ast *ast, t_ftlst *rest)
     else
     {
         new = ft_lstnew((t_token *)rest->data);
-        ft_lstpush_back(&ast->redirs, (void *)new);
+        ft_lstpush_back(&ast->redirs, new);
     }
     return (ast);
 }
diff --git a/src/preprocess.c b/src/preprocess.c
index 1c59e28..9e61e25 100644
--- a/src/preprocess.c
+++ b/src/preprocess.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/03 08:58:49 by charles           #+#    #+#             */
-/*   Updated: 2020/06/15 10:47:24 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/15 13:30:04 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */