git.iko.soy/elk
on master help sign in
cosmetic: switch from <|> to choice [...]
e212b97Evan Czaplicki
src/Parse/Expression.hs+4−4
compare with master
unifiedsplit
@@ -79,13 +79,13 @@ negative =
79
79
80listTerm :: IParser Source.Expr'
80listTerm :: IParser Source.Expr'
81listTerm =
81listTerm =
82− shader' <|> braces (E.ExplicitList <$> commaSep expr)
82+ choice
83− where
84− shader' =
85− do pos <- getPosition
83+ [ do pos <- getPosition
86 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
84 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
87 (rawSrc, tipe) <- Help.shader
85 (rawSrc, tipe) <- Help.shader
88 return $ E.GLShader uid (filter (/='\r') rawSrc) tipe
86 return $ E.GLShader uid (filter (/='\r') rawSrc) tipe
87+ , braces (E.ExplicitList <$> commaSep expr)
88+ ]
89
89
90
90
91parensTerm :: IParser Source.Expr
91parensTerm :: IParser Source.Expr