builtin: fix hex formating

corona10 · corona10 · commit a10b42d3ece4 · 2019-07-29T01:31:37.000+09:00
diff --git a/builtin/builtin.go b/builtin/builtin.go
@@ -7,6 +7,7 @@ package builtin
 
 import (
 	"bytes"
+	"fmt"
 	"strconv"
 	"unicode"
 	"unicode/utf8"
@@ -333,9 +334,12 @@ func builtin_ascii(self, o py.Object) (py.Object, error){
 	for _, c := range repr{
 		if c <= unicode.MaxASCII{
 			sb.WriteRune(c)
-		} else{
+		} else if c < 0x10000{
 			s := "\\u" + strconv.FormatInt(int64(c), 16)
 			sb.WriteString(s)
+		} else{
+			s := fmt.Sprintf("\\U%08x", c)
+			sb.WriteString(s)
 		}
 	}
 
diff --git a/builtin/tests/builtin.py b/builtin/tests/builtin.py
@@ -30,6 +30,9 @@ def __repr__(self):
 assert ascii('\t\r\n') == "'\\t\\r\\n'"
 assert ascii("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F") == "'\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'"
 assert ascii(B()) == 'repr method'
+assert ascii(chr(0x100)) == "'\\u100'"
+assert ascii(chr(0x1001)) == "'\\u1001'"
+assert ascii(chr(0x10001)) == "'\\U00010001'"
 
 doc="chr"
 assert chr(65) == "A"

-Original file line number
+Diff line change
 assertascii('\t\r\n') =="'\\t\\r\\n'"
 assertascii("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F") =="'\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'"
 assertascii(B()) =='repr method'
 +assertascii(chr(0x100)) =="'\\u100'"
 +assertascii(chr(0x1001)) =="'\\u1001'"
 +assertascii(chr(0x10001)) =="'\\U00010001'"
 doc="chr"
 assertchr(65) =="A"