From e085451ec45c0551c80989a7d49b0e0deb4b9586 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 19 Jun 2020 14:38:15 +0200 Subject: Parenthesis working, Added getline loop in main --- src/main.c | 183 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 105 insertions(+), 78 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 77f4070..80ed74c 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */ -/* Updated: 2020/06/19 13:37:42 by charles ### ########.fr */ +/* Updated: 2020/06/19 17:46:59 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,22 +42,49 @@ int main(int argc, char **argv, char **envp) if (lex_out == NULL) return (1); - //ft_lstiter(lex_out, token_debug); + /* ft_lstiter(lex_out, token_debug); */ + t_ret *parser_out = parse(lex_out); - t_ret *parser_out = parse(lex_out); - if (parser_out == NULL || parser_out->unexpected != NULL) - return (1); - ast_print(0, parser_out->ast); + /* t_ret *parser_out = parse(lex_out); */ + /* if (parser_out == NULL || parser_out->unexpected != NULL) */ + /* return (1); */ + + /* ast_print(0, parser_out->ast); */ + /* printf("\n"); */ + /* fflush(stdout); */ + /* fflush(stderr); */ /* 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(fds, env, path, parser_out->ast); */ - /* (void)eval_out; */ + int fds[2] = {MS_NO_FD, MS_NO_FD}; + int eval_out = eval(fds, env, path, parser_out->ast); + (void)eval_out; + } + else + { + int ret; + char *line; + + printf("> "); + fflush(stdout); + while ((ret = ft_getline(STDOUT_FILENO, &line)) == FTGL_OK) + { + t_ftlst *lex_out = lexer(line); + if (lex_out == NULL) + return (1); + + t_ret *parser_out = parse(lex_out); + + int fds[2] = {MS_NO_FD, MS_NO_FD}; + int eval_out = eval(fds, env, path, parser_out->ast); + (void)eval_out; + printf("> "); + fflush(stdout); + } } ft_htdestroy(path, free); @@ -73,75 +100,75 @@ int main(int argc, char **argv, char **envp) /* 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_cmd(fds, env, path, cmd1)); */ - - /* 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); */ +/* (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_cmd(fds, env, path, cmd1)); */ + +/* 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); */ -- cgit