Add array types and array symbol access

1 files changed, 30 insertions, 6 deletions

diff --git a/src/main.c b/src/main.c
index 558e0fc..57d09bd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,7 +76,9 @@ typedef enum NodeKind {
     NODE_SET,
     NODE_STRUCT,
     // Helpers.
+    NODE_SYMBOL_ARR,
     NODE_TYPE,
+    NODE_ARR_TYPE,
     NODE_COMPOUND_TYPE,
     NODE_STRUCT_FIELD,
 } NodeKind;
@@ -120,7 +122,9 @@ Str node_str[] = {
     [NODE_STRUCT] = cstr("STRUCT DEF"),
     // Helpers.
     [NODE_TYPE] = cstr("TYPE"),
-    [NODE_COMPOUND_TYPE] = cstr("COMPOUND TYPE"),
+    [NODE_ARR_TYPE] = cstr("TYPE (ARR)"),
+    [NODE_SYMBOL_ARR] = cstr("SYMBOL (ARR)"),
+    [NODE_COMPOUND_TYPE] = cstr("TYPE (COMPOUND)"),
     [NODE_STRUCT_FIELD] = cstr("FIELD"),
 };
 
@@ -143,7 +147,7 @@ typedef struct Node {
             struct Node *right;
         };
         struct Node *next;
-        struct Node *initializer;
+        struct Node *arr_size;
         struct {
             struct Node *var_name;
             struct Node *var_type;
@@ -412,6 +416,16 @@ parse_type(Parser *parser) {
         parse_consume(parser, TOK_SYMBOL,
                       cstr("no type given for struct field"));
         node->value.sym = parser->previous.val;
+        // Optional array value?
+        if (parse_match(parser, TOK_LSQUARE)) {
+            node->kind = NODE_ARR_TYPE,
+            parse_consume(parser, TOK_NUM_INT,
+                          cstr("no array size given"));
+            parse_number(parser);
+            node->arr_size = array_pop(parser->nodes);
+            parse_consume(parser, TOK_RSQUARE,
+                          cstr("unmatched brackets ']' in array type"));
+        }
     }
     array_push(parser->nodes, node, parser->storage);
 }
@@ -637,6 +651,15 @@ parse_symbol(Parser *parser) {
             field->field_type = array_pop(parser->nodes);
             array_push(node->elements, field, parser->storage);
         }
+    } else if (parse_match(parser, TOK_LSQUARE)) {
+        node = node_alloc(parser, NODE_SYMBOL_ARR, prev);
+        if (!node) return;
+        parse_consume(parser, TOK_NUM_INT,
+                        cstr("no array size given"));
+        parse_number(parser);
+        node->arr_size = array_pop(parser->nodes);
+        parse_consume(parser, TOK_RSQUARE,
+                        cstr("unmatched brackets ']' in array type"));
     } else {
         node = node_alloc(parser, NODE_SYMBOL, prev);
         if (!node) return;
@@ -667,10 +690,11 @@ graph_node(Node *node) {
         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;
-        case NODE_STRUCT: print("| Value: %s", node->value.sym); break;
-        case NODE_STRUCT_LIT: print("| Value: %s", node->value.sym); break;
-        case NODE_TYPE: print("| Value: %s", node->value.sym); break;
+        case NODE_SYMBOL_ARR: print("| Name: %s", node->value.sym); break;
+        case NODE_SYMBOL: print("| Name: %s", node->value.sym); break;
+        case NODE_STRUCT: print("| Name: %s", node->value.sym); break;
+        case NODE_STRUCT_LIT: print("| Name: %s", node->value.sym); break;
+        case NODE_TYPE: print("| Name: %s", node->value.sym); break;
         default: break;
     }
     println("\"];");