Add support for parsing long long unsigned integers if using hex

2 files changed, 65 insertions, 4 deletions

diff --git a/src/badlib.h b/src/badlib.h
index d334fa7..6432562 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -470,13 +470,13 @@ str_from_int(sz num, Arena *a) {
 }
 
 Str
-str_from_hex(sz num, sz zeroes, Arena *a) {
+str_from_hex(u64 num, sz zeroes, Arena *a) {
     char char_map[] = "0123456789abcdef";
     u8 tmp[64];
     zeroes = MIN((sz)sizeof(ptrsize) * 2, zeroes);
     u8 *end = tmp + sizeof(tmp);
     u8 *beg = end;
-    sz t = num > 0 ? num : -num;
+    u64 t = num;
     do {
         *--beg = char_map[t % 16];
     } while (t /= 16);
@@ -634,6 +634,57 @@ str_to_int(Str s) {
     return num;
 }
 
+u64
+str_to_uint(Str s) {
+    u64 num = 0;
+    if (str_has_prefix(s, cstr("0b"))) {
+        // Binary number.
+        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');
+        }
+    } else if (str_has_prefix(s, cstr("0x"))) {
+        // Hex number.
+        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') {
+                num = num * 16 + (c - '0');
+            } else if (c >= 'a' && c <= 'f') {
+                num = num * 16 + (c - 'a' + 10);
+            } else if (c >= 'A' && c <= 'F') {
+                num = num * 16 + (c - 'A' + 10);
+            }
+        }
+    } else {
+        // Decimal number.
+        char c = str_peek(s);
+        assert(c != '-');
+        if (c == '+') {
+            str_next(&s);
+        }
+        while (s.size) {
+            char c = str_next(&s);
+            if (c == '_') {
+                continue;
+            }
+            assert(c >= '0' && c <= '9');
+            num = num * 10 + (c - '0');
+        }
+    }
+    return num;
+}
+
 f64
 str_to_float(Str s) {
     char c = str_peek(s);
diff --git a/src/main.c b/src/main.c
index 75faaf6..8dc645e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,6 +65,7 @@ typedef enum NodeKind {
     NODE_STRING,
     NODE_SYMBOL,
     NODE_NUM_INT,
+    NODE_NUM_UINT,
     NODE_NUM_FLOAT,
     NODE_TRUE,
     NODE_FALSE,
@@ -98,6 +99,7 @@ Str node_str[] = {
     [NODE_STRING] = cstr("STRING"),
     [NODE_SYMBOL] = cstr("SYMBOL"),
     [NODE_NUM_INT] = cstr("INT"),
+    [NODE_NUM_UINT] = cstr("UINT"),
     [NODE_NUM_FLOAT] = cstr("FLOAT"),
     [NODE_TRUE] = cstr("TRUE"),
     [NODE_FALSE] = cstr("FALSE"),
@@ -113,6 +115,7 @@ typedef struct Node {
     union {
         f64 d;
         sz i;
+        u64 u;
         Str str;
         Str sym;
     } value;
@@ -374,8 +377,14 @@ parse_number(Parser *parser) {
     Node *node = NULL;
     switch (prev.kind) {
         case TOK_NUM_INT: {
-            node = node_alloc(NODE_NUM_INT, prev, parser->storage);
-            node->value.i = str_to_int(prev.val);
+            if (str_has_prefix(prev.val, cstr("0x")) ||
+                str_has_prefix(prev.val, cstr("0b"))) {
+                node = node_alloc(NODE_NUM_UINT, prev, parser->storage);
+                node->value.u = str_to_uint(prev.val);
+            } else {
+                node = node_alloc(NODE_NUM_INT, prev, parser->storage);
+                node->value.i = str_to_int(prev.val);
+            }
         } break;
         case TOK_NUM_FLOAT: {
             node = node_alloc(NODE_NUM_FLOAT, prev, parser->storage);
@@ -430,6 +439,7 @@ graph_node(Node *node) {
     print("<top> %s ", node_str[node->kind]);
     switch (node->kind) {
         case NODE_NUM_INT: print("| Value: %d", node->value.i); break;
+        case NODE_NUM_UINT: print("| Value: %x", node->value.u); break;
         case NODE_NUM_FLOAT: print("| Value: %f{2}", node->value.d); break;
         case NODE_STRING: print("| Value: %s", node->value.str); break;
         case NODE_SYMBOL: print("| Value: %s", node->value.sym); break;