fixed: storage of union variants

Author: brendanfh

compiler/include/astnodes.h

@@ -195,7 +195,6 @@ typedef enum AstKind {
     Ast_Kind_Distinct_Type,
     Ast_Kind_Type_End,
 
-    Ast_Kind_Union_Variant,
     Ast_Kind_Enum_Value,
 
     Ast_Kind_NumLit,
@@ -1088,7 +1087,7 @@ struct AstUnionType {
     AstType_base;
     char *name;
 
-    bh_arr(AstUnionVariant *) variants;
+    bh_arr(AstUnionVariant) variants;
     bh_arr(AstTyped *) meta_tags;
 
     AstType *tag_backing_type;

compiler/src/astnodes.c

@@ -55,7 +55,6 @@ static const char* ast_node_names[] = {
     "DISTINCT TYPE",
     "TYPE_END (BAD)",
 
-    "UNION VARIANT",
     "ENUM VALUE",
 
     "NUMERIC LITERAL",

compiler/src/checker.c

@@ -4357,8 +4357,7 @@ CHECK_FUNC(union, AstUnionType *u_node) {
 
     CHECK(meta_tags, u_node->meta_tags);
 
-    bh_arr_each(AstUnionVariant *, pvariant, u_node->variants) {
-        AstUnionVariant *variant = *pvariant;
+    bh_arr_each(AstUnionVariant, variant, u_node->variants) {
         track_declaration_for_symbol_info(context, variant->token->pos, (AstNode *) variant);
 
         assert(variant->type_node);

compiler/src/clone.c

@@ -113,7 +113,6 @@ static inline i32 ast_kind_to_size(AstNode* node) {
         case Ast_Kind_Capture_Block: return sizeof(AstCaptureBlock);
         case Ast_Kind_Capture_Local: return sizeof(AstCaptureLocal);
         case Ast_Kind_Union_Type: return sizeof(AstUnionType);
-        case Ast_Kind_Union_Variant: return sizeof(AstUnionVariant);
         case Ast_Kind_Procedural_Expansion: return sizeof(AstProceduralExpansion);
         case Ast_Kind_Code_Block: return sizeof(AstCodeBlock);
 
@@ -411,8 +410,16 @@ AstNode* ast_clone(Context *context, void* n) {
             du->variants = NULL;
             bh_arr_new(context->gp_alloc, du->variants, bh_arr_length(su->variants));
 
-            bh_arr_each(AstUnionVariant *, uv, su->variants) {
-                bh_arr_push(du->variants, (AstUnionVariant *) ast_clone(context, *uv));
+            bh_arr_each(AstUnionVariant, uv, su->variants) {
+                AstUnionVariant new_variant = *uv;
+
+                new_variant.meta_tags = NULL;
+                bh_arr_new(context->gp_alloc, new_variant.meta_tags, bh_arr_length(su->meta_tags));
+                bh_arr_each(AstTyped *, tag, su->meta_tags) {
+                    bh_arr_push(new_variant.meta_tags, (AstTyped *) ast_clone(context, *tag));
+                }
+
+                bh_arr_push(du->variants, new_variant);
             }
 
             du->meta_tags = NULL;
@@ -434,21 +441,6 @@ AstNode* ast_clone(Context *context, void* n) {
             break;
         }
 
-        case Ast_Kind_Union_Variant: {
-            C(AstUnionVariant, type_node);
-
-            AstUnionVariant *du = (AstUnionVariant *) nn;
-            AstUnionVariant *su = (AstUnionVariant *) node;
-
-            du->meta_tags = NULL;
-            bh_arr_new(context->gp_alloc, du->meta_tags, bh_arr_length(su->meta_tags));
-            bh_arr_each(AstTyped *, tag, su->meta_tags) {
-                bh_arr_push(du->meta_tags, (AstTyped *) ast_clone(context, *tag));
-            }
-
-            break;
-        }
-
         case Ast_Kind_Poly_Call_Type: {
             AstPolyCallType* pcd = (AstPolyCallType *) nn;
             AstPolyCallType* pcs = (AstPolyCallType *) node;

compiler/src/doc.c

@@ -762,9 +762,7 @@ static b32 write_doc_union_type(Context *context, bh_buffer *buffer, AstBinding
         bh_buffer_init(&type_buf, context->scratch_alloc, 256);
 
         bh_buffer_write_u32(buffer, bh_arr_length(union_node->variants));
-        bh_arr_each(AstUnionVariant*, puv, union_node->variants) {
-            AstUnionVariant* uv = *puv;
-
+        bh_arr_each(AstUnionVariant, uv, union_node->variants) {
             bh_buffer_clear(&type_buf);
             write_type_node(context, &type_buf, uv->type_node);
 

compiler/src/parser.c

@@ -2927,17 +2927,17 @@ static AstUnionType* parse_union(OnyxParser* parser) {
             break;
         }
 
-        AstUnionVariant *variant = make_node(AstUnionVariant, Ast_Kind_Union_Variant);
-        variant->meta_tags = meta_tags;
-        variant->token = expect_token(parser, Token_Type_Symbol);
+        AstUnionVariant variant = { 0 };
+        variant.meta_tags = meta_tags;
+        variant.token = expect_token(parser, Token_Type_Symbol);
 
         if (consume_token_if_next(parser, Token_Type_Keyword_As)) {
-            variant->explicit_tag_value = parse_factor(parser);
+            variant.explicit_tag_value = parse_factor(parser);
         }
 
         expect_token(parser, ':');
 
-        variant->type_node = parse_type(parser);
+        variant.type_node = parse_type(parser);
 
         bh_arr_push(u_node->variants, variant);
 

compiler/src/types.c

@@ -741,8 +741,7 @@ static Type* type_build_from_ast_inner(Context *context, AstType* type_node, b32
 
             //
             // All variants need to have type know.
-            bh_arr_each(AstUnionVariant *, pvariant, union_->variants) {
-                AstUnionVariant *variant = *pvariant;
+            bh_arr_each(AstUnionVariant, variant, union_->variants) {
                 if (!variant->type) {
                     variant->type = type_build_from_ast_inner(context, variant->type_node, 1);
                 }
@@ -784,8 +783,7 @@ static Type* type_build_from_ast_inner(Context *context, AstType* type_node, b32
 
             //
             // Create variant instances
-            bh_arr_each(AstUnionVariant *, pvariant, union_->variants) {
-                AstUnionVariant *variant = *pvariant;
+            bh_arr_each(AstUnionVariant, variant, union_->variants) {
                 assert(variant->type);
 
                 u32 var_alignment = type_alignment_of(variant->type);