Merge pull request #2203 from Shaikh-Ubaid/char_changes_from_lfortran

Support different integers in chr()

Author: certik

integration_tests/CMakeLists.txt

@@ -445,6 +445,7 @@ RUN(NAME expr_17             LABELS cpython llvm c)
 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_01u            LABELS cpython llvm c NOFAST)
 RUN(NAME expr_02u            LABELS cpython llvm c NOFAST)

integration_tests/expr_21.py

@@ -0,0 +1,21 @@
+from lpython import i8, i16, i32, i64
+
+def main0():
+    x: i8
+    y: i16
+    z: i32
+    w: i64
+
+    x = i8(97)
+    y = i16(47)
+    z = 56
+    w = i64(67)
+
+    print(chr(x), chr(y), chr(z), chr(w))
+
+    assert chr(x) == 'a'
+    assert chr(y) == '/'
+    assert chr(z) == '8'
+    assert chr(w) == 'C'
+
+main0()

src/libasr/runtime/lfortran_intrinsics.c

@@ -1340,7 +1340,8 @@ LFORTRAN_API int _lfortran_str_ord_c(char* s)
 LFORTRAN_API char* _lfortran_str_chr(int val)
 {
     char* dest_char = (char*)malloc(2);
-    dest_char[0] = val;
+    uint8_t extended_ascii = (uint8_t)val;
+    dest_char[0] = extended_ascii;
     dest_char[1] = '\0';
     return dest_char;
 }

src/lpython/semantics/python_intrinsic_eval.h

@@ -448,15 +448,20 @@ struct IntrinsicNodeHandler {
         if (ASRUtils::is_integer(*type)) {
             if (ASRUtils::expr_value(arg) != nullptr) {
                 int64_t c = ASR::down_cast<ASR::IntegerConstant_t>(arg)->m_n;
-                if (! (c >= 0 && c <= 127) ) {
-                    throw SemanticError("The argument 'x' in chr(x) must be in the range 0 <= x <= 127.", loc);
+                c = (uint8_t) c;
+                if (! (c >= 0 && c <= 255) ) {
+                    throw SemanticError("The argument 'x' in chr(x) must be in the range 0 <= x <= 255.", loc);
                 }
-                char cc = c;
                 std::string svalue;
-                svalue += cc;
+                svalue += char(c);
                 value = ASR::down_cast<ASR::expr_t>(
                     ASR::make_StringConstant_t(al, loc, s2c(al, svalue), str_type));
             }
+            int kind = ASRUtils::extract_kind_from_ttype_t(type);
+            if (kind != 4) {
+                ASR::ttype_t* dest_type = ASRUtils::TYPE(ASR::make_Integer_t(al,loc, 4));
+                arg = ASRUtils::EXPR(ASR::make_Cast_t(al, loc, arg, ASR::cast_kindType::IntegerToInteger, dest_type, nullptr));
+            }
             return ASR::make_StringChr_t(al, loc, arg, str_type, value);
         } else {
             throw SemanticError("'" + ASRUtils::type_to_str_python(type) + "' object cannot be interpreted as an integer",