1 files changed, 32 insertions, 13 deletions

diff --git a/src/main.c b/src/main.c
index c321d7c..f15afed 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,19 +39,27 @@ print_tokens(Str path, Token *tokens) {
 //
 
 typedef enum NodeKind {
-    NODE_NUMBER,
+    NODE_NUM_INT,
+    NODE_NUM_FLOAT,
     // TODO: probably want to handle ints/unsigneds/floats separately.
     NODE_ADD,
     NODE_SUB,
     NODE_DIV,
     NODE_MUL,
-    // TODO: MOD
+    NODE_MOD,
 } NodeKind;
 
 Str node_str[] = {
-    [NODE_NUMBER] = cstr("NUM"), [NODE_ADD] = cstr("ADD"),
-    [NODE_SUB] = cstr("SUB"),    [NODE_DIV] = cstr("DIV"),
+    // Arithmetic.
+    [NODE_ADD] = cstr("ADD"),
+    [NODE_SUB] = cstr("SUB"),
+    [NODE_DIV] = cstr("DIV"),
     [NODE_MUL] = cstr("MUL"),
+    [NODE_MOD] = cstr("MOD"),
+
+    // Literals.
+    [NODE_NUM_INT] = cstr("INT"),
+    [NODE_NUM_FLOAT] = cstr("FLOAT"),
 };
 
 typedef struct Node {
@@ -62,9 +70,7 @@ typedef struct Node {
     NodeKind kind;
     union {
         f64 d;
-        f32 f;
         sz i;
-        u64 u;
     } value;
     struct Node *left;
     struct Node *right;
@@ -108,7 +114,7 @@ typedef enum {
     PREC_EQUALITY,    // == !=
     PREC_COMPARISON,  // < > <= >=
     PREC_TERM,        // + -
-    PREC_FACTOR,      // * /
+    PREC_FACTOR,      // * / %
     PREC_UNARY,       // ! -
     PREC_CALL,        // . ()
     PREC_PRIMARY      // highest precedence
@@ -136,7 +142,9 @@ ParseRule parse_rules[] = {
     [TOK_ADD] = {NULL, parse_binary, PREC_TERM},
     [TOK_DIV] = {NULL, parse_binary, PREC_FACTOR},
     [TOK_MUL] = {NULL, parse_binary, PREC_FACTOR},
-    [TOK_NUMBER] = {parse_number, NULL, PREC_NONE},
+    [TOK_MOD] = {NULL, parse_binary, PREC_FACTOR},
+    [TOK_NUM_INT] = {parse_number, NULL, PREC_NONE},
+    [TOK_NUM_FLOAT] = {parse_number, NULL, PREC_NONE},
     [TOK_EOF] = {NULL, NULL, PREC_NONE},
 };
 
@@ -201,7 +209,7 @@ parse_unary(Parser *parser) {
     print("parsing unary ");
     print_token(prev);
 #endif
-    TokenKind kind = parser->previous.kind;
+    TokenKind kind = prev.kind;
     parse_expr(parser, PREC_LOW);
     // TODO: ...
     switch (kind) {
@@ -227,6 +235,7 @@ parse_binary(Parser *parser) {
         case TOK_SUB: node = node_alloc(NODE_SUB, prev, parser->storage); break;
         case TOK_MUL: node = node_alloc(NODE_MUL, prev, parser->storage); break;
         case TOK_DIV: node = node_alloc(NODE_DIV, prev, parser->storage); break;
+        case TOK_MOD: node = node_alloc(NODE_MOD, prev, parser->storage); break;
         default: {
             parse_emit_err(parser, prev, cstr("unreachable"));
             return;
@@ -244,9 +253,18 @@ parse_number(Parser *parser) {
     print("parsing number ");
     print_token(prev);
 #endif
-    Node *node = node_alloc(NODE_NUMBER, prev, parser->storage);
-    node->value.i = str_to_int(prev.val);
-    // TODO: handle sign and/or floating point values.
+    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);
+        } break;
+        case TOK_NUM_FLOAT: {
+            node = node_alloc(NODE_NUM_FLOAT, prev, parser->storage);
+            node->value.d = str_to_float(prev.val);
+        } break;
+        default: break;
+    }
     array_push(parser->nodes, node, parser->storage);
 }
 
@@ -268,7 +286,8 @@ graph_node(Node *node) {
     print("%d [width=2.5,shape=Mrecord,label=\"", node->id);
     print("<top> %s ", node_str[node->kind]);
     switch (node->kind) {
-        case NODE_NUMBER: print("| Value: %d", node->value.i); break;
+        case NODE_NUM_INT: print("| Value: %d", node->value.i); break;
+        case NODE_NUM_FLOAT: print("| Value: %f{2}", node->value.d); break;
         default: break;
     }
     print("| Line: %d | Col: %d ", node->line, node->col);