fixes #219

thradams · Dec 28, 2024 · 6c5add5 · 6c5add5
1 parent 4ffb539
commit 6c5add5
Show file tree

Hide file tree

Showing 7 changed files with 420 additions and 392 deletions.
diff --git a/src/file.c b/src/file.c
@@ -1,32 +1,8 @@
-#pragma safety enable
-
-struct item {
-     char* _Owner title;
-     struct item* _Owner _Opt  next;
-};
-
-struct list {
-    struct item* _Owner _Opt head;
-    struct item* _Opt tail;
+struct X {
+	int x;
 };
 
-bool list_is_empty(const struct list* list2)
-  true(list2.head == nullptr && list2.tail == nullptr),
-  false(list2.head != nullptr && list2.tail != nullptr)
-{
-    return list2->head != nullptr;
-}
-
-void list_clear(struct list* list1)
-  pos(list_is_empty(list1))
-{
-    list1->head = 0;
-}
-
-
-int main(int argc, char* argv[])
-{
-  struct list l = {0};
-  list_clear(&l);
-  static_state(l.head , "null");
+int main() {
+    constexpr struct X x = (struct X){ .x = 50 };
+    static_assert(x.x == 50);
 }
diff --git a/src/lib.c b/src/lib.c
@@ -16642,13 +16642,27 @@ void object_set(struct object* to, struct expression* _Opt p_init_expression, co
         to->state = from->state;
         to->value = object_cast(to->value_type, from).value;
 
-        if (!is_constant &&
-            to->state == CONSTANT_VALUE_STATE_CONSTANT_EXACT)
+        if (is_constant)
+        {
+            if (to->state == CONSTANT_VALUE_STATE_CONSTANT_EXACT ||
+                to->state == CONSTANT_VALUE_STATE_EXACT)
+            {
+                /*
+                struct X {int x;};
+                int main() { constexpr struct X x = (struct X){ .x = 50 };}*/
+                to->state = CONSTANT_VALUE_STATE_CONSTANT_EXACT ;
+            }
+        }
+        else
         {
-            //Sample int i = 1; 1 is constant but i will not be
-            to->state = CONSTANT_VALUE_STATE_EXACT;
+            if (to->state == CONSTANT_VALUE_STATE_CONSTANT_EXACT)
+            {
+                //Sample int i = 1; 1 is constant but i will not be
+                to->state = CONSTANT_VALUE_STATE_EXACT;
+            }
         }
 
+
     }
 }
 
@@ -16819,16 +16833,16 @@ struct object* _Owner _Opt make_object_ptr_core(const struct type* p_type, const
                     if (p_member_obj == NULL)
                         throw;
 
-                    p_member_obj->debug_name= strdup(buffer);
+                    p_member_obj->debug_name = strdup(buffer);
                     p_member_obj->parent = p_object;
                     if (p_last_member_obj == NULL)
                     {
                         assert(p_object->members == NULL);
-                        p_object->members = p_member_obj;                        
+                        p_object->members = p_member_obj;
                     }
                     else
                     {
-                        p_last_member_obj->next = p_member_obj;                        
+                        p_last_member_obj->next = p_member_obj;
                     }
                     p_last_member_obj = p_member_obj;
 
@@ -27953,7 +27967,7 @@ void defer_start_visit_declaration(struct defer_visit_ctx* ctx, struct declarati
 
 //#pragma once
 
-#define CAKE_VERSION "0.9.44"
+#define CAKE_VERSION "0.9.45"
 
 
 
@@ -30647,14 +30661,14 @@ struct init_declarator* _Owner _Opt init_declarator(struct parser_ctx* ctx,
                     p_init_declarator->p_declarator->declaration_specifiers->storage_class_specifier_flags & STORAGE_SPECIFIER_CONSTEXPR;
 
 
-                //intf("\n");
-                //ject_print_to_debug(&p_init_declarator->p_declarator->object);
+                //intf("\n");                
 
                 initializer_init_new(ctx,
                                  &p_init_declarator->p_declarator->type,
                                  &p_init_declarator->p_declarator->object,
                                  p_init_declarator->initializer,
                                  is_constant);
+               //object_print_to_debug(&p_init_declarator->p_declarator->object);
             }
         }
         else

diff --git a/src/object.c b/src/object.c
@@ -1476,13 +1476,27 @@ void object_set(struct object* to, struct expression* _Opt p_init_expression, co
         to->state = from->state;
         to->value = object_cast(to->value_type, from).value;
 
-        if (!is_constant &&
-            to->state == CONSTANT_VALUE_STATE_CONSTANT_EXACT)
+        if (is_constant)
+        {
+            if (to->state == CONSTANT_VALUE_STATE_CONSTANT_EXACT ||
+                to->state == CONSTANT_VALUE_STATE_EXACT)
+            {
+                /*
+                struct X {int x;};
+                int main() { constexpr struct X x = (struct X){ .x = 50 };}*/
+                to->state = CONSTANT_VALUE_STATE_CONSTANT_EXACT ;
+            }
+        }
+        else
         {
-            //Sample int i = 1; 1 is constant but i will not be
-            to->state = CONSTANT_VALUE_STATE_EXACT;
+            if (to->state == CONSTANT_VALUE_STATE_CONSTANT_EXACT)
+            {
+                //Sample int i = 1; 1 is constant but i will not be
+                to->state = CONSTANT_VALUE_STATE_EXACT;
+            }
         }
 
+
     }
 }
 
@@ -1653,16 +1667,16 @@ struct object* _Owner _Opt make_object_ptr_core(const struct type* p_type, const
                     if (p_member_obj == NULL)
                         throw;
 
-                    p_member_obj->debug_name= strdup(buffer);
+                    p_member_obj->debug_name = strdup(buffer);
                     p_member_obj->parent = p_object;
                     if (p_last_member_obj == NULL)
                     {
                         assert(p_object->members == NULL);
-                        p_object->members = p_member_obj;                        
+                        p_object->members = p_member_obj;
                     }
                     else
                     {
-                        p_last_member_obj->next = p_member_obj;                        
+                        p_last_member_obj->next = p_member_obj;
                     }
                     p_last_member_obj = p_member_obj;
 

diff --git a/src/parser.c b/src/parser.c
@@ -2686,14 +2686,14 @@ struct init_declarator* _Owner _Opt init_declarator(struct parser_ctx* ctx,
                     p_init_declarator->p_declarator->declaration_specifiers->storage_class_specifier_flags & STORAGE_SPECIFIER_CONSTEXPR;
 
 
-                //intf("\n");
-                //ject_print_to_debug(&p_init_declarator->p_declarator->object);
+                //intf("\n");                
 
                 initializer_init_new(ctx,
                                  &p_init_declarator->p_declarator->type,
                                  &p_init_declarator->p_declarator->object,
                                  p_init_declarator->initializer,
                                  is_constant);
+               //object_print_to_debug(&p_init_declarator->p_declarator->object);
             }
         }
         else

diff --git a/src/version.h b/src/version.h
@@ -5,6 +5,6 @@
 
 #pragma once
 
-#define CAKE_VERSION "0.9.44"
+#define CAKE_VERSION "0.9.45"
 
 
diff --git a/src/web/cake.js b/src/web/cake.js
diff --git a/tests/unit-tests/initialization_const_from_non_const.c b/tests/unit-tests/initialization_const_from_non_const.c
@@ -0,0 +1,8 @@
+struct X {
+	int x;
+};
+
+int main() {
+    constexpr struct X x = (struct X){ .x = 50 };
+    static_assert(x.x == 50);
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,6 @@

		#pragma once

		#define CAKE_VERSION "0.9.44"
		#define CAKE_VERSION "0.9.45"