Implement unicodedata.digit and unicodedata.decimal

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicodedata.txt

@@ -3,9 +3,9 @@ test.test_unicodedata.NormalizationTest.test_edge_cases @ darwin-arm64,darwin-x8
 test.test_unicodedata.NormalizationTest.test_normalization @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_unicodedata.UnicodeFunctionsTest.test_category @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_unicodedata.UnicodeFunctionsTest.test_combining @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_unicodedata.UnicodeFunctionsTest.test_decimal @ darwin-x86_64
+test.test_unicodedata.UnicodeFunctionsTest.test_decimal @ darwin-x86_64,linux-x86_64
 test.test_unicodedata.UnicodeFunctionsTest.test_decomposition @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_unicodedata.UnicodeFunctionsTest.test_digit @ darwin-x86_64
+test.test_unicodedata.UnicodeFunctionsTest.test_digit @ darwin-x86_64,linux-x86_64
 test.test_unicodedata.UnicodeFunctionsTest.test_east_asian_width @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_unicodedata.UnicodeFunctionsTest.test_east_asian_width_9_0_changes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_unicodedata.UnicodeFunctionsTest.test_east_asian_width_unassigned @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/UnicodeDataModuleBuiltins.java

@@ -442,4 +442,61 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return UnicodeDataModuleBuiltinsClinicProviders.EastAsianWidthNodeClinicProviderGen.INSTANCE;
         }
     }
+
+    @Builtin(name = "digit", minNumOfPositionalArgs = 1, parameterNames = {"chr", "default"})
+    @ArgumentClinic(name = "chr", conversion = ArgumentClinic.ClinicConversion.CodePoint)
+    @GenerateNodeFactory
+    abstract static class DigitNode extends PythonBinaryClinicBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        static Object digit(int codepoint, Object def,
+                        @Bind Node inliningTarget) {
+            int numericProperty = UCharacter.getIntPropertyValue(codepoint, UProperty.NUMERIC_TYPE);
+            if (numericProperty != 0 && (numericProperty & (UCharacter.NumericType.DIGIT | UCharacter.NumericType.DECIMAL)) != 0) {
+                int value = UCharacter.getNumericValue(codepoint);
+                if (value >= 0) {
+                    return value;
+                }
+            }
+            if (def != PNone.NO_VALUE) {
+                return def;
+            } else {
+                throw PRaiseNode.raiseStatic(inliningTarget, ValueError, ErrorMessages.NOT_A_DIGIT);
+            }
+        }
+
+        @Override
+        protected ArgumentClinicProvider getArgumentClinic() {
+            return UnicodeDataModuleBuiltinsClinicProviders.DigitNodeClinicProviderGen.INSTANCE;
+        }
+    }
+
+    @Builtin(name = "decimal", minNumOfPositionalArgs = 1, parameterNames = {"chr", "default"})
+    @ArgumentClinic(name = "chr", conversion = ArgumentClinic.ClinicConversion.CodePoint)
+    @GenerateNodeFactory
+    abstract static class DecimalNode extends PythonBinaryClinicBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        static Object decimal(int codepoint, Object def,
+                        @Bind Node inliningTarget) {
+            int numericProperty = UCharacter.getIntPropertyValue(codepoint, UProperty.NUMERIC_TYPE);
+            if (numericProperty != 0 && (numericProperty & UCharacter.NumericType.DECIMAL) != 0) {
+                int value = UCharacter.getNumericValue(codepoint);
+                if (value >= 0) {
+                    return value;
+                }
+            }
+            if (def != PNone.NO_VALUE) {
+                return def;
+            } else {
+                throw PRaiseNode.raiseStatic(inliningTarget, ValueError, ErrorMessages.NOT_A_DECIMAL);
+            }
+        }
+
+        @Override
+        protected ArgumentClinicProvider getArgumentClinic() {
+            return UnicodeDataModuleBuiltinsClinicProviders.DecimalNodeClinicProviderGen.INSTANCE;
+        }
+    }
+
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -1624,4 +1624,6 @@ public abstract class ErrorMessages {
     public static final TruffleString TYPE_EXC_TB_OF_THROW_IS_DEPRECATED = tsLiteral("the (type, exc, tb) signature of throw() is deprecated, use the single-arg signature instead.");
     public static final TruffleString PRECISION_TOO_LARGE = tsLiteral("precision too large");
     public static final TruffleString DIM_MEMORY_HAS_NO_LENGTH = tsLiteral("0-dim memory has no length");
+    public static final TruffleString NOT_A_DIGIT = tsLiteral("not a digit");
+    public static final TruffleString NOT_A_DECIMAL = tsLiteral("not a decimal");
 }