1 files changed, 90 insertions, 0 deletions

diff --git a/src/badlib.h b/src/badlib.h
index 9802278..d334fa7 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -586,6 +586,9 @@ str_to_int(Str s) {
         s = str_remove_prefix(s, cstr("0b"));
         while (s.size) {
             char c = str_next(&s);
+            if (c == '_') {
+                continue;
+            }
             assert(c == '0' || c == '1');
             num = num * 2 + (c - '0');
         }
@@ -594,6 +597,9 @@ str_to_int(Str s) {
         s = str_remove_prefix(s, cstr("0x"));
         while (s.size) {
             char c = str_next(&s);
+            if (c == '_') {
+                continue;
+            }
             assert((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
                    (c >= 'A' && c <= 'F'));
             if (c >= '0' && c <= '9') {
@@ -606,11 +612,95 @@ str_to_int(Str s) {
         }
     } else {
         // Decimal number.
+        char c = str_peek(s);
+        sz neg = 1;
+        if (c == '-') {
+            neg = -1;
+            str_next(&s);
+        } else if (c == '+') {
+            str_next(&s);
+        }
+        // TODO: check if it fits within the s64 range.
         while (s.size) {
             char c = str_next(&s);
+            if (c == '_') {
+                continue;
+            }
             assert(c >= '0' && c <= '9');
             num = num * 10 + (c - '0');
         }
+        num *= neg;
+    }
+    return num;
+}
+
+f64
+str_to_float(Str s) {
+    char c = str_peek(s);
+    f64 neg = 1.0;
+    if (c == '-') {
+        neg = -1.0;
+        str_next(&s);
+    } else if (c == '+') {
+        str_next(&s);
+    }
+    f64 num = 0.0;
+    // Integral part.
+    while (s.size) {
+        char c = str_next(&s);
+        if (c == '_') {
+            continue;
+        }
+        if (c == '.') {
+            break;
+        }
+        assert(c >= '0' && c <= '9');
+        num = num * 10 + (c - '0');
+    }
+    // Fractional part.
+    f64 frac = 0;
+    sz frac_digits = 1;
+    bool has_exponent = false;
+    while (s.size) {
+        char c = str_next(&s);
+        if (c == '_') {
+            continue;
+        }
+        if (c == 'e' || c == 'E') {
+            has_exponent = true;
+            break;
+        }
+        assert(c >= '0' && c <= '9');
+        frac = frac * 10 + (c - '0');
+        frac_digits *= 10;
+    }
+    num *= neg;
+    num += frac / frac_digits;
+    if (has_exponent) {
+        bool exp_neg = false;
+        char c = str_peek(s);
+        if (c == '-') {
+            exp_neg = true;
+            str_next(&s);
+        } else if (c == '+') {
+            str_next(&s);
+        }
+        sz exponent = 0;
+        while (s.size) {
+            c = str_next(&s);
+            if (c == '_') {
+                continue;
+            }
+            assert(c >= '0' && c <= '9');
+            exponent = exponent * 10 + (c - '0');
+        }
+        for (sz i = 0; i < exponent; i++) {
+            if (!exp_neg) {
+                num *= 10;
+            } else {
+                num /= 10;
+            }
+        }
     }
     return num;
 }