More work on the parser
authorunc0rr
Sun, 27 Nov 2011 19:34:08 +0300
changeset 6452 7c6f9b6672dc
parent 6450 14224c9b4594
child 6453 11c578d30bd3
More work on the parser
hedgewars/GSHandlers.inc
tools/PascalParser.hs
--- a/hedgewars/GSHandlers.inc	Sun Nov 27 14:46:57 2011 +0300
+++ b/hedgewars/GSHandlers.inc	Sun Nov 27 19:34:08 2011 +0300
@@ -4041,7 +4041,7 @@
         // won't port stuff that does not move towards the front/portal entrance
         if iscake then
         begin
-            if not ((iterator^.X - Gear^.X)*ox + (iterator^.Y - Gear^.Y)*oy).isNegative then
+            if not (((iterator^.X - Gear^.X)*ox + (iterator^.Y - Gear^.Y)*oy).isNegative) then
                 continue;
         end
         else
--- a/tools/PascalParser.hs	Sun Nov 27 14:46:57 2011 +0300
+++ b/tools/PascalParser.hs	Sun Nov 27 19:34:08 2011 +0300
@@ -434,8 +434,8 @@
         , parens pas $ expression 
         , brackets pas (commaSep pas iD) >>= return . SetExpression
         , try $ natural pas >>= \i -> notFollowedBy (char '.') >> (return . NumberLiteral . show) i
-        , try $ float pas >>= return . FloatLiteral . show
-        , try $ natural pas >>= return . NumberLiteral . show
+        , float pas >>= return . FloatLiteral . show
+        , natural pas >>= return . NumberLiteral . show
         , stringLiteral pas >>= return . StringLiteral
         , try (string "#$") >> many hexDigit >>= \c -> comments >> return (HexCharCode c)
         , char '#' >> many digit >>= \c -> comments >> return (CharCode c)