Resolved merge conflict (2nd time)

integration_tests/CMakeLists.txt

@@ -118,7 +118,7 @@ macro(RUN)
 
             add_test(${name} python ${CMAKE_CURRENT_SOURCE_DIR}/${name}.py)
             set_tests_properties(${name} PROPERTIES
-                ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/ltypes:${CMAKE_SOURCE_DIR}/..;LPYTHON_PY_MOD_NAME=${PY_MOD};LPYTHON_PY_MOD_PATH=${CMAKE_CURRENT_BINARY_DIR}")
+                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 (RUN_LABELS)
                 set_tests_properties(${name} PROPERTIES LABELS "${RUN_LABELS}")
             endif()
@@ -409,6 +409,8 @@ RUN(NAME test_str_comparison LABELS cpython llvm c)
 RUN(NAME test_bit_length     LABELS cpython llvm c)
 RUN(NAME str_to_list_cast    LABELS cpython llvm c)
 
+RUN(NAME test_package_01     LABELS cpython llvm)
+
 RUN(NAME generics_01         LABELS cpython llvm c)
 RUN(NAME generics_02         LABELS cpython llvm c)
 RUN(NAME generics_array_01   LABELS cpython llvm c)

integration_tests/array_01.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 from numpy import empty
 
 def main0():

integration_tests/array_01_decl.py

@@ -1,4 +1,4 @@
-from ltypes import i16, i32, i64, f32, f64, c32, c64
+from lpython import i16, i32, i64, f32, f64, c32, c64
 from numpy import empty, int16, int32, int64, float32, float64, complex64, complex128
 from enum import Enum
 

integration_tests/array_02.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 from numpy import empty
 
 def main0():

integration_tests/array_02_decl.py

@@ -1,4 +1,4 @@
-from ltypes import i32, i64, f32, f64, c32, c64
+from lpython import i32, i64, f32, f64, c32, c64
 from numpy import empty
 
 def accept_multidim_i32_array(xi32: i32[:, :]) -> i32:

integration_tests/array_03_decl.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, dataclass
+from lpython import i32, f64, dataclass
 from numpy import empty
 
 @dataclass

integration_tests/array_expr_01.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64
+from lpython import i32, f32, f64
 from numpy import empty, reshape, int32, float64
 
 def array_expr_01():

integration_tests/array_expr_02.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, TypeVar
+from lpython import i32, f32, TypeVar
 from numpy import empty, sqrt, float32
 
 n: i32

integration_tests/bindc_01.py

@@ -1,4 +1,4 @@
-from ltypes import c_p_pointer, CPtr, i16, Pointer, empty_c_void_p
+from lpython import c_p_pointer, CPtr, i16, Pointer, empty_c_void_p
 
 queries: CPtr = empty_c_void_p()
 x: Pointer[i16] = c_p_pointer(queries, i16)

integration_tests/bindc_02.py

@@ -1,4 +1,4 @@
-from ltypes import c_p_pointer, CPtr, pointer, i16, Pointer, empty_c_void_p
+from lpython import c_p_pointer, CPtr, pointer, i16, Pointer, empty_c_void_p
 from numpy import empty, int16
 
 queries: CPtr = empty_c_void_p()

integration_tests/bindc_03.py

@@ -1,4 +1,4 @@
-from ltypes import c_p_pointer, CPtr, pointer, i32, Pointer, ccall, p_c_pointer, dataclass
+from lpython import c_p_pointer, CPtr, pointer, i32, Pointer, ccall, p_c_pointer, dataclass
 
 @dataclass
 class ArrayWrapped:

integration_tests/bindc_04.py

@@ -1,4 +1,4 @@
-from ltypes import pointer, i16, Pointer
+from lpython import pointer, i16, Pointer
 
 # Testing Global Pointers
 x: Pointer[i16[:]]

integration_tests/bindc_05.py

@@ -1,4 +1,4 @@
-from ltypes import CPtr, empty_c_void_p, i32, f32, dataclass, Pointer, ccall, p_c_pointer, pointer
+from lpython import CPtr, empty_c_void_p, i32, f32, dataclass, Pointer, ccall, p_c_pointer, pointer
 
 @dataclass
 class Void:

integration_tests/bindc_06.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, ccall, dataclass
+from lpython import i32, f64, ccall, dataclass
 from numpy import empty, int32, float64
 
 @dataclass

integration_tests/bindc_07.py

@@ -1,4 +1,4 @@
-from ltypes import CPtr, i64, sizeof, i32, i16, i8, ccall, c_p_pointer, empty_c_void_p, Pointer, pointer
+from lpython import CPtr, i64, sizeof, i32, i16, i8, ccall, c_p_pointer, empty_c_void_p, Pointer, pointer
 from numpy import empty, int64
 
 @ccall

integration_tests/bit_operations_i32.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 
 def test_bitnot():
     x: i32 = 5

integration_tests/bit_operations_i64.py

@@ -1,4 +1,4 @@
-from ltypes import i64
+from lpython import i64
 
 def test_bitnot():
     x: i64 = i64(123)

integration_tests/comp_01.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64
+from lpython import i32, f64
 
 def compI32(x: i32, y: i32):
     print(x)

integration_tests/const_01.py

@@ -1,4 +1,4 @@
-from ltypes import Const, i32, i64, f32, f64
+from lpython import Const, i32, i64, f32, f64
 
 def test_const_variables():
     xci: Const[i32] = i32(0.0)

integration_tests/const_02.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, Const
+from lpython import i32, f64, Const
 
 def f(x: Const[i32]) -> i32:
     return x + 1

integration_tests/const_03.py

@@ -1,4 +1,4 @@
-from ltypes import i64, f64, i32, Const, ccall
+from lpython import i64, f64, i32, Const, ccall
 
 CONST_1: Const[f64] = 32.0
 CONST_2: Const[f64] = CONST_1 * 2.0

integration_tests/const_04.py

@@ -1,4 +1,4 @@
-from ltypes import i32, i16, Const
+from lpython import i32, i16, Const
 from numpy import empty, int16
 
 def sum_const_array(array: Const[i16[:]], size: i32) -> i16:

integration_tests/elemental_01.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, sin, cos, reshape
 
 def verify1d(array: f32[:], result: f32[:], size: i32):

integration_tests/elemental_02.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, tan, sin, cos, reshape
 
 def elemental_tan64():

integration_tests/elemental_03.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64
+from lpython import i32, f32, f64
 from numpy import empty, sqrt, reshape
 
 def elemental_sqrt64():

integration_tests/elemental_04.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64
+from lpython import i32, f32, f64
 from numpy import empty, log, log10, log2, reshape
 from math import exp
 

integration_tests/elemental_05.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, sinh, cosh, reshape, int32, float64, sin
 
 def verify1d(array: f32[:], result: f32[:], size: i32):

integration_tests/elemental_06.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64
+from lpython import i32, f32, f64
 from numpy import empty, arcsin, arccos, sin, cos, sqrt, arctan, tan, degrees, radians
 from math import pi
 

integration_tests/elemental_07.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, tanh, reshape, int32, float64, sin, log10
 
 def verify1d(array: f32[:], result: f32[:], size: i32):

integration_tests/elemental_08.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, reshape, int32, exp
 
 def verify1d(array: f32[:], result: f32[:], size: i32):

integration_tests/elemental_09.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, arcsinh, arccosh, reshape, float64, sinh, sqrt, sin,  cosh
 
 def verify1d_arcsinh(array: f32[:], result: f32[:], size: i32):

integration_tests/elemental_10.py

@@ -1,4 +1,4 @@
-from ltypes import i32, i64, f64
+from lpython import i32, i64, f64
 from numpy import mod, int64, empty
 
 def test_numpy_mod():

integration_tests/elemental_11.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 from numpy import empty, arctanh, reshape, float64, sinh, sqrt, sin,  cosh
 
 def verify1d_arctanh(array: f32[:], result: f32[:], size: i32):

integration_tests/elemental_12.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64
+from lpython import i32, f32, f64
 from numpy import empty, floor, ceil, sqrt, reshape
 
 def elemental_floor64():

integration_tests/enum_01.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 from enum import Enum
 
 class Color(Enum):

integration_tests/enum_02.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from ltypes import i32, f64
+from lpython import i32, f64
 
 class MolecularMass(Enum):
     water: i32 = 18

integration_tests/enum_03.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from ltypes import i32
+from lpython import i32
 
 class NegativeNumbers(Enum):
     a: i32 = -1

integration_tests/enum_04.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 from enum import Enum, auto
 
 class Color(Enum):

integration_tests/enum_05.py

@@ -1,4 +1,4 @@
-from ltypes import i32, ccall
+from lpython import i32, ccall
 from enum import Enum
 
 @ccall

integration_tests/enum_06.py

@@ -1,4 +1,4 @@
-from ltypes import i32, dataclass, f64
+from lpython import i32, dataclass, f64
 from numpy import empty
 from enum import Enum
 

integration_tests/expr_01.py

@@ -1,4 +1,4 @@
-from ltypes import inline, i32
+from lpython import inline, i32
 
 @inline
 def add(x: i32, y: i32) -> i32:

integration_tests/expr_04.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64, i64
+from lpython import i32, f32, f64, i64
 def main0():
     i: i32
     sum: i32

integration_tests/expr_05.py

@@ -1,4 +1,4 @@
-from ltypes import i32, i64
+from lpython import i32, i64
 
 def test_multiply(a: i32, b: i32) -> i32:
     return a*b

integration_tests/expr_06.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f32, f64
+from lpython import i32, f32, f64
 from numpy import empty, cos, sin
 
 def main0():

integration_tests/expr_07.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 
 def g(x: i32):
     print(x)

integration_tests/expr_08.py

@@ -1,4 +1,4 @@
-from ltypes import pointer, i16, Pointer
+from lpython import pointer, i16, Pointer
 
 # Testing Global Pointers
 x: Pointer[i16[:]]

integration_tests/expr_09.py

@@ -1,4 +1,4 @@
-from ltypes import i32, f64, f32
+from lpython import i32, f64, f32
 
 def main0():
     i1: i32 = 10

integration_tests/expr_10.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 
 def g() -> i32:
     return 5

integration_tests/expr_11.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 
 def f():
     i: i32

integration_tests/expr_12.py

@@ -1,4 +1,4 @@
-from ltypes import pointer, i16, Pointer
+from lpython import pointer, i16, Pointer
 
 def g(x: Pointer[i16[:]], y: i16[:]):
     y[0] = i16(1)

integration_tests/expr_13.py

@@ -1,4 +1,4 @@
-from ltypes import CPtr, empty_c_void_p, i32, Pointer, ccall, Const
+from lpython import CPtr, empty_c_void_p, i32, Pointer, ccall, Const
 
 @ccall
 def deref_array(x: Pointer[CPtr], idx: i32) -> CPtr:

integration_tests/expr_14.py

@@ -1,4 +1,4 @@
-from ltypes import i32, i64, f32, f64, c32, c64
+from lpython import i32, i64, f32, f64, c32, c64
 
 def test_divide():
     a1: i32; a2: i32; a3: f64;

integration_tests/expr_15.py

@@ -1,4 +1,4 @@
-from ltypes import i8, i16
+from lpython import i8, i16
 
 def test_issue_1586():
     x4: i16
@@ -13,7 +13,21 @@ def test_issue_1586():
     b4 = i8(123)
     assert b4//a4 == i8(12)
 
+def test_issue_1619():
+    a: i16
+    b: i16
+    a = i16(10)
+    b = i16(12345)
+    assert b%a == i16(5)
+
+    c: i8
+    d: i8
+    c = i8(10)
+    d = i8(123)
+    assert d%c == i8(3)
+
 def check():
     test_issue_1586()
+    test_issue_1619()
 
 check()

integration_tests/float_01.py

@@ -1,4 +1,4 @@
-from ltypes import f64
+from lpython import f64
 
 def sqr(x: f64) -> f64:
     return x * x

integration_tests/func_dep_03.py

@@ -1,4 +1,4 @@
-from ltypes import i32, i64
+from lpython import i32, i64
 
 def casti32(x: i64) -> i32:
     y: i32

integration_tests/func_dep_04.py

@@ -1,5 +1,5 @@
 from func_dep_04_module import manhattan_distance
-from ltypes import i32
+from lpython import i32
 
 def test_manhattan_distance():
     a: i32; b: i32; c: i32; d: i32;

integration_tests/func_dep_04_module.py

@@ -1,4 +1,4 @@
-from ltypes import i32
+from lpython import i32
 
 def manhattan_distance(x1: i32, y1: i32, x2: i32, y2: i32) -> i32:
     return abs(x1 - x2) + abs(y1 - y2)

integration_tests/func_inline_01.py

@@ -1,4 +1,4 @@
-from ltypes import i64
+from lpython import i64
 
 def fib(n: i64) -> i64:
     if n < i64(2):

integration_tests/func_inline_02.py

@@ -1,4 +1,4 @@
-from ltypes import i32, Const, inline
+from lpython import i32, Const, inline
 
 @inline
 def f(x: i32) -> i32:

integration_tests/func_static_01.py

@@ -1,4 +1,4 @@
-from ltypes import i64, static
+from lpython import i64, static
 
 @static
 def fib(n: i64) -> i64: