MisterChaos69/MiniJavaCompiler
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add initial typechecker for AST #2

Merged
mrab merged 121 commits from typedAST into master 2024-06-14 07:53:30 +00:00
Conversation 0 Commits 121 Files Changed 17 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit af093fa3bb - Show all commits

7
Test/TestParser.hs
View File

@ -227,7 +227,9 @@ testStatementConstructorCallWithArgs = TestCase $
assertEqual "expect constructor call" [StatementExpressionStatement (ConstructorCall "Foo" [Reference "b"])] $ assertEqual "expect constructor call" [StatementExpressionStatement (ConstructorCall "Foo" [Reference "b"])] $
parseStatement [NEW,IDENTIFIER "Foo",LBRACE,IDENTIFIER "b",RBRACE,SEMICOLON] parseStatement [NEW,IDENTIFIER "Foo",LBRACE,IDENTIFIER "b",RBRACE,SEMICOLON]
testStatementPreIncrement = TestCase $
assertEqual "expect increment" [StatementExpressionStatement $ PostIncrement $ Reference "a"] $
parseStatement [IDENTIFIER "a",INCREMENT,SEMICOLON]
tests = TestList [ tests = TestList [
@ -296,5 +298,6 @@ tests = TestList [
testStatementAssign, testStatementAssign,
testStatementMethodCallNoParams, testStatementMethodCallNoParams,
testStatementConstructorCall, testStatementConstructorCall,
testStatementConstructorCallWithArgs testStatementConstructorCallWithArgs,
testStatementIncrement
] ]

8
src/Parser/JavaParser.y
View File

@ -249,10 +249,10 @@ assignment : lefthandside assignmentoperator assignmentexpression {
statementexpression : assignment { $1 } statementexpression : assignment { $1 }
-- | preincrementexpression { } | preincrementexpression { $1 }
-- | predecrementexpression { } | predecrementexpression { $1 }
-- | postincrementexpression { } | postincrementexpression { $1 }
-- | postdecrementexpression { } | postdecrementexpression { $1 }
| methodinvocation { $1 } | methodinvocation { $1 }
| classinstancecreationexpression { $1 } | classinstancecreationexpression { $1 }