merge (even although I rebased... ok)
authorsheepluva
Sat, 05 Jul 2014 22:54:58 +0200
changeset 10357 86a823dd1d23
parent 10353 25f325b48a6c (diff)
parent 10356 7d1044267b83 (current diff)
child 10358 d22515d9624d
merge (even although I rebased... ok)
--- a/tools/pas2c/PascalParser.hs	Sat Jul 05 21:22:42 2014 +0200
+++ b/tools/pas2c/PascalParser.hs	Sat Jul 05 22:54:58 2014 +0200
@@ -92,7 +92,7 @@
 
 aVarDecl :: Bool -> Parsec String u TypeVarDeclaration
 aVarDecl endsWithSemi = do
-    isVar <- liftM (== Just "var") $
+    isVar <- liftM (\i -> i == Just "var" || i == Just "out") $
         if not endsWithSemi then
             optionMaybe $ choice [
                 try $ string "var"