Merge pull request 'bytecode' (#5) from bytecode into master

Reviewed-on: #5

Test/JavaSources/TestRecursion.java

@@ -5,7 +5,7 @@ public class TestRecursion {
 
     public TestRecursion(int n)
     {
-        value = n;
+        this.value = n;
 
         if(n > 0)
         {

Test/TestParser.hs

@@ -204,6 +204,13 @@ 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",DOT,IDENTIFIER "foo",LBRACE,RBRACE]
+testExpressionAssignWithThis = TestCase $
+    assertEqual "expect assignment on Field" (StatementExpressionExpression (Assignment (BinaryOperation NameResolution (Reference "this") (Reference "x")) (Reference "y"))) $
+    parseExpression [THIS,DOT,IDENTIFIER "x",ASSIGN,IDENTIFIER "y"]
+
 testStatementIfThen = TestCase $
     assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) Nothing] $
     parseStatement [IF,LBRACE,IDENTIFIER "a",RBRACE,LBRACKET,RBRACKET]
@@ -292,6 +299,8 @@ tests = TestList [
     testExpressionSimpleFieldAccess,
     testExpressionFieldSubAccess,
     testExpressionConstructorCall,
+    testExpresssionExternalMethodCall,
+    testExpressionAssignWithThis,
     testStatementIfThen,
     testStatementIfThenElse,
     testStatementWhile,

src/Parser/JavaParser.y

@@ -265,6 +265,7 @@ conditionalorexpression : conditionalandexpression { $1 }
                 --  | conditionalorexpression LOGICALOR conditionalandexpression{ }
 
 lefthandside     : name { $1 }
+                 | primary DOT IDENTIFIER { BinaryOperation NameResolution $1 (Reference $3) }
 
 assignmentoperator : ASSIGN { Nothing }
                  | TIMESEQUAL { Just Multiplication }
@@ -287,8 +288,8 @@ postincrementexpression : postfixexpression INCREMENT { PostIncrement $1 }
 
 postdecrementexpression : postfixexpression DECREMENT { PostDecrement $1 }
 
-methodinvocation : simplename LBRACE   RBRACE  { MethodCall (Reference "this") $1 []  }
+methodinvocation : name LBRACE RBRACE  { let (exp, functionname) = extractFunctionName $1 in (MethodCall exp functionname []) }
-                 | simplename LBRACE argumentlist RBRACE { MethodCall (Reference "this") $1 $3 }
+                 | 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 +375,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)