From 2d6c7b1a0690c4e695b42fdc5d73989935626287 Mon Sep 17 00:00:00 2001 From: Marvin Schlegel Date: Thu, 13 Jun 2024 12:27:57 +0200 Subject: [PATCH] fix external methocall --- Test/TestParser.hs | 4 ++++ src/Parser/JavaParser.y | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Test/TestParser.hs b/Test/TestParser.hs index 5041e3e..7c180e9 100644 --- a/Test/TestParser.hs +++ b/Test/TestParser.hs @@ -204,6 +204,10 @@ testExpressionConstructorCall = TestCase $ assertEqual "expect constructor call" (StatementExpressionExpression (ConstructorCall "Foo" [])) $ parseExpression [NEW,IDENTIFIER "Foo",LBRACE,RBRACE] +testExpresssionExternalMethodCall = TestCase $ + assertEqual "expect method call on sub" (StatementExpressionExpression (MethodCall (Reference "Obj") "foo" [])) $ + parseExpression [IDENTIFIER "Obj",IDENTIFIER "foo",LBRACE,RBRACE] + testStatementIfThen = TestCase $ assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) Nothing] $ parseStatement [IF,LBRACE,IDENTIFIER "a",RBRACE,LBRACKET,RBRACKET] diff --git a/src/Parser/JavaParser.y b/src/Parser/JavaParser.y index aa22bb8..c3fc42d 100644 --- a/src/Parser/JavaParser.y +++ b/src/Parser/JavaParser.y @@ -287,8 +287,8 @@ postincrementexpression : postfixexpression INCREMENT { PostIncrement $1 } postdecrementexpression : postfixexpression DECREMENT { PostDecrement $1 } -methodinvocation : simplename LBRACE RBRACE { MethodCall (Reference "this") $1 [] } - | simplename LBRACE argumentlist RBRACE { MethodCall (Reference "this") $1 $3 } +methodinvocation : name LBRACE RBRACE { let (exp, functionname) = extractFunctionName $1 in (MethodCall exp functionname []) } + | name LBRACE argumentlist RBRACE { let (exp, functionname) = extractFunctionName $1 in (MethodCall exp functionname $3) } | primary DOT IDENTIFIER LBRACE RBRACE { MethodCall $1 $3 [] } | primary DOT IDENTIFIER LBRACE argumentlist RBRACE { MethodCall $1 $3 $5 } @@ -374,8 +374,9 @@ data Declarator = Declarator Identifier (Maybe Expression) convertDeclarator :: DataType -> Declarator -> VariableDeclaration convertDeclarator dataType (Declarator id assigment) = VariableDeclaration dataType id assigment -data StatementWithoutSub = Statement - +extractFunctionName :: Expression -> (Expression, Identifier) +extractFunctionName (BinaryOperation NameResolution exp (Reference functionname)) = (exp, functionname) +extractFunctionName (Reference functionname) = ((Reference "this"), functionname) parseError :: ([Token], [String]) -> a parseError (errortoken, expected) = error ("parse error on token: " ++ show errortoken ++ "\nexpected one of: " ++ show expected)