From c8091831c4ce1c4cf8703b18de22441aff191f44 Mon Sep 17 00:00:00 2001
From: nass1pro <nass1pro@gmail.com>
Date: Fri, 19 Jun 2020 13:28:41 +0200
Subject: Update parser_error

---
 src/main.c | 308 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 153 insertions(+), 155 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 060490a..27a87cf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <cacharle@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/28 11:45:44 by cacharle          #+#    #+#             */
-/*   Updated: 2020/06/18 13:46:10 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/18 14:57:30 by nahaddac         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,169 +21,167 @@
 #include "parser.h"
 #include "eval.h"
 
-/* void token_debug(void *v) */
-/* { */
-/* 	t_token *t; */
-/*  */
-/* 	t= v; */
-/* 	printf("[%4d %d] (%s)\n", t->tag, !!(t->tag & TAG_STICK), t->content); */
-/* } */
-/*  */
-/* int main(int argc, char **argv, char **envp) */
-/* { */
-/* 	t_path	path; */
-/* 	t_env	env; */
-/*  */
-/* 	env = env_from_array(envp); */
-/* 	path = path_update(NULL, env_search(env, "PATH")); */
-/* 	#<{(| printf("%s\n", argv[2]); |)}># */
-/*  */
-/* 	if (argc == 3 && ft_strcmp(argv[1], "-c") == 0) */
-/* 	{ */
-/* 		//printf("%s\n", 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("===cmd_argv===\n"); |)}># */
-/* 		#<{(| ft_lstiter(parser_out->ast->cmd_argv, token_debug); |)}># */
-/* 		#<{(| printf("===redirs===\n"); |)}># */
-/* 		#<{(| ft_lstiter(parser_out->ast->redirs, token_debug); |)}># */
-/*  */
-/* 		int fds[2] = {MS_NO_FD, MS_NO_FD}; */
-/* 		int eval_out = eval_cmd(fds, env, path, parser_out->ast); */
-/* 		(void)eval_out; */
-/* 	} */
-/*  */
-/* 	ft_htdestroy(path, free); */
-/* 	ft_vecdestroy(env, free); */
-/* 	return (0); */
-/* } */
-
-void token_put(void *v)
-{
-	t_token *t;
-
-	t= v;
-	printf("%s ", t->content);
-}
-
-void print_level(int level)
-{
-	while (level-- > 0)
-		printf("  ");
-}
-
-void ast_print(int level, t_ast *ast)
-{
-	if (ast->tag == AST_CMD)
-	{
-		print_level(level);
-		printf("cmd: [ ");
-		ft_lstiter(ast->cmd_argv, token_put);
-		printf(" ] redirs: [");
-		ft_lstiter(ast->redirs, token_put);
-		printf(" ]");
-	}
-	else
-	{
-		/* print_level(level); */
-		/* printf("SEP: %d\n", ast->op.sep); */
-		print_level(level);
-		printf("{\n");
-
-		print_level(level);
-		printf(" left:\n");
-		ast_print(level + 1, ast->op.left);
-
-		printf("\n");
-		print_level(level);
-		printf(" right:\n");
-		ast_print(level + 1, ast->op.right);
-
-		printf("\n");
-		print_level(level);
-		printf("}\n");
-	}
-}
-
-int main(int argc, char **argv, char **envp)
-{
-	(void)argc;
-	(void)argv;
-	/* (void)envp; */
-	t_path	path;
-	t_env	env;
-	/* char	*line; */
-	/* int		ret; */
-	env = env_from_array(envp);
-	path = path_update(NULL, env_search(env, "PATH"));
-
-	t_ftlst *args1 = NULL;
-	ft_lstpush_back(&args1, ft_lstnew(token_new(TAG_STR, "ls")));
-	ft_lstpush_back(&args1, ft_lstnew(token_new(TAG_STR, "-l")));
-
-	t_ftlst *args2 = NULL;
-	ft_lstpush_back(&args2, ft_lstnew(token_new(TAG_STR, "cat")));
-	ft_lstpush_back(&args2, ft_lstnew(token_new(TAG_STR, "-e")));
-	/* ft_lstpush_back(&args2, ft_lstnew(token_new(TAG_STR, "je"))); */
+ void token_debug(void *v)
+ {
+ 	t_token *t;
 
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "ls"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-a"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-l"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$$LFS$TERM$TERM."))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "*.c"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "src.c include*.h"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$A$B"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "\\$TERM"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$TER\\M"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "\\\\"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_SINGLE, "''''$TEST\\TEST"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE, ",$TEST,$B,"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE , "$TEST"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); */
-	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_SINGLE, "$TEST"))); */
+ 	t= v;
+ 	printf("[%4d %d] (%s)\n", t->tag, !!(t->tag & TAG_STICK), t->content);
+ }
 
-	t_ftlst *redirs = NULL;
-	ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_OUT, NULL)));
-	ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "bonjour")));
-	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_APPEND, NULL))); */
-	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "yo"))); */
-	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_OUT, NULL))); */
-	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "yo1"))); */
+ int main(int argc, char **argv, char **envp)
+ {
+ 	t_path	path;
+ 	t_env	env;
 
-	t_ast *cmd1 = ast_new(AST_CMD);
-	cmd1->cmd_argv = args1;
-	cmd1->redirs = NULL;
+ 	env = env_from_array(envp);
+ 	path = path_update(NULL, env_search(env, "PATH"));
+ 	//#<{(| printf("%s\n", argv[2]); |)}>#
 
-	t_ast *cmd2 = ast_new(AST_CMD);
-	cmd2->cmd_argv = args2;
-	cmd2->redirs = NULL;
+ 	if (argc == 3 && ft_strcmp(argv[1], "-c") == 0)
+ 	{
+ 		//printf("%s\n", argv[2]);
+ 		t_ftlst *lex_out = lexer(ft_strdup(argv[2]));
+ 		 //ft_lstiter(lex_out, token_debug);
 
-	t_ast *op_ast = ast_new(AST_OP);
-	op_ast->op.left = cmd1;
-	op_ast->op.right = cmd2;
-	op_ast->op.sep = TAG_PIPE;
+ 		 parse(lex_out);
+ 		// <{(| printf("===cmd_argv===\n"); |)}>
+ 		// <{(| ft_lstiter(parser_out->ast->cmd_argv, token_debug); |)}>
+ 		// <{(| printf("===redirs===\n"); |)}>
+ 		// <{(| ft_lstiter(parser_out->ast->redirs, token_debug); |)}>
 
+ 		//int fds[2] = {MS_NO_FD, MS_NO_FD};
+ 		//int eval_out = eval_cmd(fds, env, path, parser_out->ast);
+ 		//(void)eval_out;
+ 	}
 
-	int fds[2] = {MS_NO_FD, MS_NO_FD};
-	printf("eval %d\n", eval(fds, env, path, op_ast));
+ 	//ft_htdestroy(path, free);
+ 	//ft_vecdestroy(env, free);
 
-	/* char **as = preprocess(l, env); */
-	/* printf("%p\n", as); */
-	/* printf("%p\n", *as); */
-	/* char **tmp = as; */
-	/* while (*as != NULL) */
-	/* 	puts(*as++); */
-	/* ft_split_destroy(tmp); */
-	ft_htdestroy(path, free);
-	ft_vecdestroy(env, free);
-	return (0);
+ 	return (0);
 }
+// void token_put(void *v)
+// {
+// 	t_token *t;
+//
+// 	t= v;
+// 	printf("%s ", t->content);
+// }
+//
+// void print_level(int level)
+// {
+// 	while (level-- > 0)
+// 		printf("  ");
+// }
+//
+// void ast_print(int level, t_ast *ast)
+// {
+// 	if (ast->tag == AST_CMD)
+// 	{
+// 		print_level(level);
+// 		printf("cmd: [ ");
+// 		ft_lstiter(ast->cmd_argv, token_put);
+// 		printf(" ] redirs: [");
+// 		ft_lstiter(ast->redirs, token_put);
+// 		printf(" ]");
+// 	}
+// 	else
+// 	{
+// 		/* print_level(level); */
+// 		/* printf("SEP: %d\n", ast->op.sep); */
+// 		print_level(level);
+// 		printf("{\n");
+//
+// 		print_level(level);
+// 		printf(" left:\n");
+// 		ast_print(level + 1, ast->op.left);
+//
+// 		printf("\n");
+// 		print_level(level);
+// 		printf(" right:\n");
+// 		ast_print(level + 1, ast->op.right);
+//
+// 		printf("\n");
+// 		print_level(level);
+// 		printf("}\n");
+// 	}
+// }
+
+// int main(int argc, char **argv, char **envp)
+// {
+// 	(void)argc;
+// 	(void)argv;
+// 	/* (void)envp; */
+// 	t_path	path;
+// 	t_env	env;
+// 	/* char	*line; */
+// 	/* int		ret; */
+// 	env = env_from_array(envp);
+// 	path = path_update(NULL, env_search(env, "PATH"));
+//
+// 	t_ftlst *args1 = NULL;
+// 	ft_lstpush_back(&args1, ft_lstnew(token_new(TAG_STR, "ls")));
+// 	ft_lstpush_back(&args1, ft_lstnew(token_new(TAG_STR, "-l")));
+//
+// 	t_ftlst *args2 = NULL;
+// 	ft_lstpush_back(&args2, ft_lstnew(token_new(TAG_STR, "cat")));
+// 	ft_lstpush_back(&args2, ft_lstnew(token_new(TAG_STR, "-e")));
+// 	/* ft_lstpush_back(&args2, ft_lstnew(token_new(TAG_STR, "je"))); */
+//
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "ls"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-a"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "-l"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$$LFS$TERM$TERM."))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "*.c"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "src.c include*.h"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$A$B"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "\\$TERM"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "$TER\\M"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR, "\\\\"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_SINGLE, "''''$TEST\\TEST"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE, ",$TEST,$B,"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE , "$TEST"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_DOUBLE | TAG_STICK, "$TEST"))); */
+// 	/* ft_lstpush_back(&args, ft_lstnew(token_new(TAG_STR_SINGLE, "$TEST"))); */
+//
+// 	t_ftlst *redirs = NULL;
+// 	ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_OUT, NULL)));
+// 	ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "bonjour")));
+// 	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_APPEND, NULL))); */
+// 	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "yo"))); */
+// 	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_REDIR_OUT, NULL))); */
+// 	/* ft_lstpush_back(&redirs, ft_lstnew(token_new(TAG_STR, "yo1"))); */
+//
+// 	t_ast *cmd1 = ast_new(AST_CMD);
+// 	cmd1->cmd_argv = args1;
+// 	cmd1->redirs = NULL;
+//
+// 	t_ast *cmd2 = ast_new(AST_CMD);
+// 	cmd2->cmd_argv = args2;
+// 	cmd2->redirs = NULL;
+//
+// 	t_ast *op_ast = ast_new(AST_OP);
+// 	op_ast->op.left = cmd1;
+// 	op_ast->op.right = cmd2;
+// 	op_ast->op.sep = TAG_PIPE;
+//
+//
+// 	int fds[2] = {MS_NO_FD, MS_NO_FD};
+// 	printf("eval %d\n", eval(fds, env, path, op_ast));
+//
+// 	/* char **as = preprocess(l, env); */
+// 	/* printf("%p\n", as); */
+// 	/* printf("%p\n", *as); */
+// 	/* char **tmp = as; */
+// 	/* while (*as != NULL) */
+// 	/* 	puts(*as++); */
+// 	/* ft_split_destroy(tmp); */
+// 	ft_htdestroy(path, free);
+// 	ft_vecdestroy(env, free);
+// 	return (0);
+// }
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // lexer main
-- 
cgit