raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correcting all stuff for libft

Browse source
This commit is contained in:
EniumRaphael 2024-05-29 15:34:47 +02:00
parent 3ac78b4c7f
commit d16b39091a
6 changed files with 21 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
math/Makefile
View file

@ -6,7 +6,7 @@
# By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ # # By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/12 11:05:05 by rparodi #+# #+# # # Created: 2023/11/12 11:05:05 by rparodi #+# #+# #
# Updated: 2024/05/28 15:50:04 by rparodi ### ########.fr # # Updated: 2024/05/29 14:20:08 by rparodi ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -14,7 +14,7 @@
# Variables # Variables
# Name # Name
NAME = test NAME = libmmath.a
LIBDIRNAME = libft LIBDIRNAME = libft
SRCDIRNAME = sources SRCDIRNAME = sources
@ -26,17 +26,15 @@ RM = rm -rf
CFLAGS = -Werror -Wextra -Wall -Wno-unused-command-line-argument -g3 -MMD CFLAGS = -Werror -Wextra -Wall -Wno-unused-command-line-argument -g3 -MMD
# Sources # Sources
LIB = LIB = ./libft/ft_split.c
SRC = ./main.c \ SRC = ./sources/operation/ft_pow.c \
./sources/operation/ft_pow.c \
./sources/operation/ft_add.c \ ./sources/operation/ft_add.c \
./sources/utils/ft_init_numbers.c \ ./sources/utils/ft_init_numbers.c \
./sources/utils/ft_nblen.c \ ./sources/utils/ft_nblen.c \
./sources/comparison/ft_is_less.c \ ./sources/comparison/ft_is_less.c \
./sources/comparison/ft_equal.c \ ./sources/comparison/ft_equal.c \
./sources/comparison/ft_is_greater.c \ ./sources/comparison/ft_is_greater.c
./sources/ft_split.c
# Objects # Objects
OBJDIRNAME = ./objects OBJDIRNAME = ./objects
@ -85,8 +83,7 @@ $(NAME): $(OBJ) $(LIB_OBJ)
@mkdir -p $(OBJDIRNAME)/$(LIBDIRNAME) @mkdir -p $(OBJDIRNAME)/$(LIBDIRNAME)
@mkdir -p $(OBJDIRNAME)/$(SRCDIRNAME) @mkdir -p $(OBJDIRNAME)/$(SRCDIRNAME)
@printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n' @printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n'
@cc $(CFLAGS) -o $(NAME) -c $(OBJ) $(LIB_OBJ) @ar rc $(NAME) $(OBJ) $(OBJBonus) 1>/dev/null
@ar rc $(NAME) $(OBJ) $(OBJBonus)
@ranlib $(NAME) @ranlib $(NAME)
# Creating the objects # Creating the objects
$(OBJDIRNAME)/%.o: %.c $(OBJDIRNAME)/%.o: %.c
@ -128,5 +125,5 @@ footer:
# Phony # Phony
.PHONY: all bonus clean fclean re .PHONY: all bonus clean fclean re
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON # -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-include ${OBJ:.o=.d} -include ${OBJ:.o=.d}

0
math/sources/ft_split.c → math/libft/ft_split.c
View file

33
math/main.c
View file

@ -1,36 +1,17 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/27 14:41:26 by rparodi #+# #+# */
/* Updated: 2024/05/28 15:48:40 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include <stdio.h>
#include "./includes/ft_math.h" #include "./includes/ft_math.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
t_number nb; t_number nb;
if (argc != 2) if (argc == 2)
{ {
printf("Usage: %s <string>\n", argv[0]); ft_init_numbers(argv[1], &nb);
return 1; printf("Number: %s\n", nb.number);
} printf("Integer: %s\n", nb.int_part);
else if (argc == 2) printf("Float: %s\n", nb.float_part);
{ printf("Integer size: %zu\n", nb.int_size);
if (ft_init_numbers(argv[1], &nb) == ERROR) printf("Float size: %zu\n", nb.float_size);
{
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);
} }
return (0); return (0);
} }

2
sources/exec/separator/and_and.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/12 19:16:12 by rparodi #+# #+# */ /* Created: 2024/05/12 19:16:12 by rparodi #+# #+# */
/* Updated: 2024/05/12 19:19:08 by rparodi ### ########.fr */ /* Updated: 2024/05/18 17:48:43 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
stdme/include/me/char/char.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/19 17:11:41 by maiboyer #+# #+# */ /* Created: 2024/05/19 17:11:41 by maiboyer #+# #+# */
/* Updated: 2024/05/19 17:11:42 by maiboyer ### ########.fr */ /* Updated: 2024/05/24 20:10:07 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,7 +33,7 @@ bool me_isdigit(char chr);
/// @brief Check if a character is in the ascii range /// @brief Check if a character is in the ascii range
/// @param chr char to check /// @param chr char to check
/// @return chr is a ascii character /// @return chr is a ascii character
bool me_isascii(char chr); bool me_isascii(signed char chr);
/// @brief Check if a character is lowercase /// @brief Check if a character is lowercase
/// @param chr char to check /// @param chr char to check

4
stdme/src/char/isascii.c
View file

@ -6,13 +6,13 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/09 17:51:01 by maiboyer #+# #+# */ /* Created: 2023/11/09 17:51:01 by maiboyer #+# #+# */
/* Updated: 2024/04/28 19:41:21 by maiboyer ### ########.fr */ /* Updated: 2024/05/24 20:09:25 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "me/char/char.h" #include "me/char/char.h"
bool me_isascii(char chr) bool me_isascii(signed char chr)
{ {
return (0 <= chr && chr); return (0 <= chr && chr);
} }