From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 29 Feb 2016 14:01:58 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/cc1516
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=96be5e0151b236a425025cf96e8dade73ee74fcf;hp=43d45105726b3ad3e5cc5165f8c9b066ec8d2790;p=cc1516.git

Merge branch 'master' of github.com:dopefishh/cc1516
---

diff --git a/src/main.prj b/src/main.prj
index f7fe0c7..09ebcb5 100644
--- a/src/main.prj
+++ b/src/main.prj
@@ -24,7 +24,7 @@ Global
 			Time:	True
 			Stack:	True
 		Output
-			Output:	ShowConstructors
+			Output:	NoConsole
 			Font:	Courier
 			FontSize:	9
 			WriteStdErr:	False
diff --git a/src/parse.icl b/src/parse.icl
index d64efcb..af50de6 100644
--- a/src/parse.icl
+++ b/src/parse.icl
@@ -151,8 +151,7 @@ parseVarDef = liftM2 VarDef
 		(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
@@ -169,7 +168,7 @@ parseTuple p = satTok BraceOpenToken *>
 	<* 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