Resolves #898 - Fix supplementary characters

This was an issue in `codec-jvm` - it was not handling supplementary characters in Modified UTF-8 properly. It has been fixed and a new test has been added.
typelead · Dec 12, 2018 · 14f1286 · 14f1286
1 parent 3edc93d
commit 14f1286
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/codec-jvm b/codec-jvm
diff --git a/tests/suite/basic/compile/Unicode.hs b/tests/suite/basic/compile/Unicode.hs
diff --git a/tests/suite/basic/run/UnicodeTest.hs → tests/suite/basic/run/Unicode.hs b/tests/suite/basic/run/UnicodeTest.hs → tests/suite/basic/run/Unicode.hs
@@ -1,7 +1,18 @@
 import GHC.Unicode
 import Data.Ix ( index )
 
+main :: IO ()
 main = do
+  putStrLn "\xFFFF"
+  putStrLn "\x10000"
+  putStrLn "\x1F600"
+  putStrLn "\x10FFFF"
+  putStrLn "7"
+  putStrLn "S"
+  putStrLn "△"
+  putStrLn "☃"
+  putStrLn "¥"
+  putStrLn "n̂"
   print $ UppercaseLetter == UppercaseLetter
   print $ UppercaseLetter == LowercaseLetter
   print $ NonSpacingMark <= MathSymbol

diff --git a/tests/suite/basic/run/UnicodeTest.stdout → tests/suite/basic/run/Unicode.stdout b/tests/suite/basic/run/UnicodeTest.stdout → tests/suite/basic/run/Unicode.stdout
@@ -1,3 +1,13 @@
+
+𐀀
+😀
+􏿿
+7
+S
+△
+☃
+¥
+n̂
 True
 False
 True

diff --git a/tests/suite/similar-names/fail/simfail01.stderr b/tests/suite/similar-names/fail/simfail01.stderr
@@ -1,5 +1,5 @@
 
-tests/suite/similar-names/fail/sim01.hs:4:1: error:
+tests/suite/similar-names/fail/simfail01.hs:4:1: error:
     Multiple declarations with names differing only in case.
-    Declared at: tests/suite/similar-names/fail/sim01.hs:1:24
-                 tests/suite/similar-names/fail/sim01.hs:4:1
+    Declared at: tests/suite/similar-names/fail/simfail01.hs:1:24
+                 tests/suite/similar-names/fail/simfail01.hs:4:1
diff --git a/tests/suite/similar-names/fail/simfail02.stderr b/tests/suite/similar-names/fail/simfail02.stderr
@@ -1,5 +1,5 @@
 
-tests/suite/similar-names/fail/sim02.hs:7:11: error:
+tests/suite/similar-names/fail/simfail02.hs:7:11: error:
     Multiple declarations with names differing only in case.
-    Declared at: tests/suite/similar-names/fail/sim02.hs:5:23
-                 tests/suite/similar-names/fail/sim02.hs:7:11
+    Declared at: tests/suite/similar-names/fail/simfail02.hs:5:23
+                 tests/suite/similar-names/fail/simfail02.hs:7:11