From 9e901f1070ac4a3b709c62472c8874b2ad2e120d Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Fri, 28 Aug 2020 14:25:49 +0200 Subject: Quick tabs fix --- src/p_line.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index 8b13424..ec148e3 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -37,6 +37,22 @@ static void } } +static void + p_subst_spaces(char line[]) +{ + char *ptr; + + ptr = line; + while (*ptr != '\0') + { + if (ft_isspace(*ptr) == TRUE) + { + *ptr = ' '; + } + ptr++; + } +} + static t_bool p_check_whitespaces_only(char line[]) { @@ -45,7 +61,7 @@ static t_bool ptr = line; while (*ptr != '\0') { - if (*ptr != ' ' && *ptr != '\t') + if (ft_isspace(*ptr) == FALSE) { return (FALSE); } @@ -59,6 +75,7 @@ void t_msh *msh) { p_delete_comments(line); + p_subst_spaces(line); if (p_check_whitespaces_only(line) == TRUE) { return ; -- cgit v1.2.3 From 70e3b4133b89e4e77a67139ccaa37322e2507e49 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Tue, 1 Sep 2020 18:28:12 +0200 Subject: Added quotes multiline --- src/p_line.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index ec148e3..0224bbb 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -45,7 +45,7 @@ static void ptr = line; while (*ptr != '\0') { - if (ft_isspace(*ptr) == TRUE) + if (ft_iswhitespace(*ptr) == TRUE) { *ptr = ' '; } @@ -61,7 +61,7 @@ static t_bool ptr = line; while (*ptr != '\0') { - if (ft_isspace(*ptr) == FALSE) + if (ft_iswhitespace(*ptr) == FALSE) { return (FALSE); } -- cgit v1.2.3 From c75434256658e3009a5c61d02524cb49492bd120 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 5 Sep 2020 18:40:28 +0200 Subject: Clean af --- src/p_line.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index 0224bbb..9c96610 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -37,22 +37,6 @@ static void } } -static void - p_subst_spaces(char line[]) -{ - char *ptr; - - ptr = line; - while (*ptr != '\0') - { - if (ft_iswhitespace(*ptr) == TRUE) - { - *ptr = ' '; - } - ptr++; - } -} - static t_bool p_check_whitespaces_only(char line[]) { @@ -75,7 +59,6 @@ void t_msh *msh) { p_delete_comments(line); - p_subst_spaces(line); if (p_check_whitespaces_only(line) == TRUE) { return ; -- cgit v1.2.3 From d0038f19a7cb23749588b72c9febcf114d9d31e9 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Tue, 8 Sep 2020 18:31:51 +0200 Subject: static hist, words fix --- src/p_line.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index 9c96610..170d8a8 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -19,6 +19,7 @@ #include "p_lcom.h" #include "s_destroy.h" #include "s_struct.h" +#include "u_utils.h" static void p_delete_comments(char line[]) @@ -30,8 +31,11 @@ static void { if (*ptr == '#') { - *ptr = '\0'; - return ; + if ((ptr - line) == 0 || ft_iswhitespace(*(ptr - 1)) == TRUE) + { + *ptr = '\0'; + return ; + } } ptr++; } -- cgit v1.2.3 From 4dd10e6f4de22446ea84d7b194d2a18cb6e43c6c Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Tue, 8 Sep 2020 18:50:11 +0200 Subject: Names --- src/p_line.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index 170d8a8..645c7b6 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -67,7 +67,7 @@ void { return ; } - if (p_lcom(line, msh) < 0) + if (p_line_block(line, msh) < 0) { f_alloc_and_destroy_msh(msh); } -- cgit v1.2.3 From bf6043888ebdafc3da4fc60af8f0f4888e8c53d0 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Tue, 8 Sep 2020 18:57:19 +0200 Subject: Update --- src/p_line.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index 645c7b6..d839154 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -16,7 +16,7 @@ #include "d_enum.h" #include "f_fail.h" #include "p_line.h" -#include "p_lcom.h" +#include "p_lblock.h" #include "s_destroy.h" #include "s_struct.h" #include "u_utils.h" -- cgit v1.2.3 From c68b7637d42fac3986857685980e7a7090f5a5aa Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Wed, 9 Sep 2020 16:17:52 +0200 Subject: In progress --- src/p_line.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index d839154..cdb2fd4 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -59,8 +59,7 @@ static t_bool } void - p_line(char line[], - t_msh *msh) + p_line(char line[], t_msh *msh) { p_delete_comments(line); if (p_check_whitespaces_only(line) == TRUE) -- cgit v1.2.3 From ca2e36781039eb7e9901ccde395600e7af87ff4f Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Tue, 15 Sep 2020 19:59:41 +0200 Subject: Huge fixes and stack stuff --- src/p_line.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/p_line.c') diff --git a/src/p_line.c b/src/p_line.c index cdb2fd4..c8381c8 100644 --- a/src/p_line.c +++ b/src/p_line.c @@ -21,26 +21,6 @@ #include "s_struct.h" #include "u_utils.h" -static void - p_delete_comments(char line[]) -{ - char *ptr; - - ptr = line; - while (*ptr != '\0') - { - if (*ptr == '#') - { - if ((ptr - line) == 0 || ft_iswhitespace(*(ptr - 1)) == TRUE) - { - *ptr = '\0'; - return ; - } - } - ptr++; - } -} - static t_bool p_check_whitespaces_only(char line[]) { @@ -61,7 +41,6 @@ static t_bool void p_line(char line[], t_msh *msh) { - p_delete_comments(line); if (p_check_whitespaces_only(line) == TRUE) { return ; -- cgit v1.2.3