@@ -22,6 +22,7 @@ import qualified AST.PrettyPrint as P
22import qualified AST.Variable as Variable
22import qualified AST.Variable as Variable
23import Elm.Utils ((|>))
23import Elm.Utils ((|>))
25reserveds :: [String]
26reserveds :: [String]
26reserveds =
27reserveds =
27 [ "if", "then", "else"
28 [ "if", "then", "else"
@@ -83,7 +84,7 @@ rLabel = lowVar
84innerVarChar :: IParser Char
85innerVarChar :: IParser Char
85innerVarChar =
86innerVarChar =
86− alphaNum <|> char '_' <|> char '\'' <?> ""
87+ alphaNum <|> char '_' <|> char '\'' <?> ""
89makeVar :: IParser Char -> IParser String
90makeVar :: IParser Char -> IParser String
@@ -459,10 +460,10 @@ glSource src =
459 Left e -> Left e
460 Left e -> Left e
460 Right (GLS.TranslationUnit decls) ->
461 Right (GLS.TranslationUnit decls) ->
461 map extractGLinputs decls
462 map extractGLinputs decls
462− |> join
463+ |> join
463 |> foldr addGLinput emptyDecls
464 |> foldr addGLinput emptyDecls
466 emptyDecls = L.GLShaderTipe Map.empty Map.empty Map.empty
467 emptyDecls = L.GLShaderTipe Map.empty Map.empty Map.empty
468 addGLinput (qual,tipe,name) glDecls =
469 addGLinput (qual,tipe,name) glDecls =
@@ -491,11 +492,11 @@ glSource src =
491 case elem qual [GLS.Attribute, GLS.Varying, GLS.Uniform] of
492 case elem qual [GLS.Attribute, GLS.Varying, GLS.Uniform] of
492 False -> []
493 False -> []
494− case tipe of
495+ case tipe of
495 GLS.Int -> return (qual, L.Int,name)
496 GLS.Int -> return (qual, L.Int,name)
496 GLS.Float -> return (qual, L.Float,name)
497 GLS.Float -> return (qual, L.Float,name)
497 GLS.Vec2 -> return (qual, L.V2,name)
498 GLS.Vec2 -> return (qual, L.V2,name)
498− GLS.Vec3 -> return (qual, L.V3,name)
499+ GLS.Vec3 -> return (qual, L.V3,name)
499 GLS.Vec4 -> return (qual, L.V4,name)
500 GLS.Vec4 -> return (qual, L.V4,name)
500 GLS.Mat4 -> return (qual, L.M4,name)
501 GLS.Mat4 -> return (qual, L.M4,name)
501 GLS.Sampler2D -> return (qual, L.Texture,name)
502 GLS.Sampler2D -> return (qual, L.Texture,name)