Some fixing of stuff

Author: UplinkCoder

printer/metac_printer.c

@@ -1735,19 +1735,21 @@ static inline void PrintSemaExpr(metac_printer_t* self,
     }
     else if (semaExpr->Kind == expr_tuple)
     {
-        PrintChar(self, '{');
+        uint32_t tupleExprCount = semaExpr->TupleExprCount;
         metac_sema_expr_t** tupleElement =
             semaExpr->TupleExprs;
+        PrintChar(self, '{');
         for(uint32_t i = 0;
-            i < semaExpr->TupleExprCount;
+            i < tupleExprCount - 1;
             i++)
         {
             PrintSemaExpr(self, sema,  tupleElement[i]);
-            if (i != (semaExpr->TupleExprCount - 1))
-            {
-                PrintChar(self, ',');
-                PrintSpace(self);
-            }
+            PrintChar(self, ',');
+            PrintSpace(self);
+        }
+        if (tupleExprCount > 0)
+        {
+            PrintSemaExpr(self, sema,  tupleElement[tupleExprCount - 1]);
         }
         PrintChar(self, '}');
     }

repl/completion_trie.c

@@ -426,14 +426,14 @@ void CompletionTrie_Print(completion_trie_root_t* root, uint32_t nodeIdx, const
 
 void CompletionTrie_Add(completion_trie_root_t* root, const char* word, uint32_t length)
 {
-    uint32_t remaning_length = length;
+    uint32_t remaining_length = length;
     completion_trie_node_t* PrefNode =
-        CompletionTrie_FindLongestMatchingPrefix(root, word, &remaning_length);
+        CompletionTrie_FindLongestMatchingPrefix(root, word, &remaining_length);
 
-    if (remaning_length)
+    if (remaining_length)
     {
-        int posWord = length - remaning_length;
-        PrefNode = CompletionTrie_AddChild(root, PrefNode, word + posWord, remaning_length);
+        int posWord = length - remaining_length;
+        PrefNode = CompletionTrie_AddChild(root, PrefNode, word + posWord, remaining_length);
     }
     // insert terminal node
     CompletionTrie_AddChild(root, PrefNode, "", 0);

semantic/metac_type_semantic.c

@@ -827,20 +827,20 @@ void MetaCSemantic_ComputeEnumValues(metac_sema_state_t* self,
 
             if (METAC_NODE(member->Value) != emptyNode)
             {
-                metac_sema_expr_t* semaValue =
-                    semaEnum->Members[memberIdx].Value;
-                assert(member->Value);
-                if (semaValue->Kind != expr_signed_integer)
+                metac_sema_expr_t semaValue =
+                    *semaEnum->Members[memberIdx].Value;
+
+                if (semaValue.Kind != expr_signed_integer)
                 {
-                    semaValue->TypeIndex.v = semaEnum->BaseType.v;
-                    MetaCSemantic_ConstantFold(self, semaValue);
+                    semaValue.TypeIndex.v = semaEnum->BaseType.v;
+                    semaValue = EvaluateExpr(self, &semaValue, 0);
                 }
-                if (semaValue->Kind != expr_signed_integer)
+                if (semaValue.Kind != expr_signed_integer)
                 {
                     fatalf("Value of %s could not be constant folded\n", IdentifierPtrToCharPtr(self->ParserIdentifierTable, member->Name));
                 }
                 //assert(semaValue->Kind == expr_signed_integer);
-                nextValue = semaValue->ValueI64 + 1;
+                nextValue = semaValue.ValueI64 + 1;
             }
             else
             {