aortigos/cpp06
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ScalarConverter improved

Browse Source
This commit is contained in:
Angel Ortigosa Perez
2026-03-17 20:44:42 +01:00
parent c3b2d55414
commit f9394c1214
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ex00/ScalarConverter/ScalarConverter.cpp
View File

@@ -49,12 +49,12 @@ void ScalarConverter::convert(const std::string &literal)
convertFromSpecialCase(literal); convertFromSpecialCase(literal);
else if (isChar(literal)) else if (isChar(literal))
convertFromChar(literal); convertFromChar(literal);
else if(isInt(literal))
convertFromInt(literal);
else if(isFloat(literal)) else if(isFloat(literal))
convertFromFloat(literal); convertFromFloat(literal);
else if(isDouble(literal)) else if (isDouble(literal))
convertFromDouble(literal); convertFromDouble(literal);
else if (isInt(literal))
convertFromInt(literal);
else else
std::cout << "Error: invalid literal" << std::endl; std::cout << "Error: invalid literal" << std::endl;
} }
@@ -101,8 +101,6 @@ bool ScalarConverter::isDouble(const std::string &literal)
{ {
char *end; char *end;
if (literal.find('.') == std::string::npos)
return (false);
strtod(literal.c_str(), &end); strtod(literal.c_str(), &end);
if (*end != '\0') if (*end != '\0')
return (false); return (false);
@@ -176,7 +174,10 @@ void ScalarConverter::convertFromFloat(const std::string &literal)
std::cout << "char: Non displayable" << std::endl; std::cout << "char: Non displayable" << std::endl;
else else
std::cout << "char: '" << static_cast<char>(nb) << "'" << std::endl; std::cout << "char: '" << static_cast<char>(nb) << "'" << std::endl;
std::cout << "int: " << static_cast<int>(nb) << std::endl; if (nb > static_cast<float>(INT_MAX) || nb < static_cast<float>(INT_MIN))
std::cout << "int: impossible" << std::endl;
else
std::cout << "int: " << static_cast<int>(nb) << std::endl;
std::cout << std::fixed << std::setprecision(1); std::cout << std::fixed << std::setprecision(1);
std::cout << "float: " << nb << "f" << std::endl; std::cout << "float: " << nb << "f" << std::endl;
std::cout << "double: " << static_cast<double>(nb) << std::endl; std::cout << "double: " << static_cast<double>(nb) << std::endl;
@@ -194,7 +195,10 @@ void ScalarConverter::convertFromDouble(const std::string &literal)
std::cout << "char: Non displayable" << std::endl; std::cout << "char: Non displayable" << std::endl;
else else
std::cout << "char: '" << static_cast<char>(nb) << "'" << std::endl; std::cout << "char: '" << static_cast<char>(nb) << "'" << std::endl;
std::cout << "int: " << static_cast<int>(nb) << std::endl; if (nb > static_cast<double>(INT_MAX) || nb < static_cast<double>(INT_MIN))
std::cout << "int: impossible" << std::endl;
else
std::cout << "int: " << static_cast<int>(nb) << std::endl;
std::cout << std::fixed << std::setprecision(1); std::cout << std::fixed << std::setprecision(1);
std::cout << "float: " << static_cast<float>(nb) << "f" << std::endl; std::cout << "float: " << static_cast<float>(nb) << "f" << std::endl;
std::cout << "double: " << nb << std::endl; std::cout << "double: " << nb << std::endl;