Test/TestParser.hs

@@ -145,10 +145,10 @@ testExpressionPostDecrement = TestCase $
     assertEqual "expect PostDecrement" (StatementExpressionExpression $ PostDecrement (Reference "a")) $
     parseExpression [IDENTIFIER "a",DECREMENT]
 testExpressionPreIncrement = TestCase $
-    assertEqual "expect PreIncrement" (StatementExpressionExpression $ PreIncrement (Reference "a")) $
+    assertEqual "expect PreIncrement" (StatementExpressionExpression $ Assignment (Reference "a") (BinaryOperation Addition (IntegerLiteral 1) (Reference "a"))) $
     parseExpression [INCREMENT,IDENTIFIER "a"]
 testExpressionPreDecrement = TestCase $
-    assertEqual "expect PreIncrement" (StatementExpressionExpression $ PreDecrement (Reference "a")) $
+    assertEqual "expect PreIncrement" (StatementExpressionExpression $ Assignment (Reference "a") (BinaryOperation Subtraction (IntegerLiteral 1) (Reference "a"))) $
     parseExpression [DECREMENT,IDENTIFIER "a"]
 testExpressionAssign = TestCase $
     assertEqual "expect assign 5 to a" (StatementExpressionExpression (Assignment (Reference "a") (IntegerLiteral 5))) $
@@ -191,6 +191,15 @@ testExpressionThisMethodCall = TestCase $
 testExpressionThisMethodCallParam = TestCase $
     assertEqual "expect this methocall" (StatementExpressionExpression (MethodCall (Reference "this") "foo" [Reference "x"])) $
     parseExpression [THIS,DOT,IDENTIFIER "foo",LBRACE,IDENTIFIER "x",RBRACE]
+testExpressionFieldAccess = TestCase $
+    assertEqual "expect NameResolution" (BinaryOperation NameResolution (Reference "this") (Reference "b")) $
+    parseExpression [THIS,DOT,IDENTIFIER "b"]
+testExpressionSimpleFieldAccess = TestCase $
+    assertEqual "expect Reference" (Reference "a") $
+    parseExpression [IDENTIFIER "a"]
+testExpressionFieldSubAccess = TestCase $
+    assertEqual "expect NameResolution without this" (BinaryOperation NameResolution (Reference "a") (Reference "b")) $
+    parseExpression [IDENTIFIER "a",DOT,IDENTIFIER "b"]
 
 testStatementIfThen = TestCase $
     assertEqual "expect empty ifthen" [If (Reference "a") (Block [Block []]) Nothing] $
@@ -267,6 +276,9 @@ tests = TestList [
     testExpressionMethodCallTwoParams,
     testExpressionThisMethodCall,
     testExpressionThisMethodCallParam,
+    testExpressionFieldAccess,
+    testExpressionSimpleFieldAccess,
+    testExpressionFieldSubAccess,
     testStatementIfThen,
     testStatementIfThenElse,
     testStatementWhile,

src/Parser/JavaParser.y

@@ -83,11 +83,11 @@ typedeclarations : typedeclaration { [$1] }
                  | typedeclarations typedeclaration { $1 ++ [$2] }
 
 name             : simplename { Reference $1 }
-                --  | qualifiedname { }
+                 | qualifiedname { $1 }
 
 typedeclaration  : classdeclaration { $1 }
 
-qualifiedname    : name  DOT IDENTIFIER { }
+qualifiedname    : name  DOT IDENTIFIER { BinaryOperation NameResolution $1 (Reference $3) }
 
 simplename       : IDENTIFIER { $1 }
 
@@ -279,9 +279,9 @@ assignmentoperator : ASSIGN { Nothing }
                  | XOREQUAL { Just BitwiseXor }
                  | OREQUAL{ Just BitwiseOr }
 
-preincrementexpression : INCREMENT unaryexpression { PreIncrement $2 }
+preincrementexpression : INCREMENT unaryexpression { Assignment $2 (BinaryOperation Addition (IntegerLiteral 1) $2) }
 
-predecrementexpression : DECREMENT unaryexpression { PreDecrement $2 }
+predecrementexpression : DECREMENT unaryexpression { Assignment $2 (BinaryOperation Subtraction (IntegerLiteral 1) $2) }
 
 postincrementexpression : postfixexpression INCREMENT { PostIncrement $1 }
 
@@ -297,7 +297,7 @@ classinstancecreationexpression : NEW classtype LBRACE   RBRACE  { }
 
 conditionalandexpression : inclusiveorexpression { $1 }
 
-fieldaccess      : primary  DOT IDENTIFIER { }
+fieldaccess      : primary  DOT IDENTIFIER { BinaryOperation NameResolution $1 (Reference $3) }
 
 unaryexpression         : unaryexpressionnotplusminus { $1 }
                  | predecrementexpression { StatementExpressionExpression $1 }
@@ -319,7 +319,7 @@ primarynonewarray : literal { $1 }
                  | THIS { Reference "this" }
                  | LBRACE expression RBRACE  { $2 }
                 --  | classinstancecreationexpression { }
-                --  | fieldaccess { }
+                 | fieldaccess { $1 }
                  | methodinvocation { StatementExpressionExpression $1 }
 
 unaryexpressionnotplusminus : postfixexpression { $1 }