@@ -6,7 +6,7 @@ import Text.Parsec hiding (newline,spaces)
66import Text.Parsec.Indent
77
88import Parse.Binop
9−import Parse.Helpers
9+import Parse.Helpers as Help
1010import Parse.Literal
1111import qualified Parse.Pattern as Pattern
1212import qualified Parse.Type as Type
@@ -44,7 +44,7 @@ negative = do
4444-------- Complex Terms --------
4545
4646listTerm :: IParser ParseExpr'
47−listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> commaSep expr)
47+listTerm = markdown' <|> shader' <|> braces (try range <|> ExplicitList <$> commaSep expr)
4848 where
4949 range = do
5050 lo <- expr
@@ -54,17 +54,18 @@ listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> co
5454 markdown' = do
5555 pos <- getPosition
5656 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
57− (rawText, exprs) <- markdown (interpolation uid)
57+ (rawText, exprs) <- Help.markdown (interpolation uid)
5858 return (Markdown uid (filter (/='\r') rawText) exprs)
5959
60− glShader' = do
60+ shader' = do
6161 pos <- getPosition
6262 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
63− (rawSrc, tipe) <- glShader
63+ (rawSrc, tipe) <- Help.shader
6464 return $ GLShader uid (filter (/='\r') rawSrc) tipe
6565
6666 span uid index =
67− "<span id=\"md-" ++ uid ++ "-" ++ show index ++ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"
67+ "<span id=\"md-" ++ uid ++ "-" ++ show index ++
68+ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"
6869
6970 interpolation uid exprs = do
7071 try (string "{{")