coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work-In-Progress

Browse Source
This commit is contained in:
John Wellbelove 2022-10-07 13:39:04 +01:00
parent 8cd0546e36
commit d9fa85c9a2
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/etl/to_arithmetic.h
View File

@ -191,15 +191,18 @@ namespace etl
struct character_set;
//*******************************************
static char convert(char c)
ETL_NODISCARD
static ETL_CONSTEXPR14
char convert(char c)
{
return to_lower(c);
}
//*******************************************
ETL_NODISCARD
static
ETL_CONSTEXPR14
static char convert(wchar_t c)
char convert(wchar_t c)
{
typedef wchar_t value_type;
typedef const value_type* string_type;
@ -223,8 +226,9 @@ namespace etl
//*******************************************
ETL_NODISCARD
static
ETL_CONSTEXPR14
static char convert(char16_t c)
char convert(char16_t c)
{
typedef char16_t value_type;
typedef const value_type* string_type;
@ -248,8 +252,9 @@ namespace etl
//*******************************************
ETL_NODISCARD
static
ETL_CONSTEXPR14
static char convert(char32_t c)
char convert(char32_t c)
{
typedef char32_t value_type;
typedef const value_type* string_type;
@ -323,7 +328,7 @@ namespace etl
bool check_has_negative_prefix(etl::basic_string_view<TChar>& view)
{
// Check for prefix.
const char c = character_set<TChar>::convert(view[0]);
const char c = convert(view[0]);
const bool has_positive_prefix = (c == valid_character_set::positive_char);
const bool has_negative_prefix = (c == valid_character_set::negative_char);
@ -474,7 +479,7 @@ namespace etl
while (parsing)
{
parsing = implementation.add(character_set<TChar>::convert(*itr));
parsing = implementation.add(convert(*itr));
if (parsing)
{
@ -531,7 +536,7 @@ namespace etl
while (parsing)
{
parsing = implementation.add(character_set<TChar>::convert(*itr));
parsing = implementation.add(convert(*itr));
if (parsing)
{
@ -586,7 +591,7 @@ namespace etl
while (parsing)
{
parsing = implementation.add(character_set<TChar>::convert(*itr));
parsing = implementation.add(convert(*itr));
if (parsing)
{
@ -643,7 +648,7 @@ namespace etl
while (parsing)
{
parsing = implementation.add(character_set<TChar>::convert(*itr));
parsing = implementation.add(convert(*itr));
if (parsing)
{

20
test/test_string_to_arithmetic.cpp
View File

@ -262,20 +262,20 @@ namespace
}
//*************************************************************************
TEST(test_valid_float)
{
const std::string text1("-123.456789");
//TEST(test_valid_float)
//{
// const std::string text1("-123.456789");
float f1 = strtof(text1.c_str(), nullptr);
float f2 = etl::to_arithmetic<float>(text1.c_str(), text1.size()).value();
// float f1 = strtof(text1.c_str(), nullptr);
// float f2 = etl::to_arithmetic<float>(text1.c_str(), text1.size()).value();
CHECK_EQUAL(f1, f2);
// CHECK_EQUAL(f1, f2);
const std::string text2("-1.23456789e2");
float f3 = etl::to_arithmetic<float>(text2.c_str(), text2.size()).value();
// const std::string text2("-1.23456789e2");
// float f3 = etl::to_arithmetic<float>(text2.c_str(), text2.size()).value();
CHECK_EQUAL(f1, f3);
}
// CHECK_EQUAL(f1, f3);
//}
//*************************************************************************
//TEST(test_valid_double)