[GR-24112] Ord build in function doesn't work with multi byte character.

PullRequest: graalpython/1121

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_builtin.py

@@ -50,3 +50,16 @@ def test_getitem_typeerror(self):
     def test_ascii(self):
         self.assertEqual(ascii(1), "1")
         self.assertEqual(ascii("錦蛇 \t \0 a \x03"), "'\\u9326\\u86c7 \\t \\x00 a \\x03'")
+
+    def test_chr(self):
+        self.assertEqual(chr(32), ' ')
+        self.assertEqual(chr(97), 'a')
+        self.assertEqual(chr(0xfff), '\u0fff')
+        self.assertEqual(chr(0xf0000), '\U000f0000')
+        
+    def test_ord(self):
+        self.assertEqual(ord(' '), 32)
+        self.assertEqual(ord('a'), 97)
+        self.assertEqual(ord('\u0fff'), 0xfff)
+        self.assertEqual(ord('\U000f0000'), 0xf0000)
+        

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

@@ -425,7 +425,7 @@ public abstract static class ChrNode extends PythonBuiltinNode {
         @Specialization
         public String charFromInt(int arg) {
             if (arg >= 0 && arg <= 1114111) {
-                return Character.toString((char) arg);
+                return new String(Character.toChars(arg));
             } else {
                 throw raise(ValueError, ErrorMessages.ARG_NOT_IN_RANGE, "chr()", "0x110000");
             }
@@ -1508,16 +1508,24 @@ protected static NextNode create() {
     public abstract static class OrdNode extends PythonBuiltinNode {
 
         @Specialization
+        @TruffleBoundary
         public int ord(String chr) {
-            if (chr.length() != 1) {
+            if (chr.codePointCount(0, chr.length()) != 1) {
                 throw raise(TypeError, ErrorMessages.EXPECTED_CHARACTER_BUT_STRING_FOUND, "ord()", chr.length());
             }
-            return chr.charAt(0);
+            return chr.codePointAt(0);
         }
 
         @Specialization
-        public int ord(PString chr) {
-            return ord(chr.getValue());
+        public int ord(PString pchr,
+                        @Cached CastToJavaStringNode castToJavaStringNode) {
+            String chr;
+            try {
+                chr = castToJavaStringNode.execute(pchr);
+            } catch (CannotCastException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
+            return ord(chr);
         }
 
         @Specialization