git.iko.soy/elk
on master help sign in
rename glShader to shader
bace5d7Evan Czaplicki
compiler/Parse/Expression.hs+7−6
compare with master
unifiedsplit
@@ -6,7 +6,7 @@ import Text.Parsec hiding (newline,spaces)
6import Text.Parsec.Indent
6import Text.Parsec.Indent
7
7
8import Parse.Binop
8import Parse.Binop
9−import Parse.Helpers
9+import Parse.Helpers as Help
10import Parse.Literal
10import Parse.Literal
11import qualified Parse.Pattern as Pattern
11import qualified Parse.Pattern as Pattern
12import qualified Parse.Type as Type
12import qualified Parse.Type as Type
@@ -44,7 +44,7 @@ negative = do
44-------- Complex Terms --------
44-------- Complex Terms --------
45
45
46listTerm :: IParser ParseExpr'
46listTerm :: IParser ParseExpr'
47−listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> commaSep expr)
47+listTerm = markdown' <|> shader' <|> braces (try range <|> ExplicitList <$> commaSep expr)
48 where
48 where
49 range = do
49 range = do
50 lo <- expr
50 lo <- expr
@@ -54,17 +54,18 @@ listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> co
54 markdown' = do
54 markdown' = do
55 pos <- getPosition
55 pos <- getPosition
56 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
56 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
57− (rawText, exprs) <- markdown (interpolation uid)
57+ (rawText, exprs) <- Help.markdown (interpolation uid)
58 return (Markdown uid (filter (/='\r') rawText) exprs)
58 return (Markdown uid (filter (/='\r') rawText) exprs)
59
59
60− glShader' = do
60+ shader' = do
61 pos <- getPosition
61 pos <- getPosition
62 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
62 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
63− (rawSrc, tipe) <- glShader
63+ (rawSrc, tipe) <- Help.shader
64 return $ GLShader uid (filter (/='\r') rawSrc) tipe
64 return $ GLShader uid (filter (/='\r') rawSrc) tipe
65
65
66 span uid index =
66 span uid index =
67+ "<span id=\"md-" ++ uid ++ "-" ++ show index ++
67− "<span id=\"md-" ++ uid ++ "-" ++ show index ++ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"
68+ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"
68
69
69 interpolation uid exprs = do
70 interpolation uid exprs = do
70 try (string "{{")
71 try (string "{{")
compiler/Parse/Helpers.hs+3−3
@@ -324,9 +324,9 @@ markdown interpolation =
324 closeMarkdown (markdownBuilder . (c:)) stuff
324 closeMarkdown (markdownBuilder . (c:)) stuff
325 ]
325 ]
326
326
327−glShader :: IParser (String, Literal.GLShaderTipe)
327+shader :: IParser (String, Literal.GLShaderTipe)
328−glShader =
328+shader =
329− do try (string "[glShader|")
329+ do try (string "[shader|")
330 rawSrc <- closeShader id
330 rawSrc <- closeShader id
331 case glSource rawSrc of
331 case glSource rawSrc of
332 Left err -> parserFail . show $ err
332 Left err -> parserFail . show $ err