diff --git a/math/includes/ft_math.h b/math/includes/ft_math.h index 133a6737..1d5a64aa 100644 --- a/math/includes/ft_math.h +++ b/math/includes/ft_math.h @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/04 12:16:08 by rparodi #+# #+# */ -/* Updated: 2024/05/28 15:43:40 by rparodi ### ########.fr */ +/* Updated: 2024/05/29 16:22:10 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,6 +20,7 @@ typedef struct s_number { + t_i8 sign; t_str number; t_str int_part; t_str float_part; @@ -27,7 +28,7 @@ typedef struct s_number t_usize float_size; } t_number; -t_error ft_nblen(const t_str str, t_usize *interger, t_usize *floating); +t_error ft_nblen(const t_str str, t_usize *int_len, t_usize *float_len, t_u8 *sign); t_error ft_init_numbers(t_str str, t_number *nb); char **ft_split(char const *s, char c); diff --git a/math/main.c b/math/main.c index 62045190..736faada 100644 --- a/math/main.c +++ b/math/main.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/27 14:41:26 by rparodi #+# #+# */ -/* Updated: 2024/05/28 15:48:40 by rparodi ### ########.fr */ +/* Updated: 2024/05/29 16:16:28 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,8 +15,9 @@ int main(int argc, char *argv[]) { - t_number nb; + t_number *nb; + nb = (t_number *)malloc(sizeof(t_number)); if (argc != 2) { printf("Usage: %s \n", argv[0]); @@ -24,13 +25,13 @@ int main(int argc, char *argv[]) } else if (argc == 2) { - if (ft_init_numbers(argv[1], &nb) == ERROR) + if (ft_init_numbers(argv[1], nb) == ERROR) { printf("Error\n"); return 1; } else - printf("Number = %s \n(int: %s, %zu) (float: %s, %zu)\n", nb.number, nb.int_part, nb.int_size, nb.float_part, nb.float_size); + printf("Number = %s \n(int: %s, %zu) (float: %s, %zu)\n", nb->number, nb->int_part, nb->int_size, nb->float_part, nb->float_size); } return (0); } diff --git a/math/sources/utils/ft_init_numbers.c b/math/sources/utils/ft_init_numbers.c index 1ce7a650..0882271e 100644 --- a/math/sources/utils/ft_init_numbers.c +++ b/math/sources/utils/ft_init_numbers.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/28 13:41:03 by rparodi #+# #+# */ -/* Updated: 2024/05/28 15:44:24 by rparodi ### ########.fr */ +/* Updated: 2024/05/29 16:23:35 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,22 +16,23 @@ t_error ft_init_numbers(t_str str, t_number *nb) { t_usize int_size; t_usize float_size; + t_u8 sign; t_str *tmp; int_size = 0; float_size = 0; + sign = 1; if (nb == NULL) return (ERROR); - if (ft_nblen(str, &int_size, &float_size) == ERROR) + if (ft_nblen(str, &int_size, &float_size, &sign) == ERROR) return (ERROR); else { - nb = (t_number *)malloc(sizeof(t_number)); nb->number = str; tmp = ft_split(str, '.'); + nb->sign = sign; nb->int_part = tmp[0]; nb->float_part = tmp[1]; - // free_strs(tmp); nb->int_size = int_size; nb->float_size = float_size; } diff --git a/math/sources/utils/ft_nblen.c b/math/sources/utils/ft_nblen.c index 47cf5968..cff453ed 100644 --- a/math/sources/utils/ft_nblen.c +++ b/math/sources/utils/ft_nblen.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/27 12:30:54 by rparodi #+# #+# */ -/* Updated: 2024/05/28 13:34:20 by rparodi ### ########.fr */ +/* Updated: 2024/05/29 16:20:52 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,15 +21,21 @@ t_error ft_counter(const t_str str, t_usize *i) return (NO_ERROR); } -t_error ft_nblen(const t_str str, t_usize *int_len, t_usize *float_len) +t_error ft_nblen(const t_str str, t_usize *int_len, t_usize *float_len, t_u8 *sign) { t_usize i; (*int_len) = 0; (*float_len) = 0; + (*sign) = 1; i = 0; if (str == NULL) return (ERROR); + if (str[i] == '-') + { + (*sign) = -1; + i++; + } while (str[i] != '.' && str[i] != '\0') ft_counter(str, &i); (*int_len) = i;