git.iko.soy/elk
on master help sign in
Switch code generation to use Data.Utf8.toBuilder
fb25870Evan Czaplicki
compiler/src/Generate/JavaScript/Expression.hs+8−7
compare with master
unifiedsplit
@@ -18,6 +18,7 @@ import Data.Map ((!))
18import qualified Data.Map as Map
18import qualified Data.Map as Map
19import qualified Data.Set as Set
19import qualified Data.Set as Set
20import qualified Data.Text.Encoding as Text
20import qualified Data.Text.Encoding as Text
21+import qualified Data.Utf8 as Utf8
21
22
22import qualified AST.Canonical as Can
23import qualified AST.Canonical as Can
23import qualified AST.Optimized as Opt
24import qualified AST.Optimized as Opt
@@ -55,13 +56,13 @@ generate mode expression =
55 JsExpr $
56 JsExpr $
56 case mode of
57 case mode of
57 Mode.Dev _ _ ->
58 Mode.Dev _ _ ->
58− JS.Call toChar [ JS.String (Text.encodeUtf8Builder char) ]
59+ JS.Call toChar [ JS.String (Utf8.toBuilder char) ]
59
60
60 Mode.Prod _ _ ->
61 Mode.Prod _ _ ->
61− JS.String (Text.encodeUtf8Builder char)
62+ JS.String (Utf8.toBuilder char)
62
63
63 Opt.Str string ->
64 Opt.Str string ->
64− JsExpr $ JS.String (Text.encodeUtf8Builder string)
65+ JsExpr $ JS.String (Utf8.toBuilder string)
65
66
66 Opt.Int int ->
67 Opt.Int int ->
67 JsExpr $ JS.Int int
68 JsExpr $ JS.Int int
@@ -898,13 +899,13 @@ generateIfTest mode root (path, test) =
898 strictEq value (JS.Int int)
899 strictEq value (JS.Int int)
899
900
900 DT.IsChr char ->
901 DT.IsChr char ->
901− strictEq (JS.String (Text.encodeUtf8Builder char)) $
902+ strictEq (JS.String (Utf8.toBuilder char)) $
902 case mode of
903 case mode of
903 Mode.Dev _ _ -> JS.Call (JS.Access value (Name.fromLocal "valueOf")) []
904 Mode.Dev _ _ -> JS.Call (JS.Access value (Name.fromLocal "valueOf")) []
904 Mode.Prod _ _ -> value
905 Mode.Prod _ _ -> value
905
906
906 DT.IsStr string ->
907 DT.IsStr string ->
907− strictEq value (JS.String (Text.encodeUtf8Builder string))
908+ strictEq value (JS.String (Utf8.toBuilder string))
908
909
909 DT.IsCons ->
910 DT.IsCons ->
910 JS.Access value (Name.fromLocal "b")
911 JS.Access value (Name.fromLocal "b")
@@ -937,10 +938,10 @@ generateCaseValue mode test =
937 JS.Int int
938 JS.Int int
938
939
939 DT.IsChr char ->
940 DT.IsChr char ->
940− JS.String (Text.encodeUtf8Builder char)
941+ JS.String (Utf8.toBuilder char)
941
942
942 DT.IsStr string ->
943 DT.IsStr string ->
943− JS.String (Text.encodeUtf8Builder string)
944+ JS.String (Utf8.toBuilder string)
944
945
945 DT.IsBool _ ->
946 DT.IsBool _ ->
946 error "COMPILER BUG - there should never be three tests on a boolean"
947 error "COMPILER BUG - there should never be three tests on a boolean"