repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update nu geen output in prj file
[cc1516.git]
/
src
/
parse.icl
diff --git
a/src/parse.icl
b/src/parse.icl
index
fc6e740
..
349c0e1
100644
(file)
--- a/
src/parse.icl
+++ b/
src/parse.icl
@@
-150,8
+150,7
@@
parseVarDef = liftM2 VarDef
(parseIdent >>= \i.if (i == "snd") (pure FieldSnd) empty))))
parseOp1 :: Parser Token Op1
(parseIdent >>= \i.if (i == "snd") (pure FieldSnd) empty))))
parseOp1 :: Parser Token Op1
-parseOp1 = trans1 DashToken UnMinus <|>
- trans1 ExclamationToken UnNegation
+parseOp1 = trans1 DashToken UnMinus <|> trans1 ExclamationToken UnNegation
parseBBraces :: (Parser Token a) -> Parser Token a
parseBBraces p = satTok BraceOpenToken *> p <* satTok BraceCloseToken
parseBBraces :: (Parser Token a) -> Parser Token a
parseBBraces p = satTok BraceOpenToken *> p <* satTok BraceCloseToken
@@
-168,7
+167,7
@@
parseTuple p = satTok BraceOpenToken *>
<* satTok BraceCloseToken
trans2 :: TokenValue (TokenValue -> a) -> Parser Token a
<* satTok BraceCloseToken
trans2 :: TokenValue (TokenValue -> a) -> Parser Token a
-trans2 t f =
satTok t >>= \(_, r).pure (f r)
+trans2 t f =
liftM (f o snd) $ satTok t
trans1 :: TokenValue a -> Parser Token a
trans1 t r = trans2 t $ const r
trans1 :: TokenValue a -> Parser Token a
trans1 t r = trans2 t $ const r