bug fixed and unicode characters can be written in char and string li…

…terals. (#106)

compiler/src/CodeGen.hs

@@ -8,12 +8,14 @@ import           Symbol
 import           Typing                     (ClassEnv (..), super)
 
 import           Control.Monad.State.Strict
+import           Data.Char
 import           Data.List                  (find, intercalate, nub)
 import           Data.List.Split            (splitOn)
 import qualified Data.Map.Strict            as Map
 import           Data.Maybe                 (fromJust, fromMaybe)
 import           Debug.Trace
 import           System.IO
+import           Text.Printf
 
 emitPreamble :: Handle -> IO ()
 emitPreamble h =
@@ -439,8 +441,11 @@ genAtomExpr (AtomExpr (VarAtom (CompositDict d ds))) = do
 
 genAtomExpr (AtomExpr (LitAtom (LitStr s))) = do
   n <- nexti
-  appendCode $ "Expr t" ++ show n ++ " = RTLib.fromJString(" ++ show s ++ ");"
+  appendCode $ "Expr t" ++ show n ++ " = RTLib.fromJString(" ++ myshow s ++ ");"
   return n
+    where myshow s = "\"" ++ concatMap esc s ++ "\""
+          esc c | isPrint c = [c]
+                | otherwise = "\\" ++ printf "%03o" (fromEnum c)
 
 genAtomExpr (AtomExpr (LitAtom (LitChar c))) = do
   n <- nexti

compiler/src/Lexer.x

@@ -71,17 +71,17 @@ haskell :-
 <0> \"                          { act_open_string }
 <string> \"                     { act_close_string }
 <string> $graphic # [\" \\]     { act_string }
-<string> [\xa1 - 0x10ffff]      { act_string }
 <string> " "                    { act_string }
 <string> "\\&"                  { skip }
 <string> @escape                { act_esc_string }
 <string> \\ $whitechar+ \\      { skip }
+<string> [^\']                  { act_string }
 
 -- char
 <0> \' $graphic # [\' \\] \'    { act_char }
-<0> \' [\xa1 - 0x10ffff] \'     { act_char }
 <0> \' " " \'                   { act_char }
 <0> \' @escape \'               { act_esc_char }
+<0> \' [^\'] \'                 { act_char }
 
 -- special symbols
 <0> "("                         { act_token1 TOParen }

compiler/test/expected/sample315.txt

@@ -0,0 +1 @@
+αβγδεζηθικλμνξοπρςστ

compiler/test/expected/sample316.txt

@@ -0,0 +1 @@
+Γειά σου Κόσμε