ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-31 11:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3043 from laytan/check-float-value-succeeded

Browse Source 
check if string could be converted from float
This commit is contained in:
gingerBill
2024-01-17 16:47:41 +00:00
committed by GitHub
parent c5bab58180 b25e85a8bb
commit 2987fc65a1
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/exact_value.cpp
+20 -4
View File
@@ -174,7 +174,7 @@ gb_internal ExactValue exact_value_integer_from_string(String const &string) {
gb_internal f64 float_from_string(String const &string) { gb_internal f64 float_from_string(String const &string, bool *success = nullptr) {
if (string.len < 128) { if (string.len < 128) {
char buf[128] = {}; char buf[128] = {};
isize n = 0; isize n = 0;
@@ -187,7 +187,13 @@ gb_internal f64 float_from_string(String const &string) {
buf[n++] = cast(char)c; buf[n++] = cast(char)c;
} }
buf[n] = 0; buf[n] = 0;
return atof(buf);
char *end_ptr;
f64 f = strtod(buf, &end_ptr);
if (success != nullptr) {
*success = *end_ptr == '\0';
}
return f;
} else { } else {
TEMPORARY_ALLOCATOR_GUARD(); TEMPORARY_ALLOCATOR_GUARD();
char *buf = gb_alloc_array(temporary_allocator(), char, string.len+1); char *buf = gb_alloc_array(temporary_allocator(), char, string.len+1);
@@ -201,7 +207,13 @@ gb_internal f64 float_from_string(String const &string) {
buf[n++] = cast(char)c; buf[n++] = cast(char)c;
} }
buf[n] = 0; buf[n] = 0;
return atof(buf);
char *end_ptr;
f64 f = strtod(buf, &end_ptr);
if (success != nullptr) {
*success = *end_ptr == '\0';
}
return f;
} }
/* /*
isize i = 0; isize i = 0;
@@ -313,7 +325,11 @@ gb_internal ExactValue exact_value_float_from_string(String string) {
return exact_value_integer_from_string(string); return exact_value_integer_from_string(string);
} }
f64 f = float_from_string(string); bool success;
f64 f = float_from_string(string, &success);
if (!success) {
return {ExactValue_Invalid};
}
return exact_value_float(f); return exact_value_float(f);
} }