# HG changeset patch # User unc0rr # Date 1322411648 -10800 # Node ID 7c6f9b6672dcf52b3420d3423c3bc5a94c746513 # Parent 14224c9b459417ce29fbec475a48610f8da8603f More work on the parser diff -r 14224c9b4594 -r 7c6f9b6672dc hedgewars/GSHandlers.inc --- 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 diff -r 14224c9b4594 -r 7c6f9b6672dc tools/PascalParser.hs --- 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)