on master help sign in
Update canonicalization for dissolution of AST.Literal
64038dcEvan Czaplicki
src/Canonicalize/Expression.hs+13−4
@@ -47,8 +47,17 @@ canonicalize :: Env.Env -> Valid.Expr -> Result FreeLocals Can.Expr
47canonicalize env (A.A region expression) =
47canonicalize env (A.A region expression) =
48 A.A region <$>
48 A.A region <$>
49 case expression of
49 case expression of
50− Valid.Literal lit ->
50+ Valid.Str string ->
51− Result.ok (Can.Literal lit)
51+ Result.ok (Can.Str string)
52+
53+ Valid.Chr char ->
54+ Result.ok (Can.Chr char)
55+
56+ Valid.Int int ->
57+ Result.ok (Can.Int int)
58+
59+ Valid.Float float ->
60+ Result.ok (Can.Float float)
52
61
53 Valid.Var maybePrefix name ->
62 Valid.Var maybePrefix name ->
54 Env.findVar region env maybePrefix name
63 Env.findVar region env maybePrefix name
@@ -118,8 +127,8 @@ canonicalize env (A.A region expression) =
118 <*> canonicalize env b
127 <*> canonicalize env b
119 <*> canonicalizeTupleExtras region env cs
128 <*> canonicalizeTupleExtras region env cs
120
129
121− Valid.GLShader uid src tipe ->
130+ Valid.Shader uid src tipe ->
122− Result.ok (Can.GLShader uid src tipe)
131+ Result.ok (Can.Shader uid src tipe)
123
132
124
133
125
134