From e855df09f88d1e18e99d8a1d8be75fb944a19a99 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 1 Apr 2016 10:27:46 +0100 Subject: Fix reading of static field references --- .../org/zwobble/couscous/frontends/java/JavaExpressionReader.java | 2 +- .../couscous/tests/frontends/java/ExpressionReadingTests.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java index 4cb4c5c..86f044e 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java @@ -190,7 +190,7 @@ public class JavaExpressionReader { private ExpressionNode readQualifiedName(QualifiedName expression) { return FieldAccessNode.fieldAccess( - ScalarType.of(expression.getQualifier().getFullyQualifiedName()), + ScalarType.of(((ITypeBinding)expression.getQualifier().resolveBinding()).getQualifiedName()), expression.getName().getIdentifier(), typeOf(expression)); } diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java index b78a395..7055ecd 100644 --- a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java +++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java @@ -100,7 +100,12 @@ public class ExpressionReadingTests { } @Test - public void canReadExplicitStaticFieldReferenceWithClassAsReceiver() { + public void canReadExplicitStaticFieldReferenceWithSimplyNamedClassAsReceiver() { + canReadStaticFieldReference("Example.name"); + } + + @Test + public void canReadExplicitStaticFieldReferenceWithFullyQualifiedClassAsReceiver() { canReadStaticFieldReference("com.example.Example.name"); } -- cgit v1.2.3