diff -r 091293bc974f -r 00b1facf2805 tools/pas2c/PascalUnitSyntaxTree.hs --- a/tools/pas2c/PascalUnitSyntaxTree.hs Sun Nov 11 15:14:18 2012 +0100 +++ b/tools/pas2c/PascalUnitSyntaxTree.hs Sun Nov 11 16:44:40 2012 +0100 @@ -19,7 +19,7 @@ deriving Show data TypeVarDeclaration = TypeDeclaration Identifier TypeDecl | VarDeclaration Bool Bool ([Identifier], TypeDecl) (Maybe InitExpression) - | FunctionDeclaration Identifier Bool TypeDecl [TypeVarDeclaration] (Maybe (TypesAndVars, Phrase)) + | FunctionDeclaration Identifier Bool Bool TypeDecl [TypeVarDeclaration] (Maybe (TypesAndVars, Phrase)) | OperatorDeclaration String Identifier Bool TypeDecl [TypeVarDeclaration] (Maybe (TypesAndVars, Phrase)) deriving Show data TypeDecl = SimpleType Identifier @@ -103,12 +103,12 @@ data BaseType = BTUnknown | BTChar | BTString - | BTInt + | BTInt Bool -- second param indicates whether signed or not | BTBool | BTFloat | BTRecord String [(String, BaseType)] | BTArray Range BaseType BaseType - | BTFunction Bool Int BaseType + | BTFunction Bool [(Bool, BaseType)] BaseType -- (Bool, BaseType), Bool indiciates whether var or not | BTPointerTo BaseType | BTUnresolved String | BTSet BaseType