@@ -32,17 +32,16 @@ import qualified Reporting.Error.Syntax as E
32shader :: A.Position -> Parser E.Expr Src.Expr
32shader :: A.Position -> Parser E.Expr Src.Expr
33shader start@(A.Position row col) =
33shader start@(A.Position row col) =
34 do block <- parseBlock
34 do block <- parseBlock
35− shdr <- parseGlsl row col block
35+ shdr <- parseGlsl row col src
36 end <- P.getPosition
36 end <- P.getPosition
37− let src = List.intercalate "\\n" (lines block)
38− return (A.at start end (Src.Shader (Utf8.fromChars src) shdr))
37+ return (A.at start end (Src.Shader (Shader.fromChars src) shdr))
45−parseBlock :: Parser E.Expr String
44+parseBlock :: Parser E.Expr P.Snippet
46parseBlock =
45parseBlock =
47 P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->
46 P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->