Allow to toInt() to parse a string including "__" (apple#578)

Fix the issue where String#toInt() cannot parse a Int string including sequence of "_" like "1_2__3___".
luuvish · Jul 15, 2024 · b5e011d · b5e011d
1 parent cdf548c
commit b5e011d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/pkl-core/src/main/java/org/pkl/core/stdlib/base/StringNodes.java b/pkl-core/src/main/java/org/pkl/core/stdlib/base/StringNodes.java
@@ -768,7 +768,7 @@ public abstract static class toInt extends ExternalMethod0Node {
     @Specialization
     protected long eval(String self) {
       try {
-        return Long.parseLong(self);
+        return Long.parseLong(self.replaceAll("_", ""));
       } catch (NumberFormatException e) {
         throw exceptionBuilder()
             .evalError("cannotParseStringAs", "Int")
@@ -783,7 +783,7 @@ public abstract static class toIntOrNull extends ExternalMethod0Node {
     @Specialization
     protected Object eval(String self) {
       try {
-        return Long.parseLong(self);
+        return Long.parseLong(self.replaceAll("_", ""));
       } catch (NumberFormatException e) {
         return VmNull.withoutDefault();
       }

diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/api/string.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/api/string.pkl
@@ -225,6 +225,8 @@ examples {
   ["toInt()"] {
     "123".toInt()
     "-123".toInt()
+    "1_2__3___".toInt()
+    "-1_2__3___".toInt()
     "0".toInt()
     "-0".toInt()
     module.catch(() -> "1.2".toInt())
@@ -236,6 +238,8 @@ examples {
   ["toIntOrNull()"] {
     "123".toIntOrNull()
     "-123".toIntOrNull()
+    "1_2__3___".toInt()
+    "-1_2__3___".toInt()
     "0".toIntOrNull()
     "-0".toIntOrNull()
     "1.2".toIntOrNull()
@@ -445,7 +449,7 @@ examples {
     "".sha256
     quickBrownFox.sha256
   }
-  
+
   ["sha256Int"] {
     "".sha256Int
     quickBrownFox.sha256Int
@@ -460,7 +464,7 @@ examples {
     "".base64
     quickBrownFox.base64
   }
-  
+
   ["base64Decoded"] {
     module.catch(() -> "~~~".base64Decoded)
   }

diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/api/string.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/api/string.pcf
@@ -181,6 +181,8 @@ examples {
     List(97, 98, 99, 100, 101, 102, 103)
   }
   ["toInt()"] {
+    123
+    -123
     123
     -123
     0
@@ -191,6 +193,8 @@ examples {
     "Cannot parse string as `Int`. String: \"abc\""
   }
   ["toIntOrNull()"] {
+    123
+    -123
     123
     -123
     0