on master help sign in
cosmetic: switch from <|> to choice [...]
commite212b9701b7d485f80f5e5d1c3e61779f360332f authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 5 Aug 2016, 19:16 (10 years ago) parenta41b661
1 file changed+4−4
src/Parse/Expression.hs+4−4
src/Parse/Expression.hs+4−4
@@ -79,13 +79,13 @@ negative =
7979
8080listTerm :: IParser Source.Expr'
8181listTerm =
82− shader' <|> braces (E.ExplicitList <$> commaSep expr)
83− where
84− shader' =
85− do pos <- getPosition
82+ choice
83+ [ do pos <- getPosition
8684 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
8785 (rawSrc, tipe) <- Help.shader
8886 return $ E.GLShader uid (filter (/='\r') rawSrc) tipe
87+ , braces (E.ExplicitList <$> commaSep expr)
88+ ]
8989
9090
9191parensTerm :: IParser Source.Expr