Merge pull request #2582 from Kishan-Ved/isalnum2

Added APIs isalnum() and isnumeric() in string object

Author: ubaidsk

integration_tests/test_str_attributes.py

@@ -366,7 +366,69 @@ def is_space():
     s = ""
     assert s.isspace() == False
 
+def is_alnum():
+    a: str = "helloworld"
+    b: str = "hj kl"
+    c: str = "a12(){}A"
+    d: str = " "
+    e: str = ""
+    f: str = "ab23"
+    g: str = "ab2%3"
+    res: bool = a.isalnum()
+    res2: bool = b.isalnum()
+    res3: bool = c.isalnum()
+    res4: bool = d.isalnum()
+    res5: bool = e.isalnum()
+    res6: bool = f.isalnum()
+    res7: bool = g.isalnum()
+
+    assert res == True
+    assert res2 == False
+    assert res3 == False
+    assert res4 == False
+    assert res5 == False
+    assert res6 == True
+    assert res7 == False
+
+    assert "helloworld".isalnum() == True
+    assert "hj kl".isalnum() == False
+    assert "a12(){}A".isalnum() == False
+    assert " ".isalnum() == False
+    assert "".isalnum() == False
+    assert "ab23".isalnum() == True
+    assert "ab2%3".isalnum() == False
+
+def is_numeric():
+    a: str = "123"
+    b: str = "12 34"
+    c: str = "-123"
+    d: str = "12.3"
+    e: str = " "
+    f: str = ""
+    g: str = "ab2%3"
+    res: bool = a.isnumeric()
+    res2: bool = b.isnumeric()
+    res3: bool = c.isnumeric()
+    res4: bool = d.isnumeric()
+    res5: bool = e.isnumeric()
+    res6: bool = f.isnumeric()
+    res7: bool = g.isnumeric()
+
+    assert res == True
+    assert res2 == False
+    assert res3 == False
+    assert res4 == False
+    assert res5 == False
+    assert res6 == False
+    assert res7 == False
 
+    assert "123".isnumeric() == True
+    assert "12 34".isnumeric() == False
+    assert "-123".isnumeric() == False
+    assert "12.3".isnumeric() == False
+    assert " ".isnumeric() == False
+    assert "".isnumeric() == False
+    assert "ab2%3".isnumeric() == False
 
 def check():
     capitalize()
@@ -386,6 +448,8 @@ def check():
     is_alpha()
     is_title()
     is_space()
+    is_alnum()
+    is_numeric()
 
 
 check()

src/lpython/semantics/python_ast_to_asr.cpp

@@ -6793,7 +6793,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", "space", "alpha", "title"};  // Database of validation methods supported
+            std::vector<std::string> validation_methods{"lower", "upper", "decimal", "ascii", "space", "alpha", "title", "alnum", "numeric"};  // 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()) {
@@ -7096,7 +7096,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", "space", "alpha", "title"};  // Database of validation methods supported
+            std::vector<std::string> validation_methods{"lower", "upper", "decimal", "ascii", "space", "alpha", "title", "alnum", "numeric"};  // 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);
@@ -7210,6 +7210,38 @@ we will have to use something else.
                 tmp = ASR::make_LogicalConstant_t(al, loc, is_alpha,
                         ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)));
                 return;
+            } else if (attr_name == "isalnum") {
+                /*
+                    * Specification -
+                    Return True if all characters in the string are alphabets or numbers, 
+                    and there is at least one character in the string.
+                */
+                bool is_alnum = (s_var.size() != 0);
+                for (auto &i : s_var) {
+                    if (!((i >= 'A' && i <= 'Z') || (i >= 'a' && i <= 'z') || (i >= '0' && i <= '9'))) {
+                        is_alnum = false;
+                        break;
+                    }
+                }
+                tmp = ASR::make_LogicalConstant_t(al, loc, is_alnum,
+                        ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)));
+                return;
+            } else if (attr_name == "isnumeric") {
+                /*
+                    * Specification -
+                    Return True if all characters in the string are numbers, 
+                    and there is at least one character in the string.
+                */
+                bool is_numeric = (s_var.size() != 0);
+                for (auto &i : s_var) {
+                    if (!(i >= '0' && i <= '9')) {
+                        is_numeric = false;
+                        break;
+                    }
+                }
+                tmp = ASR::make_LogicalConstant_t(al, loc, is_numeric,
+                        ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4)));
+                return;
             } else if (attr_name == "istitle") {
                 /*
                     * Specification -

src/lpython/semantics/python_comptime_eval.h

@@ -83,6 +83,8 @@ struct PythonIntrinsicProcedures {
             {"_lpython_str_join", {m_builtin, &not_implemented}},
             {"_lpython_str_find", {m_builtin, &not_implemented}},
             {"_lpython_str_isalpha", {m_builtin, &not_implemented}},
+            {"_lpython_str_isalnum", {m_builtin, &not_implemented}},
+            {"_lpython_str_isnumeric", {m_builtin, &not_implemented}},
             {"_lpython_str_title", {m_builtin, &not_implemented}},
             {"_lpython_str_istitle", {m_builtin, &not_implemented}},
             {"_lpython_str_rstrip", {m_builtin, &not_implemented}},

src/runtime/lpython_builtin.py

@@ -730,6 +730,30 @@ def _lpython_str_isalpha(s: str) -> bool:
         return False
     return True
 
+def _lpython_str_isalnum(s: str) -> bool:
+    ch: str
+    if len(s) == 0: return False
+    for ch in s:
+        ch_ord: i32 = ord(ch)
+        if 65 <= ch_ord and ch_ord <= 90:
+            continue
+        if 97 <= ch_ord and ch_ord <= 122:
+            continue
+        if 48 <= ch_ord and ch_ord <= 57:
+            continue
+        return False
+    return True
+
+def _lpython_str_isnumeric(s: str) -> bool:
+    ch: str
+    if len(s) == 0: return False
+    for ch in s:
+        ch_ord: i32 = ord(ch)
+        if 48 <= ch_ord and ch_ord <= 57:
+            continue
+        return False
+    return True
+
 def _lpython_str_title(s: str) -> str:
     result: str = ""
     capitalize_next: bool = True

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": "d167f932ab4a4bb559ae3b4bb3b983cd6153a105cfb6180474e64ae2",
+    "stdout_hash": "7e3c68aa6acba27674e544f894bb141357db82f8840c756af448f5bb",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0