From 7e7219da26b9d256e451f8dddb66641d11f75434 Mon Sep 17 00:00:00 2001
From: nass1pro <nass1pro@gmail.com>
Date: Sun, 13 Sep 2020 11:02:56 +0200
Subject: update lexer + \t

---
 src/lexer/lexer.c       | 22 +++++++++++-----------
 src/lexer/lexer_utils.c | 12 ++++++------
 src/lexer/trim.c        |  6 +++---
 src/main.c              |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 121407d..9d4b9bd 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -6,7 +6,7 @@
 /*   By: nahaddac <nahaddac@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/07/16 08:18:25 by nahaddac          #+#    #+#             */
-/*   Updated: 2020/09/13 09:01:27 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/09/13 10:54:43 by nahaddac         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,9 +22,9 @@ int 			len_until_sep(char *input)
 		if (input[i] == '\\')
 		{
 			i += 2;
-			if (input[i] == ' ')
+			if (input[i] == ' ' || input[i] == '\t')
 			{
-				while(input[++i] == ' ')
+				while(ft_isblank(input[++i]))
 					;
 				return i;
 			}
@@ -36,9 +36,9 @@ int 			len_until_sep(char *input)
 			return(i);
 		if (input[i] == '\'' || input[i] == '"')
 			return(i);
-		if (input[i] == ' ')
+		if (ft_isblank(input[i]))
 		{
-			while(input[++i] == ' ')
+			while(ft_isblank(input[++i]))
 				;
 			return (i);
 		}
@@ -61,8 +61,8 @@ int				check_input(char *input)
 	if (input[i] == '(' || input[i] == ')')
 	{
 		i +=1;
-		if(input[i] == ' ')
-			while(input[i++] != ' ')
+		if(ft_isblank(input[i]))
+			while(ft_isblank(input[i++]) != 1)
 				;
 		return (i);
 	}
@@ -80,9 +80,9 @@ int				check_input(char *input)
 	}
 	if (input[i] == 39 || input[i] == '"')
 		return(lexer_check_between_quote(input, i));
-	if (input[i] == ' ')
+	if (ft_isblank(input[i]))
 	{
-		while(input[++i] == ' ')
+		while(ft_isblank(input[++i]))
 			;
 		 return (i);
 	}
@@ -116,7 +116,7 @@ enum e_tok token_check_stick(t_tok_lst *tok)
 
 	i = ft_strlen(tok->content);
 	if (i > 0)
-		if (tok->content[i - 1] == ' ')
+		if (ft_isblank(tok->content[i - 1]))
 			return (tok->tag);
 	return (tok->tag | TAG_STICK);
 }
@@ -172,7 +172,7 @@ t_tok_lst				*create_token_list(char *input, t_tok_lst **lst)
 		j += check_input(&input[i]);
 		tok = tok_lst_new_until(0, input + i, j);
 		push_token_enum(tok);
-		if (tok->content[0] != ' ')
+		if (ft_isblank(tok->content[0]) != 1)
 			tok_lst_push_back(lst, tok);
 		i += j;
 	}
diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c
index 64a25b1..d848f95 100644
--- a/src/lexer/lexer_utils.c
+++ b/src/lexer/lexer_utils.c
@@ -6,7 +6,7 @@
 /*   By: nahaddac <nahaddac@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/07/16 08:18:15 by nahaddac          #+#    #+#             */
-/*   Updated: 2020/09/13 08:38:27 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/09/13 11:00:45 by nahaddac         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -69,7 +69,7 @@ int             		lexer_space(char *input)
     int i;
 
     i=0;
-    while(input[i] == ' ')
+    while(ft_isblank(input[i]))
         i++;
     return(i);
 }
@@ -85,8 +85,8 @@ static int             lex_check_single_quote(char *input, int i)
             break;
         ++i;
     }
-    if (input[i + 1] == ' ')
-        while(input[i + 1] == ' ')
+    if (ft_isblank(input[i + 1]))
+        while(ft_isblank(input[i + 1]))
             i++;
     return(i + 1);
 }
@@ -102,8 +102,8 @@ int             		lexer_check_between_quote(char *input, int i)
             i += 1;
         ++i;
     }
-    if (input[i + 1] == ' ')
-        while(input[i + 1] == ' ')
+    if (ft_isblank(input[i + 1]))
+        while(ft_isblank(input[i + 1]))
             i++;
     return(i + 1);
 }
diff --git a/src/lexer/trim.c b/src/lexer/trim.c
index d4d7ef5..1a2c88d 100644
--- a/src/lexer/trim.c
+++ b/src/lexer/trim.c
@@ -6,7 +6,7 @@
 /*   By: nahaddac <nahaddac@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/07/16 08:18:36 by nahaddac          #+#    #+#             */
-/*   Updated: 2020/09/13 09:24:21 by nahaddac         ###   ########.fr       */
+/*   Updated: 2020/09/13 10:58:26 by nahaddac         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,10 +18,10 @@ char                *del_space(t_tok_lst *tok)
     int             i;
 
     i = ft_strlen(tok->content);
-    if(tok->content[i - 1] == ' ')
+    if(ft_isblank(tok->content[i - 1]))
     {
         i -= 1;
-        while(tok->content[i] == ' ')
+        while(ft_isblank(tok->content[i]))
         {
             if (tok->content[i - 1] == '\\')
                 break;
diff --git a/src/main.c b/src/main.c
index 62e1d2b..c13a52a 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/09/12 17:04:06 by charles          ###   ########.fr       */
+/*   Updated: 2020/09/13 10:13:44 by nahaddac         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-- 
cgit