# HG changeset patch
# User unc0rr
# Date 1320515000 -10800
# Node ID c6245ed6cbc0639ea65a1f18e987bcf6ac3e9e46
# Parent  95ffd59d0f4aabc6af56f91e948c5927772ca1b1
Some improvements to the parser

diff -r 95ffd59d0f4a -r c6245ed6cbc0 hedgewars/uStats.pas
--- a/hedgewars/uStats.pas	Sat Nov 05 12:10:49 2011 -0400
+++ b/hedgewars/uStats.pas	Sat Nov 05 20:43:20 2011 +0300
@@ -129,7 +129,7 @@
 
     else if AmmoDamagingUsed then
         AddVoice(sndMissed, PreviousTeam^.voicepack)
-    else if (AmmoUsedCount > 0) and not isTurnSkipped then
+    else if (AmmoUsedCount > 0) and (not isTurnSkipped) then
         // nothing ?
     else if isTurnSkipped then
         begin
diff -r 95ffd59d0f4a -r c6245ed6cbc0 tools/PascalParser.hs
--- a/tools/PascalParser.hs	Sat Nov 05 12:10:49 2011 -0400
+++ b/tools/PascalParser.hs	Sat Nov 05 20:43:20 2011 +0300
@@ -31,6 +31,7 @@
     | Sequence [Identifier]
     | ArrayDecl Range TypeDecl
     | RecordType [TypeVarDeclaration]
+    | PointerTo TypeDecl
     | UnknownType
     deriving Show
 data Range = Range Identifier
@@ -63,6 +64,7 @@
     | HexNumber String
     | Address Reference
     | Reference Reference
+    | Null
     deriving Show
 data Reference = ArrayElement Identifier Expression
     | SimpleReference Identifier
@@ -82,9 +84,9 @@
             "begin", "end", "program", "unit", "interface"
             , "implementation", "and", "or", "xor", "shl"
             , "shr", "while", "do", "repeat", "until", "case", "of"
-            , "type", "var", "const", "out", "array"
+            , "type", "var", "const", "out", "array", "packed"
             , "procedure", "function", "with", "for", "to"
-            , "downto", "div", "mod", "record", "set"
+            , "downto", "div", "mod", "record", "set", "nil"
             ]
     , reservedOpNames= [] 
     , caseSensitive  = False   
@@ -152,38 +154,34 @@
         , [Infix (char '.' >> return RecordField) AssocLeft]
         ]
     
-varsDecl1 = varsParser many1    
-varsDecl = varsParser many
+varsDecl1 = varsParser sepEndBy1    
+varsDecl = varsParser sepEndBy
 varsParser m endsWithSemi = do
-    vs <- m (aVarDecl >>= \i -> semi pas >> comments >> return i)
-    v <- if not endsWithSemi then liftM (\a -> [a]) aVarDecl else return []
+    vs <- m (aVarDecl endsWithSemi) (semi pas)
+    return vs
+
+aVarDecl endsWithSemi = do
+    when (not endsWithSemi) $
+        optional $ choice [
+            try $ string "var"
+            , try $ string "const"
+            , try $ string "out"
+            ]
     comments
-    return $ vs ++ v
-    where
-    aVarDecl = do
-        when (not endsWithSemi) $
-            optional $ choice [
-                try $ string "var"
-                , try $ string "const"
-                , try $ string "out"
-                ]
+    ids <- do
+        i <- (commaSep1 pas) $ (try iD <?> "variable declaration")
+        char ':'
+        return i
+    comments
+    t <- typeDecl <?> "variable type declaration"
+    comments
+    init <- option Nothing $ do
+        char '='
         comments
-        ids <- try $ do
-            i <- (commaSep1 pas) $ (iD <?> "variable declaration")
-            char ':'
-            return i
-        comments
-        t <- typeDecl <?> "variable type declaration"
+        e <- expression
         comments
-        init <- option Nothing $ do
-            char '='
-            comments
-            e <- expression
-            comments
-            char ';'
-            comments
-            return (Just e)
-        return $ VarDeclaration False (ids, t) init
+        return (Just e)
+    return $ VarDeclaration False (ids, t) init
 
 
 constsDecl = do
@@ -206,7 +204,8 @@
         return $ VarDeclaration False ([i], UnknownType) (Just e)
         
 typeDecl = choice [
-    arrayDecl
+    char '^' >> typeDecl >>= return . PointerTo
+    , arrayDecl
     , recordDecl
     , rangeDecl >>= return . RangeType
     , seqenceDecl >>= return . Sequence
@@ -225,6 +224,7 @@
         t <- typeDecl
         return $ ArrayDecl r t
     recordDecl = do
+        optional $ (try $ string "packed") >> comments
         try $ string "record"
         comments
         vs <- varsDecl True
@@ -318,6 +318,7 @@
             char ')'
         comments
         char ':'
+        comments
         ret <- iD
         comments
         char ';'
@@ -369,13 +370,13 @@
         , char '#' >> many digit >>= return . CharCode
         , char '$' >> many hexDigit >>= return . HexNumber
         , char '@' >> reference >>= return . Address
+        , try $ string "nil" >> return Null
         , try $ funCall
         , reference >>= return . Reference
         ] <?> "simple expression"
 
     table = [ 
-          [Prefix (string "not" >> return (PrefixOp "not"))]
-        , [  Infix (char '*' >> return (BinOp "*")) AssocLeft
+          [  Infix (char '*' >> return (BinOp "*")) AssocLeft
            , Infix (char '/' >> return (BinOp "/")) AssocLeft
            , Infix (try (string "div") >> return (BinOp "div")) AssocLeft
            , Infix (try (string "mod") >> return (BinOp "mod")) AssocLeft
@@ -395,6 +396,7 @@
            , Infix (try $ string "or" >> return (BinOp "or")) AssocLeft
            , Infix (try $ string "xor" >> return (BinOp "xor")) AssocLeft
           ]
+        , [Prefix (try (string "not") >> return (PrefixOp "not"))]
         ]
     
 phrasesBlock = do