Fixup sizeof a little bit

Author: UplinkCoder

repl/completion_trie.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(TEST_MAIN)
+#if defined(COMP_TRIE_TEST_MAIN)
 #  include "../os/os.c"
 #  include "../os/metac_alloc.c"
 #endif
@@ -471,7 +471,7 @@ void CompletionTrie_Add(completion_trie_root_t* root, const char* word, uint32_t
     CompletionTrie_AddChild(root, parentNode, "", 0);
 }
 
-#if defined(TEST_MAIN)
+#if defined(COMP_TRIE_TEST_MAIN)
 typedef struct {
     const char** Strings;
     uint32_t nStrings;
@@ -596,7 +596,7 @@ void CompletionTrie_PrintStats(completion_trie_root_t* self, uint16_t n)
 #endif
 }
 
-#ifdef TEST_MAIN
+#if defined(COMP_TRIE_TEST_MAIN)
     int main(int argc, const char* argv[])
     {
         CompletionTrie_NoPreallocatedCIdentifierChars = true;

semantic/metac_expr_semantic.c

@@ -1275,16 +1275,17 @@ metac_sema_expr_t* MetaCSemantic_doExprSemantic_(metac_sema_state_t* self,
         case expr_sizeof:
         {
             int32_t size = -1;
-            hash = sizeof_key;
             metac_sema_expr_t* e1 =
                 MetaCSemantic_doExprSemantic(self, expr->E1, 0);
+            metac_type_index_t typeIdx;
+            hash = sizeof_key;
 
             while (e1->Kind == expr_paren)
             {
                 e1 = e1->E1;
             }
 
-            metac_type_index_t typeIdx = e1->TypeIndex;
+            typeIdx = e1->TypeIndex;
             // usually we assume the type of which we want
             // to get the size is the type of the expression
             if (e1->Kind == expr_type)
@@ -1293,15 +1294,18 @@ metac_sema_expr_t* MetaCSemantic_doExprSemantic_(metac_sema_state_t* self,
                 // which is something that resolves to a type such as the identifier int
                 typeIdx = e1->TypeExp;
                 hash = CRC32C_VALUE(hash, e1->TypeExp);
-            } else if (e1->TypeIndex.v == TYPE_INDEX_V(type_index_basic, type_type))
+            }
+            else if (e1->TypeIndex.v == TYPE_INDEX_V(type_index_basic, type_type))
             {
                 // if the expression is any other kind of expression and it is of type type
                 // it indicates we want this sizeof be resolved at a later time
                 // possibly when calling a function
             }
 
-            if (e1->TypeIndex.v != 0 && e1->TypeIndex.v != -1)
+            if (typeIdx.v != 0 && typeIdx.v != -1)
+            {
                 size = MetaCSemantic_GetTypeSize(self, typeIdx);
+            }
 
             result->TypeIndex.v = TYPE_INDEX_V(type_index_basic, type_size_t);
             result->Kind = expr_signed_integer;