wi[p

Author: czgdp1807

integration_tests/test_list_07.py

@@ -0,0 +1,66 @@
+from ltypes import c64, i32
+
+def test_tuple_with_lists():
+    mat: list[list[c64]] = []
+    vec: list[c64] = []
+    tensor: tuple[list[list[c64]], list[c64]]
+    tensors: list[tuple[list[list[c64]], list[c64]]]
+    i: i32
+    j: i32
+    k: i32
+    l: i32
+    rows: i32 = 10
+    cols: i32 = 5
+
+    for i in range(rows):
+        for j in range(cols):
+            vec.append(complex(i + j, 0))
+        mat.append(vec)
+        vec.clear()
+
+    for i in range(cols):
+        vec.append(complex(2 * i, 0))
+
+    for i in range(rows):
+        for j in range(cols):
+            assert mat[i][j] - vec[j] == i - j
+
+    tensor = (mat, vec)
+
+    for i in range(rows):
+        for j in range(cols):
+            mat[i][j] += complex(0, 3.0)
+
+    for i in range(cols):
+        vec[i] += complex(0, 2.0)
+
+    for i in range(rows):
+        for j in range(cols):
+            assert tensor[0][i][j] - mat[i][j] == -complex(0, 3.0)
+
+    for i in range(cols):
+        assert tensor[1][i] - vec[i] == -complex(0, 2.0)
+
+    tensor = (mat, vec)
+
+    for k in range(2 * rows):
+        tensors.append(tensor)
+        for i in range(rows):
+            for j in range(cols):
+                mat[i][j] += complex(1.0, 2.0)
+
+        for i in range(cols):
+            vec[i] += complex(1.0, 2.0)
+
+        tensor = (mat, vec)
+
+    for k in range(2 * rows):
+        for i in range(rows):
+            for j in range(cols):
+                assert tensors[k][0][i][j] - mat[i][j] == -(2 * rows - k) * complex(1.0, 2.0)
+
+    for k in range(2 * rows):
+        for i in range(cols):
+            assert tensors[k][1][i] - vec[i] == -(2 * rows - k) * complex(1.0, 2.0)
+
+test_tuple_with_lists()

src/libasr/codegen/asr_to_llvm.cpp

@@ -1307,7 +1307,7 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
         this->visit_expr_wrapper(x.m_pos, true);
         llvm::Value *pos = tmp;
 
-        tmp = tuple_api->read_item(ptuple, pos);
+        tmp = tuple_api->read_item(ptuple, pos, LLVM::is_llvm_struct(x.m_type));
     }
 
     void visit_ArrayItem(const ASR::ArrayItem_t& x) {
@@ -1855,7 +1855,8 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
                 std::string el_type_code = ASRUtils::get_type_code(asr_list->m_type);
                 int32_t type_size = -1;
                 if( LLVM::is_llvm_struct(asr_list->m_type) ||
-                    ASR::is_a<ASR::Character_t>(*asr_list->m_type) ) {
+                    ASR::is_a<ASR::Character_t>(*asr_list->m_type) ||
+                    ASR::is_a<ASR::Complex_t>(*asr_list->m_type) ) {
                     llvm::DataLayout data_layout(module.get());
                     type_size = data_layout.getTypeAllocSize(el_llvm_type);
                 } else {
@@ -2237,7 +2238,8 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
                                                                  a_kind);
                 int32_t type_size = -1;
                 if( LLVM::is_llvm_struct(asr_list->m_type) ||
-                    ASR::is_a<ASR::Character_t>(*asr_list->m_type) ) {
+                    ASR::is_a<ASR::Character_t>(*asr_list->m_type) ||
+                    ASR::is_a<ASR::Complex_t>(*asr_list->m_type) ) {
                     llvm::DataLayout data_layout(module.get());
                     type_size = data_layout.getTypeAllocSize(el_llvm_type);
                 } else {

src/libasr/codegen/llvm_utils.cpp

@@ -304,7 +304,7 @@ namespace LFortran {
                                                        arg_size);
         llvm::Type* el_type = std::get<2>(typecode2listtype[src_type_code]);
         copy_data = builder->CreateBitCast(copy_data, el_type->getPointerTo());
-        if( LLVM::is_mutable_llvm_struct(list_type->m_type) ) {
+        if( LLVM::is_llvm_struct(list_type->m_type) ) {
             builder->CreateStore(copy_data, get_pointer_to_list_data(dest));
             llvm::AllocaInst *pos_ptr = builder->CreateAlloca(llvm::Type::getInt32Ty(context),
                                                               nullptr);

src/libasr/codegen/llvm_utils.h

@@ -55,11 +55,6 @@ namespace LFortran {
                    ASR::is_a<ASR::Derived_t>(*asr_type) ||
                    ASR::is_a<ASR::Class_t>(*asr_type);
         }
-        static inline bool is_mutable_llvm_struct(ASR::ttype_t* asr_type) {
-            return ASR::is_a<ASR::List_t>(*asr_type) ||
-                   ASR::is_a<ASR::Derived_t>(*asr_type) ||
-                   ASR::is_a<ASR::Class_t>(*asr_type);
-        }
     }
 
     class LLVMList;