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

parser implement varibale initialization

Browse Source
This commit is contained in:
Marvin Schlegel 2024-05-08 13:29:10 +02:00
parent ebf54bf4cb
commit 90fa658c8f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Test/TestParser.hs
View File

@ -74,6 +74,12 @@ testExpressionIntLiteral = TestCase $
testFieldWithInitialization = TestCase $
assertEqual "expect Class with initialized field" [Class "WithInitField" [] [VariableDeclaration "int" "number" $ Just $ IntegerLiteral 3]] $
parse [CLASS,IDENTIFIER "WithInitField",LBRACKET,INT,IDENTIFIER "number",ASSIGN,INTEGERLITERAL 3,SEMICOLON,RBRACKET]
testLocalBoolWithInitialization = TestCase $
assertEqual "expect block with with initialized local var" (Block [LocalVariableDeclaration $ VariableDeclaration "boolean" "b" $ Just $ BooleanLiteral False]) $
parseBlock [LBRACKET,BOOLEAN,IDENTIFIER "b",ASSIGN,BOOLLITERAL False,SEMICOLON,RBRACKET]
testFieldNullWithInitialization = TestCase $
assertEqual "expect Class with initialized field" [Class "WithInitField" [] [VariableDeclaration "Object" "bar" $ Just NullLiteral]] $
parse [CLASS,IDENTIFIER "WithInitField",LBRACKET,IDENTIFIER "Object",IDENTIFIER "bar",ASSIGN,NULLLITERAL,SEMICOLON,RBRACKET]
tests = TestList [
testSingleEmptyClass,
@ -96,5 +102,7 @@ tests = TestList [
testNestedBlocks,
testBlockWithEmptyStatement,
testExpressionIntLiteral,
testFieldWithInitialization
testFieldWithInitialization,
testLocalBoolWithInitialization,
testFieldNullWithInitialization
]

6
src/Parser/JavaParser.y
View File

@ -328,9 +328,9 @@ exclusiveorexpression : andexpression { $1 }
-- | exclusiveorexpression XOR andexpression { }
literal : INTLITERAL { IntegerLiteral $1 }
-- | BOOLLITERAL { }
-- | CHARLITERAL { }
-- | JNULL { }
| BOOLLITERAL { BooleanLiteral $1 }
| CHARLITERAL { CharacterLiteral $1 }
| JNULL { NullLiteral }
castexpression : LBRACE primitivetype RBRACE unaryexpression { }
| LBRACE expression RBRACE unaryexpressionnotplusminus{ }