Merge pull request #1871 from Smit-create/i-1869

Overload missing functions with unsigned int

Author: certik

integration_tests/expr_05.py

@@ -1,4 +1,4 @@
-from lpython import i32, i64, f64
+from lpython import i32, i64, f64, u16
 
 def test_multiply(a: i32, b: i32) -> i32:
     return a*b
@@ -78,5 +78,12 @@ def main0():
     assert abs((11.0%-3.0) - (-1.0)) < eps
     assert abs((-11.0%3.0) - (1.0)) < eps
 
+    # Test issue 1869 and 1870
+    a1: u16 = u16(10)
+    b1: u16 = u16(3)
+    c1: u16 = a1 % b1
+    assert c1 == u16(1)
+    c1 = a1 // b1
+    assert c1 == u16(3)
 
 main0()

src/libasr/codegen/asr_to_c_cpp.h

@@ -1491,6 +1491,12 @@ R"(#include <stdio.h>
                 last_expr_precedence = 2;
                 break;
             }
+            case (ASR::cast_kindType::UnsignedIntegerToInteger) : {
+                int dest_kind = ASRUtils::extract_kind_from_ttype_t(x.m_type);
+                src = "(int" + std::to_string(dest_kind * 8) + "_t)(" + src + ")";
+                last_expr_precedence = 2;
+                break;
+            }
             case (ASR::cast_kindType::ComplexToComplex) : {
                 break;
             }

src/runtime/lpython_builtin.py

@@ -1,4 +1,5 @@
-from lpython import i8, i16, i32, i64, f32, f64, c32, c64, overload
+from lpython import (i8, i16, i32, i64, f32, f64, c32, c64, overload, u8,
+                     u16, u32, u64)
 #from sys import exit
 
 #: abs() as a generic procedure.
@@ -485,6 +486,10 @@ def _lpython_floordiv(a: i8, b: i8) -> i8:
         return result
     return result - i8(1)
 
+@overload
+def _lpython_floordiv(a: u8, b: u8) -> u8:
+    return u8(_lpython_floordiv(i8(a), i8(b)))
+
 @overload
 def _lpython_floordiv(a: i16, b: i16) -> i16:
     r: f64 # f32 rounds things up and gives incorrect results
@@ -495,6 +500,10 @@ def _lpython_floordiv(a: i16, b: i16) -> i16:
         return result
     return result - i16(1)
 
+@overload
+def _lpython_floordiv(a: u16, b: u16) -> u16:
+    return u16(_lpython_floordiv(i16(a), i16(b)))
+
 @overload
 def _lpython_floordiv(a: i32, b: i32) -> i32:
     r: f64 # f32 rounds things up and gives incorrect results
@@ -505,6 +514,10 @@ def _lpython_floordiv(a: i32, b: i32) -> i32:
         return result
     return result - 1
 
+@overload
+def _lpython_floordiv(a: u32, b: u32) -> u32:
+    return u32(_lpython_floordiv(i32(a), i32(b)))
+
 @overload
 def _lpython_floordiv(a: i64, b: i64) -> i64:
     r: f64
@@ -515,6 +528,10 @@ def _lpython_floordiv(a: i64, b: i64) -> i64:
         return result
     return result - i64(1)
 
+@overload
+def _lpython_floordiv(a: u64, b: u64) -> u64:
+    return u64(_lpython_floordiv(i64(a), i64(b)))
+
 @overload
 def _lpython_floordiv(a: bool, b: bool) -> bool:
     if b == False:
@@ -534,10 +551,26 @@ def _mod(a: i16, b: i16) -> i16:
 def _mod(a: i32, b: i32) -> i32:
     return a - _lpython_floordiv(a, b)*b
 
+@overload
+def _mod(a: u8, b: u8) -> u8:
+    return a - _lpython_floordiv(a, b)*b
+
+@overload
+def _mod(a: u16, b: u16) -> u16:
+    return a - _lpython_floordiv(a, b)*b
+
+@overload
+def _mod(a: u32, b: u32) -> u32:
+    return a - _lpython_floordiv(a, b)*b
+
 @overload
 def _mod(a: f32, b: f32) -> f32:
     return a - _lpython_floordiv(a, b)*b
 
+@overload
+def _mod(a: u64, b: u64) -> u64:
+    return a - _lpython_floordiv(a, b)*b
+
 @overload
 def _mod(a: i64, b: i64) -> i64:
     return a - _lpython_floordiv(a, b)*b

tests/reference/asr-array_01_decl-39cf894.json

@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-array_01_decl-39cf894.stdout",
-    "stdout_hash": "705bcf3f7012f932ba8d5f5566cb9c14cbbb8675c3b710dcee4e769b",
+    "stdout_hash": "64bfda5839dc16bcecfe6c4e8bd1dc9348c6b28045aab06efc317f82",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0