85b2e31 · elk · git.iko.soy

on master help sign in

Remove AST.Literal stuff from validation phase

85b2e31Evan Czaplicki9 years ago

src/Validate.hs+13−4

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

189 <$> expression expr

190 <*> traverse (traverse expression) branches

191

192− Src.Literal lit ->

192+ Src.Str str ->

193+ pure (Valid.Str str)

194+

195+ Src.Chr chr ->

193− pure (Valid.Literal lit)

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)

194

203

195 Src.List exprs ->

204 Src.List exprs ->

196 Valid.List <$> traverse expression exprs

205 Valid.List <$> traverse expression exprs

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

233 <$> definitions defs

242 <$> definitions defs

234 <*> expression body

243 <*> expression body

235

244

236− Src.GLShader uid src gltipe ->

245+ Src.Shader uid src gltipe ->

237− pure (Valid.GLShader uid src gltipe)

246+ pure (Valid.Shader uid src gltipe)

238

247

239

248

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

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