Merge branch 'set_separate_chaining' of https://github.com/kabra1110/lpython into set_separate_chaining

Author: kabra1110

integration_tests/CMakeLists.txt

@@ -76,12 +76,13 @@ message("LPYTHON_RTLIB_DIR: ${LPYTHON_RTLIB_DIR}")
 message("LPYTHON_RTLIB_LIBRARY: ${LPYTHON_RTLIB_LIBRARY}")
 
 
-macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
+macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
     set(fail ${${RUN_FAIL}})
     set(name ${${RUN_NAME}})
     set(file_name ${${RUN_FILE_NAME}})
     set(labels ${${RUN_LABELS}})
     set(extra_files ${${RUN_EXTRAFILES}})
+    set(no_mod ${${RUN_NOMOD}})
     set(extra_args ${${RUN_EXTRA_ARGS}})
     set(copy_to_bin ${${RUN_COPY_TO_BIN}})
 
@@ -213,8 +214,13 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXT
             endif()
 
             add_test(${name} python ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
-            set_tests_properties(${name} PROPERTIES
-                ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/lpython:${CMAKE_SOURCE_DIR}/..;LPYTHON_PY_MOD_NAME=${PY_MOD};LPYTHON_PY_MOD_PATH=${CMAKE_CURRENT_BINARY_DIR}")
+            if (no_mod)
+                set_tests_properties(${name} PROPERTIES
+                    ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/lpython:${CMAKE_SOURCE_DIR}/..")
+            else()
+                set_tests_properties(${name} PROPERTIES
+                    ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/lpython:${CMAKE_SOURCE_DIR}/..;LPYTHON_PY_MOD_NAME=${PY_MOD};LPYTHON_PY_MOD_PATH=${CMAKE_CURRENT_BINARY_DIR}")
+            endif()
             if (labels)
                 set_tests_properties(${name} PROPERTIES LABELS "${labels}")
             endif()
@@ -305,7 +311,7 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXT
 endmacro(RUN_UTIL)
 
 macro(RUN)
-    set(options FAIL NOFAST ENABLE_CPYTHON LINK_NUMPY)
+    set(options FAIL NOFAST NOMOD ENABLE_CPYTHON LINK_NUMPY)
     set(oneValueArgs NAME IMPORT_PATH COPY_TO_BIN)
     set(multiValueArgs LABELS EXTRAFILES)
     cmake_parse_arguments(RUN "${options}" "${oneValueArgs}"
@@ -329,14 +335,14 @@ macro(RUN)
     endif()
 
     if (NOT FAST)
-        RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
+        RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
     endif()
 
     if ((FAST) AND (NOT RUN_NOFAST))
         set(RUN_EXTRA_ARGS ${RUN_EXTRA_ARGS} --fast)
         set(RUN_NAME "${RUN_NAME}_FAST")
         list(REMOVE_ITEM RUN_LABELS cpython cpython_sym) # remove cpython, cpython_sym, from --fast test
-        RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
+        RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
     endif()
 endmacro(RUN)
 
@@ -466,7 +472,6 @@ RUN(NAME expr_18    FAIL     LABELS cpython llvm c)
 RUN(NAME expr_19             LABELS cpython llvm c)
 RUN(NAME expr_20             LABELS cpython llvm c)
 RUN(NAME expr_21             LABELS cpython llvm c)
-RUN(NAME expr_22             LABELS cpython llvm c)
 
 RUN(NAME expr_01u            LABELS cpython llvm c NOFAST)
 RUN(NAME expr_02u            LABELS cpython llvm c NOFAST)
@@ -479,6 +484,7 @@ RUN(NAME loop_03             LABELS cpython llvm c wasm wasm_x64)
 RUN(NAME loop_04             LABELS cpython llvm c)
 RUN(NAME loop_05             LABELS cpython llvm c)
 RUN(NAME loop_06             LABELS cpython llvm c NOFAST)
+RUN(NAME loop_07             LABELS cpython llvm c)
 RUN(NAME if_01               LABELS cpython llvm c wasm wasm_x86 wasm_x64)
 RUN(NAME if_02               LABELS cpython llvm c wasm wasm_x86 wasm_x64)
 RUN(NAME if_03    FAIL       LABELS cpython llvm c NOFAST)
@@ -500,14 +506,18 @@ RUN(NAME test_list_09        LABELS cpython llvm c NOFAST)
 RUN(NAME test_list_10        LABELS cpython llvm c NOFAST)
 RUN(NAME test_list_11        LABELS cpython llvm c)
 RUN(NAME test_list_section   LABELS cpython llvm c NOFAST)
+RUN(NAME test_list_section2  LABELS cpython llvm c NOFAST)
 RUN(NAME test_list_count     LABELS cpython llvm)
 RUN(NAME test_list_index     LABELS cpython llvm)
 RUN(NAME test_list_index2    LABELS cpython llvm)
-RUN(NAME test_list_repeat    LABELS cpython llvm NOFAST)
+RUN(NAME test_list_repeat    LABELS cpython llvm c NOFAST)
+RUN(NAME test_list_repeat2   LABELS cpython llvm c NOFAST)
 RUN(NAME test_list_reverse   LABELS cpython llvm)
 RUN(NAME test_list_pop       LABELS cpython llvm NOFAST) # TODO: Remove NOFAST from here.
 RUN(NAME test_list_pop2       LABELS cpython llvm NOFAST) # TODO: Remove NOFAST from here.
+RUN(NAME test_list_pop3      LABELS cpython llvm)
 RUN(NAME test_list_compare   LABELS cpython llvm)
+RUN(NAME test_list_concat    LABELS cpython llvm c NOFAST)
 RUN(NAME test_tuple_01       LABELS cpython llvm c)
 RUN(NAME test_tuple_02       LABELS cpython llvm c NOFAST)
 RUN(NAME test_tuple_03       LABELS cpython llvm c)
@@ -662,7 +672,6 @@ RUN(NAME structs_31          LABELS cpython llvm c)
 RUN(NAME structs_32          LABELS cpython llvm c)
 RUN(NAME structs_33          LABELS cpython llvm c)
 RUN(NAME structs_34          LABELS cpython llvm c)
-RUN(NAME structs_35          LABELS cpython llvm c)
 
 RUN(NAME symbolics_01        LABELS cpython_sym c_sym)
 RUN(NAME symbolics_02        LABELS cpython_sym c_sym)
@@ -709,7 +718,7 @@ RUN(NAME test_package_01     LABELS cpython llvm NOFAST)
 RUN(NAME test_pkg_lpdraw     LABELS cpython llvm wasm)
 RUN(NAME test_pkg_lnn_01        LABELS cpython llvm NOFAST)
 RUN(NAME test_pkg_lnn_02        LABELS cpython llvm NOFAST)
-RUN(NAME test_pkg_lpconvexhull  LABELS cpython c)
+RUN(NAME test_pkg_lpconvexhull  LABELS cpython llvm c NOFAST)
 
 RUN(NAME generics_01         LABELS cpython llvm c)
 RUN(NAME generics_02         LABELS cpython llvm c)
@@ -760,3 +769,6 @@ RUN(NAME lpython_decorator_01    LABELS cpython)
 RUN(NAME lpython_decorator_02    LABELS cpython)
 
 COMPILE(NAME import_order_01     LABELS cpython llvm c) # any
+
+# LPython emulation mode
+RUN(NAME lpython_emulation_01    LABELS cpython NOMOD)

integration_tests/expr_22.py

@@ -0,0 +1,17 @@
+from lpython import i32
+
+def main0():
+    points: list[tuple[i32, i32]] = [(445, 193), (138, 28), (418, 279)]
+    point: tuple[i32, i32]
+    x_sum: i32 = 0
+    y_sum: i32 = 0
+    for point in points:
+        print(point)
+        x_sum += point[0]
+        y_sum += point[1]
+
+    print(x_sum, y_sum)
+    assert x_sum == 1001
+    assert y_sum == 500
+
+main0()

integration_tests/loop_07.py

@@ -1,5 +1,5 @@
 from numpy import array
-from lpython import i32, i64, f64, lpython, TypeVar
+from lpython import i32, i64, f64, lpython, TypeVar, Const
 
 n = TypeVar("n")
 
@@ -17,6 +17,10 @@ def multiply_02(n: i32, x: i64[:], y: i64[:]) -> i64[n]:
         z[i] = x[i] * y[i]
     return z
 
+@lpython
+def const_arg_sum(x: Const[i32]) -> i32:
+    return 10 + x
+
 
 def test_01():
     size = 5
@@ -30,5 +34,6 @@ def test_01():
     z = multiply_02(size, x, y)
     for i in range(size):
         assert z[i] == x[i] * y[i]
+    assert const_arg_sum(size) == size + 10
 
 test_01()

integration_tests/lpython_decorator_02.py

@@ -0,0 +1,21 @@
+import lpython_emulation_01_mod
+import lpython
+from lpython import ccall, i64
+from types import FunctionType
+lpython.CTypes.emulations = {k: v for k, v in \
+        lpython_emulation_01_mod.__dict__.items() \
+        if isinstance(v, FunctionType)}
+
+@ccall
+def f1(a: i64) -> i64:
+    pass
+
+@ccall
+def f2(a: i64):
+    pass
+
+def main():
+    assert f1(2) == 3
+    f2(4)
+
+main()

integration_tests/lpython_emulation_01.py

@@ -0,0 +1,7 @@
+from lpython import i64
+
+def f1(a: i64) -> i64:
+    return a + 1
+
+def f2(a: i64):
+    assert a == 4

integration_tests/lpython_emulation_01_mod.py

@@ -0,0 +1,18 @@
+from lpython import i32, f64
+
+def test_list_concat():
+    t1: list[i32]
+    t1 = [2] + [3]
+    print(t1)
+    assert len(t1) == 2
+    assert t1[0] == 2
+    assert t1[1] == 3
+
+    t2: list[f64]
+    t2 = [3.14, -4.5] + [1.233, -0.012, 5555.50]
+    print(t2)
+    assert len(t2) == 5
+    assert abs(t2[0] - 3.14) <= 1e-5
+    assert abs(t2[-1] - 5555.50) <= 1e-5
+
+test_list_concat()

integration_tests/structs_35.py

@@ -0,0 +1,14 @@
+from lpython import i32
+
+def main0():
+    a: list[i32] = [3, 4, 5]
+    i: i32
+    for i in range(10):
+        a.append(1)
+        a.pop()
+
+    print(a)
+    assert a[-1] == 5
+    assert len(a) == 3
+
+main0()

integration_tests/test_list_concat.py

@@ -28,10 +28,14 @@ def test_list_repeat():
         l_str_3 = l_str_1 * i
         assert l_str_3 == l_str_2
         l_str_2 += l_str_1
-    
+
     for i in range(5):
         assert l_int_1 * i + l_int_1 * (i + 1) == l_int_1 * (2 * i + 1)
         assert l_tuple_1 * i + l_tuple_1 * (i + 1) == l_tuple_1 * (2 * i + 1)
         assert l_str_1 * i + l_str_1 * (i + 1) == l_str_1 * (2 * i + 1)
 
-test_list_repeat()
+    print(l_int_1)
+    print(l_tuple_1)
+    print(l_tuple_1)
+
+test_list_repeat()