git.iko.soy/elk
on master help sign in
Switch to Data.Utf8 for String and Char across all AST phases
commit2e2440242c3897c998b3503b06a2b83773e5783e authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 15 Nov 2018, 17:39 (8 years ago) parent32a550a
3 files changed+11−8
compare with master
unifiedsplit
compiler/src/AST/Canonical.hs+5−4 compiler/src/AST/Optimized.hs+3−2 compiler/src/AST/Valid.hs+3−2
compiler/src/AST/Canonical.hs+5−4
@@ -58,6 +58,7 @@ import qualified Data.ByteString as B
5858import qualified Data.List as List
5959import qualified Data.Map as Map
6060import Data.Text (Text)
61+import Data.Utf8 (Utf8)
6162
6263import qualified AST.Utils.Binop as Binop
6364import qualified AST.Module.Name as ModuleName
@@ -85,8 +86,8 @@ data Expr_
8586 | VarCtor CtorOpts ModuleName.Canonical N.Name Index.ZeroBased Annotation
8687 | VarDebug ModuleName.Canonical N.Name Annotation
8788 | VarOperator N.Name ModuleName.Canonical N.Name Annotation -- CACHE real name for optimization
88− | Chr Text
89− | Str Text
89+ | Chr Utf8
90+ | Str Utf8
9091 | Int Int
9192 | Float Double
9293 | List [Expr]
@@ -153,8 +154,8 @@ data Pattern_
153154 | PList [Pattern]
154155 | PCons Pattern Pattern
155156 | PBool Union Bool
156− | PChr Text
157− | PStr Text
157+ | PChr Utf8
158+ | PStr Utf8
158159 | PInt Int
159160 | PCtor
160161 { _p_home :: ModuleName.Canonical
compiler/src/AST/Optimized.hs+3−2
@@ -24,6 +24,7 @@ import qualified Data.ByteString as BS
2424import qualified Data.Map as Map
2525import qualified Data.Set as Set
2626import Data.Text (Text)
27+import Data.Utf8 (Utf8)
2728
2829import qualified AST.Canonical as Can
2930import qualified AST.Module.Name as ModuleName
@@ -40,8 +41,8 @@ import qualified Reporting.Region as R
4041
4142data Expr
4243 = Bool Bool
43− | Chr Text
44− | Str Text
44+ | Chr Utf8
45+ | Str Utf8
4546 | Int Int
4647 | Float Double
4748 | VarLocal N.Name
compiler/src/AST/Valid.hs+3−2
@@ -18,6 +18,7 @@ module AST.Valid
1818
1919import qualified Data.Map as Map
2020import Data.Text (Text)
21+import Data.Utf8 (Utf8)
2122
2223import qualified AST.Utils.Binop as Binop
2324import qualified AST.Source as Src
@@ -35,8 +36,8 @@ type Expr = A.Located Expr_
3536
3637
3738data Expr_
38− = Chr Text
39− | Str Text
39+ = Chr Utf8
40+ | Str Utf8
4041 | Int Int
4142 | Float Double
4243 | Var Src.VarType N.Name