From 524c667c43d41790c0100f09d0985cdefc68f6f2 Mon Sep 17 00:00:00 2001 From: Marvin Schlegel Date: Tue, 14 May 2024 16:48:45 +0200 Subject: [PATCH 1/3] parser add while loop --- Test/TestParser.hs | 7 ++++++- src/Parser/JavaParser.y | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Test/TestParser.hs b/Test/TestParser.hs index b7cd93e..a5b94fa 100644 --- a/Test/TestParser.hs +++ b/Test/TestParser.hs @@ -151,6 +151,10 @@ testStatementIfThen = TestCase $ testStatementIfThenElse = TestCase $ assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) (Just (Block [Block []]))] $ parseStatement [IF,LBRACE,IDENTIFIER "a",RBRACE,LBRACKET,RBRACKET,ELSE,LBRACKET,RBRACKET] +testStatementWhile = TestCase $ + assertEqual "expect while" [While (Reference "a") (Block [Block []])] $ + parseStatement [WHILE,LBRACE,IDENTIFIER "a",RBRACE,LBRACKET,RBRACKET] + tests = TestList [ @@ -194,5 +198,6 @@ tests = TestList [ testExpressionPreIncrement, testExpressionPreDecrement, testStatementIfThen, - testStatementIfThenElse + testStatementIfThenElse, + testStatementWhile ] \ No newline at end of file diff --git a/src/Parser/JavaParser.y b/src/Parser/JavaParser.y index 2e80289..b3e0e43 100644 --- a/src/Parser/JavaParser.y +++ b/src/Parser/JavaParser.y @@ -203,7 +203,7 @@ localvariabledeclarationstatement : localvariabledeclaration SEMICOLON { $1 } statement : statementwithouttrailingsubstatement{ $1 } -- statement returns a list of statements | ifthenstatement { [$1] } | ifthenelsestatement { [$1] } - -- | whilestatement { } + | whilestatement { [$1] } expression : assignmentexpression { $1 } @@ -222,7 +222,7 @@ ifthenstatement : IF LBRACE expression RBRACE statement { If $3 (Block $5) No ifthenelsestatement : IF LBRACE expression RBRACE statementnoshortif ELSE statement { If $3 (Block $5) (Just (Block $7)) } -whilestatement : WHILE LBRACE expression RBRACE statement { } +whilestatement : WHILE LBRACE expression RBRACE statement { While $3 (Block $5) } assignmentexpression : conditionalexpression { $1 } -- | assignment { } From 9f658397de204f501d80b1318969dc0f9b983b5c Mon Sep 17 00:00:00 2001 From: Marvin Schlegel Date: Tue, 14 May 2024 23:14:43 +0200 Subject: [PATCH 2/3] parser implement assign --- Test/TestParser.hs | 4 ++++ src/Parser/JavaParser.y | 30 ++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Test/TestParser.hs b/Test/TestParser.hs index a5b94fa..2911f3f 100644 --- a/Test/TestParser.hs +++ b/Test/TestParser.hs @@ -144,6 +144,9 @@ testExpressionPreIncrement = TestCase $ testExpressionPreDecrement = TestCase $ assertEqual "expect PreIncrement" (UnaryOperation PreDecrement (Reference "a")) $ parseExpression [DECREMENT,IDENTIFIER "a"] +testExpressionAssign = TestCase $ + assertEqual "expect assign and addition" (StatementExpressionExpression (Assignment (Reference "a") (IntegerLiteral 5))) $ + parseExpression [IDENTIFIER "a",ASSIGN,INTEGERLITERAL 5] testStatementIfThen = TestCase $ assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) Nothing] $ @@ -197,6 +200,7 @@ tests = TestList [ testExpressionPostDecrement, testExpressionPreIncrement, testExpressionPreDecrement, + testExpressionAssign, testStatementIfThen, testStatementIfThenElse, testStatementWhile diff --git a/src/Parser/JavaParser.y b/src/Parser/JavaParser.y index b3e0e43..fcd3559 100644 --- a/src/Parser/JavaParser.y +++ b/src/Parser/JavaParser.y @@ -82,7 +82,7 @@ compilationunit : typedeclarations { $1 } typedeclarations : typedeclaration { [$1] } | typedeclarations typedeclaration { $1 ++ [$2] } -name : simplename { $1 } +name : simplename { Reference $1 } -- | qualifiedname { } typedeclaration : classdeclaration { $1 } @@ -122,7 +122,7 @@ classtype : classorinterfacetype{ } classbodydeclaration : classmemberdeclaration { $1 } | constructordeclaration { $1 } -classorinterfacetype : name { $1 } +classorinterfacetype : simplename { $1 } classmemberdeclaration : fielddeclaration { $1 } | methoddeclaration { $1 } @@ -225,7 +225,7 @@ ifthenelsestatement : IF LBRACE expression RBRACE statementnoshortif ELSE state whilestatement : WHILE LBRACE expression RBRACE statement { While $3 (Block $5) } assignmentexpression : conditionalexpression { $1 } - -- | assignment { } + | assignment { StatementExpressionExpression $1 } emptystatement : SEMICOLON { Block [] } @@ -241,7 +241,9 @@ statementnoshortif : statementwithouttrailingsubstatement { $1 } conditionalexpression : conditionalorexpression { $1 } -- | conditionalorexpression QUESMARK expression COLON conditionalexpression { } -assignment : lefthandside assignmentoperator assignmentexpression { } +assignment : lefthandside assignmentoperator assignmentexpression { + Assignment $1 $3 + } statementexpression : assignment { } @@ -262,18 +264,18 @@ conditionalorexpression : conditionalandexpression { $1 } lefthandside : name { $1 } -assignmentoperator : ASSIGN{ } - -- | TIMESEQUAL { } - -- | DIVIDEEQUAL { } - -- | MODULOEQUAL { } - -- | PLUSEQUAL { } - -- | MINUSEQUAL { } +assignmentoperator : ASSIGN { Nothing } + | TIMESEQUAL { Just Multiplication } + | DIVIDEEQUAL { Just Division } + | MODULOEQUAL { Just Modulo } + | PLUSEQUAL { Just Addition } + | MINUSEQUAL { Just Subtraction } -- | SHIFTLEFTEQUAL { } -- | SIGNEDSHIFTRIGHTEQUAL { } -- | UNSIGNEDSHIFTRIGHTEQUAL { } - -- | ANDEQUAL { } - -- | XOREQUAL { } - -- | OREQUAL{ } + | ANDEQUAL { Just BitwiseAnd } + | XOREQUAL { Just BitwiseXor } + | OREQUAL{ Just BitwiseOr } preincrementexpression : INCREMENT unaryexpression { UnaryOperation PreIncrement $2 } @@ -302,7 +304,7 @@ unaryexpression : unaryexpressionnotplusminus { $1 } | preincrementexpression { $1 } postfixexpression : primary { $1 } - | name { Reference $1 } + | name { $1 } | postincrementexpression { $1 } | postdecrementexpression{ $1 } From a4d41b9ef73429649f262acf7183a80d7bd21b50 Mon Sep 17 00:00:00 2001 From: Marvin Schlegel Date: Tue, 14 May 2024 23:35:56 +0200 Subject: [PATCH 3/3] parser add timesequal, divideequal, moduloequal, minusequal, andequal, xorequal, orequal --- Test/TestParser.hs | 19 ++++++++++++++++++- src/Parser/JavaParser.y | 4 +++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Test/TestParser.hs b/Test/TestParser.hs index 2911f3f..873f438 100644 --- a/Test/TestParser.hs +++ b/Test/TestParser.hs @@ -145,8 +145,20 @@ testExpressionPreDecrement = TestCase $ assertEqual "expect PreIncrement" (UnaryOperation PreDecrement (Reference "a")) $ parseExpression [DECREMENT,IDENTIFIER "a"] testExpressionAssign = TestCase $ - assertEqual "expect assign and addition" (StatementExpressionExpression (Assignment (Reference "a") (IntegerLiteral 5))) $ + assertEqual "expect assign 5 to a" (StatementExpressionExpression (Assignment (Reference "a") (IntegerLiteral 5))) $ parseExpression [IDENTIFIER "a",ASSIGN,INTEGERLITERAL 5] +testExpressionTimesEqual = TestCase $ + assertEqual "expect assign and multiplication" (StatementExpressionExpression (Assignment (Reference "a") (BinaryOperation Multiplication (Reference "a") (IntegerLiteral 5)))) $ + parseExpression [IDENTIFIER "a",TIMESEQUAL,INTEGERLITERAL 5] +testExpressionDivideEqual = TestCase $ + assertEqual "expect assign and division" (StatementExpressionExpression (Assignment (Reference "a") (BinaryOperation Division (Reference "a") (IntegerLiteral 5)))) $ + parseExpression [IDENTIFIER "a",DIVEQUAL,INTEGERLITERAL 5] +testExpressionPlusEqual = TestCase $ + assertEqual "expect assign and addition" (StatementExpressionExpression (Assignment (Reference "a") (BinaryOperation Addition (Reference "a") (IntegerLiteral 5)))) $ + parseExpression [IDENTIFIER "a",PLUSEQUAL,INTEGERLITERAL 5] +testExpressionMinusEqual = TestCase $ + assertEqual "expect assign and subtraction" (StatementExpressionExpression (Assignment (Reference "a") (BinaryOperation Subtraction (Reference "a") (IntegerLiteral 5)))) $ + parseExpression [IDENTIFIER "a",MINUSEQUAL,INTEGERLITERAL 5] testStatementIfThen = TestCase $ assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) Nothing] $ @@ -201,6 +213,11 @@ tests = TestList [ testExpressionPreIncrement, testExpressionPreDecrement, testExpressionAssign, + testExpressionTimesEqual, + testExpressionTimesEqual, + testExpressionDivideEqual, + testExpressionPlusEqual, + testExpressionMinusEqual, testStatementIfThen, testStatementIfThenElse, testStatementWhile diff --git a/src/Parser/JavaParser.y b/src/Parser/JavaParser.y index fcd3559..4e66850 100644 --- a/src/Parser/JavaParser.y +++ b/src/Parser/JavaParser.y @@ -242,7 +242,9 @@ conditionalexpression : conditionalorexpression { $1 } -- | conditionalorexpression QUESMARK expression COLON conditionalexpression { } assignment : lefthandside assignmentoperator assignmentexpression { - Assignment $1 $3 + case $2 of + Nothing -> Assignment $1 $3 + Just operator -> Assignment $1 (BinaryOperation operator $1 $3) }