Merge pull request #1808 from Shaikh-Ubaid/struct_init_expr

Require structs to be initialized before using

Author: ubaidsk

integration_tests/bindc_03.py

@@ -42,7 +42,7 @@ def h(q_void: CPtr) -> None:
 def run():
     a: CPtr
     array_wrapped: ArrayWrapped = ArrayWrapped(a)
-    array_wrapped1: ArrayWrapped
+    array_wrapped1: ArrayWrapped = ArrayWrapped()
     size: i32
     size = 10
     a = get_array(size)

integration_tests/structs_01.py

@@ -14,8 +14,7 @@ def change_struct(a: A):
     a.y = a.y + f32(1)
 
 def g():
-    x: A
-    x = A(f32(3.25), 3)
+    x: A = A(f32(3.25), 3)
     f(x)
     assert x.x == 3
     assert f64(x.y) == 3.25

integration_tests/structs_02.py

@@ -9,9 +9,8 @@ class A:
 def f(a: CPtr) -> None:
     x: i32
     y: f32
-    a1: A
+    a1: A = A(3, f32(3.25))
     a2: Pointer[A]
-    a1 = A(3, f32(3.25))
     a2 = pointer(a1)
     print(a2, pointer(a1))
     x = a2.x

integration_tests/structs_04.py

@@ -8,8 +8,8 @@ class A:
 
 @dataclass
 class B:
-    a: A
     z: i32
+    a: A = A(f32(0.0), 0)
 
 def f(b: B):
     print(b.z, b.a.x, b.a.y)
@@ -20,7 +20,7 @@ def f(b: B):
 def g():
     a1: A = A(f32(1.0), 1)
     a2: A = A(f32(2.0), 2)
-    b: B = B(a1, 1)
+    b: B = B(1, a1)
     b.a = deepcopy(a2)
     b.z = 1
     b.a.x = 2

integration_tests/structs_05.py

@@ -1,4 +1,5 @@
 from lpython import i32, f64, i64, i16, i8, f32, dataclass
+from numpy import empty
 
 @dataclass
 class A:
@@ -49,9 +50,8 @@ def update_2(s: A[:]):
     s[1].c = i8(3)
 
 def g():
-    # TODO: Replace y: A[2] with y: A[2] = [None, None]
-    # TODO: And enable cpython in integration_tests.
-    y: A[2]
+    # TODO: Enable cpython in integration_tests.
+    y: A[2] = empty([2], dtype=A)
     y[0] = A(1.1, 1, i64(1), f32(1.1), i16(1), i8(1), True)
     y[1] = A(2.2, 2, i64(2), f32(2.2), i16(2), i8(2), True)
     verify(y, 1, 1.1, 2, 2.2)

integration_tests/structs_09.py

@@ -7,13 +7,13 @@ class C:
 @dataclass
 class B:
     z: i32
-    bc: C
+    bc: C = C(f32(0.0))
 
 @dataclass
 class A:
     y: f32
     x: i32
-    b: B
+    b: B = B(0, C(f32(0.0)))
 
 
 def f(a: A):
@@ -22,8 +22,7 @@ def f(a: A):
     print(a.b.z)
 
 def g():
-    x: A
-    x = A(f32(3.25), 3, B(71, C(f32(4.0))))
+    x: A = A(f32(3.25), 3, B(71, C(f32(4.0))))
     f(x)
     assert x.x == 3
     assert f64(x.y) == 3.25

integration_tests/structs_10.py

@@ -11,8 +11,8 @@ class Vec:
 
 @dataclass
 class MatVec:
-    mat: Mat
-    vec: Vec
+    mat: Mat = Mat([f64(0.0), f64(0.0)])
+    vec: Vec = Vec([f64(0.0), f64(0.0)])
 
 def rotate(mat_vec: MatVec) -> f64[2]:
     rotated_vec: f64[2] = empty(2, dtype=float64)

integration_tests/structs_17.py

@@ -6,13 +6,13 @@ class B:
     @dataclass
     class C:
         cz: f32
-    bc: C
+    bc: C = C(f32(0.0))
 
 @dataclass
 class A:
     y: f32
     x: i32
-    b: B
+    b: B = B(0, B.C(f32(0.0)))
 
 
 def f(a: A):

integration_tests/union_02.py

@@ -19,9 +19,9 @@ class C:
 @ccall
 @union
 class D(Union):
-    a: A
-    b: B
-    c: C
+    a: A = A()
+    b: B = B()
+    c: C = C()
 
 def test_struct_union():
     d: D = D()

src/libasr/asr_utils.h

@@ -1192,15 +1192,15 @@ static inline std::string type_to_str_python(const ASR::ttype_t *t,
         }
         case ASR::ttypeType::Struct: {
             ASR::Struct_t* d = ASR::down_cast<ASR::Struct_t>(t);
-            return symbol_name(d->m_derived_type);
+            return "struct " + std::string(symbol_name(d->m_derived_type));
         }
         case ASR::ttypeType::Enum: {
             ASR::Enum_t* d = ASR::down_cast<ASR::Enum_t>(t);
-            return symbol_name(d->m_enum_type);
+            return "enum " + std::string(symbol_name(d->m_enum_type));
         }
         case ASR::ttypeType::Union: {
             ASR::Union_t* d = ASR::down_cast<ASR::Union_t>(t);
-            return symbol_name(d->m_union_type);
+            return "union " + std::string(symbol_name(d->m_union_type));
         }
         case ASR::ttypeType::Pointer: {
             ASR::Pointer_t* p = ASR::down_cast<ASR::Pointer_t>(t);