hedgewars: comparison tools/PascalParser.hs

equal deleted inserted replaced

-:3dcb839b5904
+:14718b2685a3
 | PointerTo TypeDecl
 | String
 | UnknownType
 deriving Show
 data Range = Range Identifier
-| RangeFromTo Expression Expression
+| RangeFromTo InitExpression InitExpression
 deriving Show
 data Initialize = Initialize String
 deriving Show
 data Finalize = Finalize String
 deriving Show
 | Phrases [Phrase]
 | SwitchCase Expression [(Expression, Phrase)] (Maybe Phrase)
 | Assignment Reference Expression
 deriving Show
 data Expression = Expression String
+| BuiltInFunCall [Expression] Reference
 | PrefixOp String Expression
 | PostfixOp String Expression
 | BinOp String Expression Expression
 | StringLiteral String
 | CharCode String
 | Reference Reference
 | Null
 deriving Show
 data Reference = ArrayElement [Expression] Reference
 | FunCall [Expression] Reference
-| BuiltInFunCall [Expression] Reference
 | SimpleReference Identifier
 | Dereference Reference
 | RecordField Reference Reference
 | Address Reference
 deriving Show
 | InitFloat String
 | InitNumber String
 | InitHexNumber String
 | InitString String
 | InitChar String
+| BuiltInFunction String [InitExpression]
 | InitNull
 deriving Show
+builtin = ["succ", "pred", "low", "high"]
 pascalLanguageDef
 = emptyDef
 { commentStart   = "(*"
 , commentEnd     = "*)"
 , "implementation", "and", "or", "xor", "shl"
 , "shr", "while", "do", "repeat", "until", "case", "of"
 , "type", "var", "const", "out", "array", "packed"
 , "procedure", "function", "with", "for", "to"
 , "downto", "div", "mod", "record", "set", "nil"
-, "string", "shortstring"--, "succ", "pred", "low"
+, "string", "shortstring"
---, "high"
+] ++ builtin
-]
 , reservedOpNames= []
 , caseSensitive  = False
 }
+caseInsensitiveString s = do
+mapM_ (\a -> satisfy (\b -> toUpper a == toUpper b)) s <?> s
+return s
 pas = patch $ makeTokenParser pascalLanguageDef
 where
 patch tp = tp {stringLiteral = sl}
 sl = do
 try $ rangeft
 , iD >>= return . Range
 ] <?> "range declaration"
 where
 rangeft = do
-e1 <- expression
+e1 <- initExpression
 string ".."
-e2 <- expression
+e2 <- initExpression
 return $ RangeFromTo e1 e2
 typeVarDeclaration isImpl = (liftM concat . many . choice) [
 varSection,
 constSection,
 return $ Implementation u (TypesAndVars tv)
 expression = buildExpressionParser table term <?> "expression"
 where
 term = comments >> choice [
-parens pas $ expression
+builtInFunction expression >>= \(n, e) -> return $ BuiltInFunCall e (SimpleReference (Identifier n))
+, parens pas $ expression
 , try $ integer pas >>= \i -> notFollowedBy (char '.') >> (return . NumberLiteral . show) i
 , try $ float pas >>= return . FloatLiteral . show
 , try $ integer pas >>= return . NumberLiteral . show
 , stringLiteral pas >>= return . StringLiteral
 , char '#' >> many digit >>= return . CharCode
 return u
 initExpression = buildExpressionParser table term <?> "initialization expression"
 where
 term = comments >> choice [
-try $ parens pas (commaSep pas $ initExpression) >>= return . InitArray
+liftM (uncurry BuiltInFunction) $ builtInFunction initExpression
+, try $ parens pas (commaSep pas $ initExpression) >>= return . InitArray
 , parens pas (semiSep pas $ recField) >>= return . InitRecord
 , try $ integer pas >>= \i -> notFollowedBy (char '.') >> (return . InitNumber . show) i
 , try $ float pas >>= return . InitFloat . show
+, try $ integer pas >>= return . InitNumber . show
 , stringLiteral pas >>= return . InitString
 , char '#' >> many digit >>= return . InitChar
 , char '$' >> many hexDigit >>= return . InitHexNumber
 , try $ string "nil" >> return InitNull
 , iD >>= return . InitReference
 , [  Infix (try $ string "shl" >> return (InitBinOp "and")) AssocNone
 , Infix (try $ string "shr" >> return (InitBinOp "or")) AssocNone
 ]
 , [Prefix (try (string "not") >> return (InitPrefixOp "not"))]
 ]
+builtInFunction e = do
+name <- choice $ map (\s -> try $ caseInsensitiveString s >>= \i -> notFollowedBy alphaNum >> return i) builtin
+spaces
+exprs <- many1 e
+spaces
+return (name, exprs)

changeset 6388	14718b2685a3
parent 6387	3dcb839b5904
child 6391	bd5851ab3157