Added parenthesis handling in eval (not tested)

4 files changed, 54 insertions, 13 deletions

diff --git a/src/debug.c b/src/debug.c
index cde4e4c..dd0919e 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -38,9 +38,11 @@ void ast_print(int level, t_ast *ast)
 	}
 	else
 	{
-		/* print_level(level); */
 		/* printf("SEP: %d\n", ast->op.sep); */
 		print_level(level);
+		printf("redirs: [");
+		ft_lstiter(ast->redirs, token_put);
+		printf(" ] ");
 		printf("{\n");
 
 		print_level(level);
diff --git a/src/eval/cmd.c b/src/eval/cmd.c
index f502984..4405cdd 100644
--- a/src/eval/cmd.c
+++ b/src/eval/cmd.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/14 10:41:31 by charles           #+#    #+#             */
-/*   Updated: 2020/06/17 17:02:07 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/19 12:03:13 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -75,6 +75,7 @@ int		eval_cmd(int fds[2], t_env env, t_path path, t_ast *ast)
 		return (-1);
 	}
 
+	// can have no command (e.g `< file`)
 	param.builtin = builtin_search_func(argv[0]);
 	if (param.builtin == NULL)
 	{
diff --git a/src/eval/op.c b/src/eval/op.c
index e47698b..b8ad63c 100644
--- a/src/eval/op.c
+++ b/src/eval/op.c
@@ -6,14 +6,13 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/06/17 15:27:22 by charles           #+#    #+#             */
-/*   Updated: 2020/06/17 17:03:48 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/19 12:18:57 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "eval.h"
 
-// TODO: add parent tag on first operation of parent to fork
-int			eval_op(int fds[2], t_env env, t_path path, t_op *op)
+int			eval_op(int fds[2], t_env env, t_path path, t_ast *ast)
 {
 	int	status;
 	int	left_fds[2];
@@ -24,25 +23,52 @@ int			eval_op(int fds[2], t_env env, t_path path, t_op *op)
 	left_fds[FDS_WRITE] = MS_NO_FD;
 	right_fds[FDS_READ] = MS_NO_FD;
 	right_fds[FDS_WRITE] = fds[FDS_WRITE];
-	if (op->sep == TAG_PIPE)
+	if (ast->op.sep == TAG_PIPE)
 	{
 		pipe(p);
 		left_fds[FDS_WRITE] = p[FDS_WRITE];
 		right_fds[FDS_READ] = p[FDS_READ];
 	}
-	if ((status = eval(left_fds, env, path, op->left)) == -1)
+	if (!redir_extract(ast->redirs, env, fds))
+	{
+		ast->redirs = NULL;
+		return (-1);
+	}
+	ast->redirs = NULL;
+	if ((status = eval(left_fds, env, path, ast->op.left)) == -1)
 		return (-1);
-	if ((op->sep == TAG_AND && status != 0) ||
-		(op->sep == TAG_PIPE && status != 0) ||
-		(op->sep == TAG_OR && status == 0))
+	if ((ast->op.sep == TAG_AND && status != 0) ||
+		(ast->op.sep == TAG_PIPE && status != 0) ||
+		(ast->op.sep == TAG_OR && status == 0))
 		return (status);
-	return (eval(right_fds, env, path, op->right));
+	return (eval(right_fds, env, path, ast->op.right));
+}
+
+int			wrapped_eval(void *void_param)
+{
+	t_fork_param_parent	*param;
+
+	param = void_param;
+	return (eval(param->fds, param->env, param->path, param->ast));
 }
 
 int			eval(int fds[2], t_env env, t_path path, t_ast *ast)
 {
+	t_fork_param_parent	param;
+
+	// need to handle pipe and redir
+	if (ast->tag & AST_PARENT)
+	{
+		param.fds[0] = fds[0];
+		param.fds[1] = fds[1];
+		param.env = env;
+		param.path = path;
+		ast->tag ^= AST_PARENT;
+		param.ast = ast;
+		return (fork_wrap(fds, &param, wrapped_eval));
+	}
 	if (ast->tag == AST_OP)
-		return (eval_op(fds, env, path, &ast->op));
+		return (eval_op(fds, env, path, ast));
 	if (ast->tag == AST_CMD)
 		return (eval_cmd(fds, env, path, ast));
 	return (-1);
diff --git a/src/main.c b/src/main.c
index 2018001..7e9f7dc 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 14:38:24 by charles          ###   ########.fr       */
+/*   Updated: 2020/06/19 12:16:20 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -39,10 +39,16 @@ int main(int argc, char **argv, char **envp)
 	{
 		//printf("%s\n", argv[2]);
 		t_ftlst *lex_out = lexer(ft_strdup(argv[2]));
+		if (lex_out == NULL)
+			return (1);
 
 		 //ft_lstiter(lex_out, token_debug);
 
 		 t_ret *parser_out = parse(lex_out);
+		 if (parser_out == NULL || parser_out->unexpected != NULL)
+			 return (1);
+
+		 /* ast_print(0, parser_out->ast); */
 
 		/* printf("===cmd_argv===\n"); */
 		/* ft_lstiter(parser_out->ast->cmd_argv, token_debug); */
@@ -59,6 +65,12 @@ int main(int argc, char **argv, char **envp)
 	return (0);
 }
 
+
+
+/////////////////////////////////////////////////////////////
+// eval
+/////////////////////////////////////////////////////////////
+
 /* int main(int argc, char **argv, char **envp) */
 /* { */
 	/* (void)argc; */