85b2e31 · elk · git.iko.soy

git.iko.soy/elk

Remove AST.Literal stuff from validation phase

commit85b2e31e4d576345a3938c0f041539841726a486 authorEvan Czaplicki <evancz@users.noreply.github.com> dateWed 8 Nov 2017, 17:29 (9 years ago) parenta4e2560

1 file changed+13−4

compare with master

unifiedsplit

src/Validate.hs+13−4

src/Validate.hs+13−4

@@ -189,8 +189,17 @@ expression (A.A region sourceExpression) =

189189 <$> expression expr

190190 <*> traverse (traverse expression) branches

191191

192− Src.Literal lit ->

193− pure (Valid.Literal lit)

192+ Src.Str str ->

193+ pure (Valid.Str str)

194+

195+ Src.Chr chr ->

196+ pure (Valid.Chr chr)

197+

198+ Src.Int int ->

199+ pure (Valid.Int int)

200+

201+ Src.Float float ->

202+ pure (Valid.Float float)

194203

195204 Src.List exprs ->

196205 Valid.List <$> traverse expression exprs

@@ -233,8 +242,8 @@ expression (A.A region sourceExpression) =

233242 <$> definitions defs

234243 <*> expression body

235244

236− Src.GLShader uid src gltipe ->

237− pure (Valid.GLShader uid src gltipe)

245+ Src.Shader uid src gltipe ->

246+ pure (Valid.Shader uid src gltipe)

238247

239248

240249both :: (Src.Expr, Src.Expr) -> Result w (Valid.Expr, Valid.Expr)