Fix merge conflicts

Author: Agent-Hellboy

integration_tests/test_str_attributes.py

@@ -276,6 +276,17 @@ def is_ascii():
     s = "123 45 6"
     assert s.isascii() == True
 
+
+def isspace():
+    assert "\n".isspace() == True
+    assert "    ".isspace() == True
+    assert "\r".isspace() == True 
+
+    s:str = " "
+    assert s.isspace() == True   
+    s: str = "a"
+    assert s.isspace() == False
+
 def check():
     capitalize()
     lower()
@@ -290,5 +301,6 @@ def check():
     is_upper()
     is_decimal()
     is_ascii()
+    isspace()
 
 check()

src/lpython/semantics/python_ast_to_asr.cpp

@@ -6651,7 +6651,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
             /*
                 String Validation Methods i.e all "is" based functions are handled here
             */
-            std::vector<std::string> validation_methods{"lower", "upper", "decimal", "ascii"};  // Database of validation methods supported
+            std::vector<std::string> validation_methods{"lower", "upper", "decimal", "ascii","space"};  // Database of validation methods supported
             std::string method_name = attr_name.substr(2);
 
             if(std::find(validation_methods.begin(),validation_methods.end(), method_name) == validation_methods.end()) {
@@ -6919,7 +6919,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
                 * islower() method is limited to English Alphabets currently
                 * TODO: We can support other characters from Unicode Library
             */
-            std::vector<std::string> validation_methods{"lower", "upper", "decimal", "ascii"};  // Database of validation methods supported
+            std::vector<std::string> validation_methods{"lower", "upper", "decimal", "ascii","space"};  // Database of validation methods supported
             std::string method_name = attr_name.substr(2);
             if(std::find(validation_methods.begin(),validation_methods.end(), method_name) == validation_methods.end()) {
                 throw SemanticError("String method not implemented: " + attr_name, loc);
@@ -6999,6 +6999,22 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
                 tmp = ASR::make_LogicalConstant_t(al, loc, is_ascii,
                         ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)));
                 return;
+            } else if(attr_name == "isspace") {
+                /*
+                  * Specification:
+                  Return true if all characters in the input string are considered whitespace characters,
+                  as defined by the std::isspace function. Return false otherwise.
+                */
+                bool is_space = true;
+                    for (char i : s_var) {
+                        if (!std::isspace(static_cast<unsigned char>(i))) {
+                            is_space = false;
+                            break;
+                        }
+                    }
+                tmp = ASR::make_LogicalConstant_t(al, loc, is_space,
+                        ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)));
+                return;
             } else {
                 throw SemanticError("'str' object has no attribute '" + attr_name + "'", loc);
             }

src/lpython/semantics/python_comptime_eval.h

@@ -92,7 +92,8 @@ struct PythonIntrinsicProcedures {
             {"_lpython_str_islower", {m_builtin, &not_implemented}},
             {"_lpython_str_isupper", {m_builtin, &not_implemented}},
             {"_lpython_str_isdecimal", {m_builtin, &not_implemented}},
-            {"_lpython_str_isascii", {m_builtin, &not_implemented}}
+            {"_lpython_str_isascii", {m_builtin, &not_implemented}},
+            {"_lpython_str_isspace", {m_builtin, &not_implemented}}
         };
     }
 

src/runtime/lpython_builtin.py

@@ -858,6 +858,15 @@ def _lpython_str_isascii(s: str) -> bool:
             return False
     return True
 
+@overload
+def _lpython_str_isspace(s:str) -> bool:
+    ch:str 
+    for ch in s:
+        if ch != ' ' and ch != '\t' and ch != '\n' and ch != '\r' and ch != '\f' and ch != '\v':
+            return False
+    return True
+
+
 def list(s: str) -> list[str]:
     l: list[str] = []
     i: i32

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

@@ -5,9 +5,17 @@
     "infile_hash": "3dff59bab7475d254ce0470065c11e797e52a5b2a3d7546acc0e6705",
     "outfile": null,
     "outfile_hash": null,
+<<<<<<< HEAD
+    "stdout": null,
+    "stdout_hash": null,
+    "stderr": "asr-array_01_decl-39cf894.stderr",
+    "stderr_hash": "5155e10cd4958bdda66178e2ed1b6faed6f415ff1cf3ff78e45f9cbb",
+    "returncode": 2
+=======
     "stdout": "asr-array_01_decl-39cf894.stdout",
     "stdout_hash": "24b1d1f4774489a87a82c51c4f4a797ca363f7efdb011e42936fc6b9",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
