aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-07-13 10:57:28 +0200
committerCharles <sircharlesaze@gmail.com>2020-07-13 10:57:28 +0200
commit051d035e57918d824eab50b81288bd98a1a95675 (patch)
tree8e876b39ba29c23d6b0b0b43a1fdee4e1cbc4284
parent7d752a4fbf9c0a405c7e465efed8be164bbfbb15 (diff)
downloadminishell-051d035e57918d824eab50b81288bd98a1a95675.tar.gz
minishell-051d035e57918d824eab50b81288bd98a1a95675.tar.bz2
minishell-051d035e57918d824eab50b81288bd98a1a95675.zip
Added lexer debug option
-rw-r--r--minishell.tar.gzbin1517746 -> 0 bytes
-rw-r--r--src/main.c27
2 files changed, 16 insertions, 11 deletions
diff --git a/minishell.tar.gz b/minishell.tar.gz
deleted file mode 100644
index 5b45bdd..0000000
--- a/minishell.tar.gz
+++ /dev/null
Binary files differ
diff --git a/src/main.c b/src/main.c
index c8e1664..9728e36 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/07/13 10:46:50 by nahaddac ### ########.fr */
+/* Updated: 2020/07/13 10:54:54 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -69,19 +69,24 @@ int main(int argc, char **argv, char **envp)
signal(SIGINT, signal_sigint);
signal(SIGQUIT, signal_sigquit);
- if (argc == 3 && ft_strcmp(argv[1], "-c") == 0)
+ if (argc == 3 && ft_strcmp(argv[1], "-l") == 0)
{
- //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);
+ }
+ else if (argc == 3 && ft_strcmp(argv[1], "-c") == 0)
+ {
+ 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); */
+ 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"); */
@@ -93,9 +98,9 @@ int main(int argc, char **argv, char **envp)
/* 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
{