diff --git a/cpp06/ex00/includes/color.hpp b/cpp06/ex00/includes/color.hpp index e1c3f79..facac79 100644 --- a/cpp06/ex00/includes/color.hpp +++ b/cpp06/ex00/includes/color.hpp @@ -6,42 +6,42 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/17 15:27:54 by rparodi #+# #+# */ -/* Updated: 2025/02/18 16:43:18 by rparodi ### ########.fr */ +/* Updated: 2024/12/23 12:36:02 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef COLOR_HPP #define COLOR_HPP - #define RESET "\033[0m" + #define CLR_RESET "\033[0m" - #define BLACK "\033[0;30m" - #define RED "\033[0;31m" - #define GREEN "\033[0;32m" - #define YELLOW "\033[0;33m" - #define BLUE "\033[0;34m" - #define MAGENTA "\033[0;35m" - #define CYAN "\033[0;36m" - #define WHITE "\033[0;37m" - #define GOLD "\033[38;5;220m" - #define GREY "\033[38;5;240m" + #define CLR_BLACK "\033[0;30m" + #define CLR_RED "\033[0;31m" + #define CLR_GREEN "\033[0;32m" + #define CLR_YELLOW "\033[0;33m" + #define CLR_BLUE "\033[0;34m" + #define CLR_MAGENTA "\033[0;35m" + #define CLR_CYAN "\033[0;36m" + #define CLR_WHITE "\033[0;37m" + #define CLR_GOLD "\033[38;5;220m" + #define CLR_GREY "\033[38;5;240m" - #define L_BLACK "\033[0;90m" - #define L_RED "\033[0;91m" - #define L_GREEN "\033[0;92m" - #define L_YELLOW "\033[0;93m" - #define L_BLUE "\033[0;94m" - #define L_MAGENTA "\033[0;95m" - #define L_CYAN "\033[0;96m" - #define L_WHITE "\033[0;97m" + #define CLR_LIGHT_BLACK "\033[0;90m" + #define CLR_LIGHT_RED "\033[0;91m" + #define CLR_LIGHT_GREEN "\033[0;92m" + #define CLR_LIGHT_YELLOW "\033[0;93m" + #define CLR_LIGHT_BLUE "\033[0;94m" + #define CLR_LIGHT_MAGENTA "\033[0;95m" + #define CLR_LIGHT_CYAN "\033[0;96m" + #define CLR_LIGHT_WHITE "\033[0;97m" - #define B_BLACK "\033[1;30m" - #define B_RED "\033[1;31m" - #define B_GREEN "\033[1;32m" - #define B_YELLOW "\033[1;33m" - #define B_BLUE "\033[1;34m" - #define B_MAGENTA "\033[1;35m" - #define B_CYAN "\033[1;36m" - #define B_WHITE "\033[1;37m" + #define CLR_BOLD_BLACK "\033[1;30m" + #define CLR_BOLD_RED "\033[1;31m" + #define CLR_BOLD_GREEN "\033[1;32m" + #define CLR_BOLD_YELLOW "\033[1;33m" + #define CLR_BOLD_BLUE "\033[1;34m" + #define CLR_BOLD_MAGENTA "\033[1;35m" + #define CLR_BOLD_CYAN "\033[1;36m" + #define CLR_BOLD_WHITE "\033[1;37m" #endif diff --git a/cpp06/ex00/main.cpp b/cpp06/ex00/main.cpp index 2df9ca7..fd7e89f 100644 --- a/cpp06/ex00/main.cpp +++ b/cpp06/ex00/main.cpp @@ -6,31 +6,44 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/20 15:49:02 by rparodi #+# #+# */ -/* Updated: 2025/03/21 18:26:21 by rparodi ### ########.fr */ +/* Updated: 2025/03/23 18:57:30 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ #include "ScalarConverter.hpp" +#include "color.hpp" int main(void) { ScalarConverter test; - test.convert(new std::string("a")); - std::cout << std::endl; - test.convert(new std::string("0")); - std::cout << std::endl; - test.convert(new std::string("4294967300")); - std::cout << std::endl; - test.convert(new std::string("42.42")); - std::cout << std::endl; - test.convert(new std::string("-inff")); - std::cout << std::endl; - test.convert(new std::string("+inff")); - std::cout << std::endl; - test.convert(new std::string("nanf")); - std::cout << std::endl; - test.convert(new std::string("-inf")); - std::cout << std::endl; - test.convert(new std::string("+inf")); - std::cout << std::endl; - test.convert(new std::string("nan")); + std::string to_test; + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for 'a' ]" << CLR_RESET << std::endl; + to_test = "a"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for 0 ]" << CLR_RESET << std::endl; + to_test = "0"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for 4294967300 ]" << CLR_RESET << std::endl; + to_test = "4294967300"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for 42.42 ]" << CLR_RESET << std::endl; + to_test = "42.42"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for -inff ]" << CLR_RESET << std::endl; + to_test = "-inff"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for +inff ]" << CLR_RESET << std::endl; + to_test = "+inff"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for nanf ]" << CLR_RESET << std::endl; + to_test = "nanf"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for -inf ]" << CLR_RESET << std::endl; + to_test = "-inf"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for +inf ]" << CLR_RESET << std::endl; + to_test = "+inf"; + test.convert(&to_test); + std::cout << std::endl << CLR_YELLOW << "\t\t[ Testing all convertion for nan ]" << CLR_RESET << std::endl; + to_test = "nan"; + test.convert(&to_test); } diff --git a/cpp06/ex00/sources/integer.cpp b/cpp06/ex00/sources/integer.cpp index ba90726..f93e036 100644 --- a/cpp06/ex00/sources/integer.cpp +++ b/cpp06/ex00/sources/integer.cpp @@ -6,11 +6,13 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/22 22:11:44 by rparodi #+# #+# */ -/* Updated: 2025/03/23 12:01:21 by rparodi ### ########.fr */ +/* Updated: 2025/03/23 18:44:01 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ #include "ScalarConverter.hpp" +#include +#include bool isInt(std::string const &str) { long long tmp = std::atoll(str.c_str());