+>>>>>>> main
 }

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

@@ -0,0 +1,17 @@
+warning: The module 'numpy' located in $DIR/src/bin/../runtime/lpython_intrinsic_numpy.py cannot be loaded
+ --> tests/../integration_tests/array_01_decl.py:2:1
+  |
+2 | from numpy import empty, int16, int32, int64, float32, float64, complex64, complex128
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ imported here
+
+warning: The module 'lpython_builtin' located in $DIR/src/bin/../runtime/lpython_builtin.py cannot be loaded
+   --> $DIR/src/bin/../runtime/lpython_intrinsic_numpy.py:364:12
+    |
+364 |     return x1 % x2
+    |            ^^^^^^^ imported here
+
+semantic error: The symbol '_lpython_floordiv' not found in the module 'lpython_builtin'
+   --> $DIR/src/bin/../runtime/lpython_builtin.py:209:15
+    |
+209 |     if (n_ - (n_ // 2)*2) == 0:
+    |               ^^^^^^^ 

tests/reference/asr-array_02_decl-e8f6874.stderr

@@ -0,0 +1,17 @@
+warning: The module 'numpy' located in $DIR/src/bin/../runtime/lpython_intrinsic_numpy.py cannot be loaded
+ --> tests/../integration_tests/array_02_decl.py:2:1
+  |
+2 | from numpy import empty, int32, int64, float32, float64, complex64, complex128
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ imported here
+
+warning: The module 'lpython_builtin' located in $DIR/src/bin/../runtime/lpython_builtin.py cannot be loaded
+   --> $DIR/src/bin/../runtime/lpython_intrinsic_numpy.py:364:12
+    |
+364 |     return x1 % x2
+    |            ^^^^^^^ imported here
+
+semantic error: The symbol '_lpython_floordiv' not found in the module 'lpython_builtin'
+   --> $DIR/src/bin/../runtime/lpython_builtin.py:209:15
+    |
+209 |     if (n_ - (n_ // 2)*2) == 0:
+    |               ^^^^^^^ 

tests/reference/asr-arrays_01-a617b64.json

@@ -8,6 +8,6 @@
     "stdout": null,
     "stdout_hash": null,
     "stderr": "asr-arrays_01-a617b64.stderr",
-    "stderr_hash": "b8317c7306f747ceefa8557c06f2a0b4a8a4bd7ae805bb494fca6ef2",
+    "stderr_hash": "ddb2640e06012a8ab9efe1bc1dbe130321fb96721ce3fd749813c988",
     "returncode": 2
 }

tests/reference/asr-arrays_01-a617b64.stderr

@@ -1,8 +1,17 @@
-semantic error: Type mismatch in procedure call; the types must be compatible
-  --> tests/errors/arrays_01.py:15:9
-   |
-15 |         [i8(214), i8(157), i8(3), i8(146)])
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch (passed argument type is list[i8] but required type is i8[4])
-   |
- 9 |     a : i8[4] = empty(4, dtype=int8)
-   |         ^^^^^ type mismatch (passed argument type is list[i8] but required type is i8[4])
+warning: The module 'numpy' located in $DIR/src/bin/../runtime/lpython_intrinsic_numpy.py cannot be loaded
+ --> tests/errors/arrays_01.py:2:1
+  |
+2 | from numpy import empty, int8
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ imported here
+
+warning: The module 'lpython_builtin' located in $DIR/src/bin/../runtime/lpython_builtin.py cannot be loaded
+   --> $DIR/src/bin/../runtime/lpython_intrinsic_numpy.py:364:12
+    |
+364 |     return x1 % x2
+    |            ^^^^^^^ imported here
+
+semantic error: The symbol '_lpython_floordiv' not found in the module 'lpython_builtin'
+   --> $DIR/src/bin/../runtime/lpython_builtin.py:209:15
+    |
+209 |     if (n_ - (n_ // 2)*2) == 0:
+    |               ^^^^^^^ 

tests/reference/asr-arrays_02-da94458.json

@@ -8,6 +8,6 @@
     "stdout": null,
     "stdout_hash": null,
     "stderr": "asr-arrays_02-da94458.stderr",
-    "stderr_hash": "dc0e5be7cd6de7395421aedf1ce11977206f3e35bb7cba271aed8992",
+    "stderr_hash": "b7b907310495016dfb487fccb13739865174dda44541ade08931bae9",
     "returncode": 2
 }