Update lexer/trim

4 files changed, 18 insertions, 16 deletions

diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 49be432..2b1bdce 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -84,6 +84,7 @@ t_token 						*lexer_lst_token_str(char *input, int i, int j)
 		free(lst_token);
 		return(0);
 	}
+
 	return (lst_token);
 }
 
diff --git a/src/lexer/trim.c b/src/lexer/trim.c
index ad696a4..a0c7dec 100644
--- a/src/lexer/trim.c
+++ b/src/lexer/trim.c
@@ -44,8 +44,9 @@ t_ftlst             *lexe_trim_out(t_ftlst *lst)
     while(lst != NULL)
     {
         tk = lst->data;
-        if (tk->tag >= TAG_STR_DOUBLE || tk->tag >= TAG_STR_SINGLE)
+        if (tk->tag & (TAG_STR_DOUBLE | TAG_STR_SINGLE))
         {
+            //printf("%s\n",tk->content );
             tk->content = del_quote(tk->content);
             if(lst->next == NULL)
                 if (tk->tag & TAG_STICK)
diff --git a/src/main.c b/src/main.c
index c0d611f..55f50c0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,7 +42,7 @@ int main(int argc, char **argv, char **envp)
 	{
 		t_ftlst *lex_out = lexer(ft_strdup(argv[2]));
 
-		/* ft_lstiter(lex_out, token_debug); */
+		 ft_lstiter(lex_out, token_debug);
 
 		t_ret *parser_out = parse(lex_out);
 
@@ -52,8 +52,8 @@ int main(int argc, char **argv, char **envp)
 		/* ft_lstiter(parser_out->ast->cmd_argv, token_debug); */
 		/* ft_lstiter(parser_out->ast->redirs, token_debug); */
 
-		int eval_out = eval_cmd(env, path, parser_out->ast);
-		(void)eval_out;
+		//int eval_out = eval_cmd(env, path, parser_out->ast);
+		//(void)eval_out;
 	}
 
 	ft_htdestroy(path, free);
diff --git a/src/parse/parse.c b/src/parse/parse.c
index 1129696..867325b 100755
--- a/src/parse/parse.c
+++ b/src/parse/parse.c
@@ -47,17 +47,17 @@ t_ret					*parse(t_ftlst *input)
 			}
 		}
 	}
-    // 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)
-	//  {
-	// 	 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);
+    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)
+	 {
+		 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 first;
 }