Various fixes

Author: UplinkCoder

metac.fpg

@@ -141,8 +141,23 @@ MetalNode {
     }
 
 
-    Variable @internal {
-        "type" / Identfier type, Identifier name
+    Stmt {
+        ReturnStmt {
+            "return", Expr value
+        }
+
+        YieldStmt {
+            "yield", Expr value
+        }
+
+        BlockStmt {
+            "{", Stmt[] statements : ";",  "}" 
+        }
+    }
+    Decl {
+        Variable @internal {
+            "type" / Identfier type, Identifier name
+        }
     }
 
     Comment {

os/metac_alloc.h

@@ -77,16 +77,15 @@ arena_ptr_t ReallocArenaArray(tagged_arena_t* arena, metac_alloc_t* alloc, uint3
     tagged_arena_t NAME##Arena; \
     arena_ptr_t NAME##ArenaPtr;
 
-#define ARENA_ARRAY_INIT_SZ(TYPE, NAME, ALLOC, COUNT) \
-    { \
+#define ARENA_ARRAY_INIT_SZ(TYPE, NAME, ALLOC, COUNT) do { \
         (NAME) = cast(TYPE*)0; \
         (NAME##Count) = 0; \
         (NAME##Alloc) = (ALLOC); \
         (NAME##ArenaPtr) = AllocateArena(ALLOC, (sizeof(TYPE) * (COUNT))); \
         (NAME##Arena) = (ALLOC)->Arenas[(NAME##ArenaPtr).Index]; \
         (NAME##Arena).Flags |= arena_flag_inUse; \
         (NAME) = cast(TYPE*) (NAME##Arena).Memory; \
-    } while(0)
+} while(0)
 
 #define ARENA_ARRAY_INIT(TYPE, NAME, ALLOC) \
     ARENA_ARRAY_INIT_SZ(TYPE, NAME, ALLOC, 16)

printer/metac_printer.c

@@ -1453,7 +1453,7 @@ static inline void PrintSemaType(metac_printer_t* self,
         {
             uint32_t enumIdx = TYPE_INDEX_INDEX(typeIndex);
             metac_identifier_ptr_t enumName =
-                EnumTypePtr(sema, enumIdx)->Name;
+                EnumTypePtr(sema, enumIdx)->Identifier;
             PrintString(self, "enum ", sizeof("enum"));
             if (enumName.v != empty_identifier.v)
             {
@@ -1543,7 +1543,7 @@ static inline void PrintSemaDecl(metac_printer_t* self,
     {
         case decl_type_enum:
         {
-            PrintIdentifier(self, semaDecl->sema_decl_type_enum.Name);
+            PrintIdentifier(self, semaDecl->sema_decl_type_enum.Identifier);
         } break;
         case decl_type_typedef:
         {

repl/completion_trie.c

@@ -37,9 +37,9 @@ void CompletionTrie_Init(completion_trie_root_t* self, metac_alloc_t* parentAllo
 {
     Allocator_Init(&self->TrieAllocator, parentAlloc);
 
-    ARENA_ARRAY_INIT_SZ(completion_trie_node_t, self->Nodes, &self->TrieAllocator, 786)
+    ARENA_ARRAY_INIT_SZ(completion_trie_node_t, self->Nodes, &self->TrieAllocator, 786);
 #if TRACK_RANGES
-    ARENA_ARRAY_INIT_SZ(node_range_t, self->NodeRanges, parentAlloc, 512)
+    ARENA_ARRAY_INIT_SZ(node_range_t, self->NodeRanges, parentAlloc, 512);
 #endif
     self->NodesCount = 64;
 

semantic/metac_semantic.c

@@ -792,7 +792,7 @@ scope_insert_error_t MetaCSemantic_RegisterInScope(metac_sema_state_t* self,
     ALIGN_STACK();
     MetaCSemantic_LRU_RemoveIdentifier(self, idPtr);
     RESTORE_STACK();
-    
+
     if (self->CurrentScope != 0)
     {
         result = MetaCScope_RegisterIdentifier(self->CurrentScope, idPtr, node);
@@ -1084,8 +1084,10 @@ const char* doDeclSemantic_PrintFunction(task_t* task)
     const char* declPrint = 0;
 //        MetaCPrinter_PrintDecl(&printer, ctx->Decl);
 
-    sprintf(buffer, "doDeclSemantic {Sema: %p, Decl: %s}\n",
+    ALIGN_STACK();
+    snprintf(buffer, 256,  "doDeclSemantic {Sema: %p, Decl: %s}\n",
                     ctx->Sema, declPrint);
+    RESTORE_STACK();
 
     return buffer;
 }
@@ -1199,7 +1201,7 @@ metac_sema_decl_t* MetaCSemantic_declSemantic(metac_sema_state_t* self,
 void MetaCSemantic_doDeclSemantic_Task(task_t* task)
 {
     const char* taskPrint = doDeclSemantic_PrintFunction(task);
-    printf("Task: %s\n", taskPrint);
+    xprintf("Task: %s\n", taskPrint);
     free(cast(void*)taskPrint);
 
     MetaCSemantic_doDeclSemantic_task_context_t* ctx =

semantic/metac_type.h

@@ -126,7 +126,7 @@ typedef struct metac_type_enum_t
 
     metac_type_index_t TypeIndex;
 
-    metac_identifier_ptr_t Name;
+    metac_identifier_ptr_t Identifier;
 
     metac_type_index_t BaseType;
 
@@ -172,9 +172,9 @@ typedef struct metac_type_functiontype_t
 
     metac_type_index_t* ParameterTypes;
 
-    uint32_t ParameterTypeCount;
-
     metac_identifier_ptr_t* ParameterNames;
+
+    uint32_t ParameterTypeCount;
 } metac_type_functiontype_t;
 
 typedef struct metac_type_typedef_t

semantic/metac_type_semantic.c

@@ -629,7 +629,7 @@ metac_type_aggregate_t* MetaCSemantic_PersistTemporaryAggregateAndPopulateScope(
         typeIndex = MetaCTypeTable_AddStructType(&self->StructTypeTable, tmpAgg);
         semaAgg = StructPtr(self, TYPE_INDEX_INDEX(typeIndex));
         scope_->Owner.v = SCOPE_OWNER_V(scope_owner_struct, StructIndex(self, semaAgg));
-    } 
+    }
     else if (tmpAgg->Header.Kind == decl_type_union)
     {
         typeIndex = MetaCTypeTable_AddUnionType(&self->UnionTypeTable, tmpAgg);
@@ -720,7 +720,7 @@ void MetaCSemantic_ComputeEnumValues(metac_sema_state_t* self,
     // such that you can interpret the increment operator
     // MetaCSemantic_SetInProgress(self, semaEnum, "Members");
 
-    semaEnum->Name = MetaCIdentifierTable_CopyIdentifier(self->ParserIdentifierTable, &self->SemanticIdentifierTable, enum_->Identifier);
+    semaEnum->Identifier = MetaCIdentifierTable_CopyIdentifier(self->ParserIdentifierTable, &self->SemanticIdentifierTable, enum_->Identifier);
     semaEnum->Header.Kind = decl_type_enum;
     if (METAC_NODE(enum_->BaseType) == emptyNode)
     {
@@ -962,7 +962,7 @@ metac_type_index_t TypeEnumSemantic(metac_sema_state_t* self,
 
     enumScope.Owner.v = SCOPE_OWNER_V(scope_owner_enum, 0);
     tmpSemaEnum.MemberCount = enm->MemberCount;
-    tmpSemaEnum.Name = enm->Identifier;
+    tmpSemaEnum.Identifier = enm->Identifier;
 
     MetaCScopeTable_InitN(&enumScope.ScopeTable, tmpSemaEnum.MemberCount, &self->TempAlloc);
 
@@ -1007,7 +1007,7 @@ metac_type_index_t TypeEnumSemantic(metac_sema_state_t* self,
         result = MetaCTypeTable_AddEnumType(&self->EnumTypeTable, &tmpSemaEnum);
 
         keepEnumScope = true;
-        MetaCSemantic_RegisterInScope(self, tmpSemaEnum.Name, cast(metac_node_t)EnumTypePtr(self, result.Index));
+        MetaCSemantic_RegisterInScope(self, tmpSemaEnum.Identifier, cast(metac_node_t)EnumTypePtr(self, result.Index));
         for(uint32_t i = 0; i < semaMembersCount; i++)
         {
             semaMembers[i].Value->TypeIndex.v = result.v;
@@ -1332,7 +1332,7 @@ LtryAgian: {}
     }
     else
     {
-        assert(0); // me not no what do do.
+        assert(0); // me not know what do do.
     }
 #ifndef NO_FIBERS
     const uint32_t funcHash = crc32c(~0, "MetaCSemantic_doTypeSemantic",

semantic/metac_type_table.h

@@ -36,6 +36,13 @@ static inline const bool EnumSlotsEqual(const metac_type_table_slot_t* a,
     bool result = true;
     metac_type_enum_t* slotA = cast(metac_type_enum_t*) a;
     metac_type_enum_t* slotB = cast(metac_type_enum_t*) b;
+
+    if (slotA->Identifier.v != slotB->Identifier.v)
+    {
+        result = false;
+        goto Lret;
+    }
+
     if (slotA->MemberCount == slotB->MemberCount)
     {
         uint32_t count = slotA->MemberCount;
@@ -53,7 +60,7 @@ static inline const bool EnumSlotsEqual(const metac_type_table_slot_t* a,
     {
         result = false;
     }
-
+Lret:
     return result;
 }