aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-04-01 10:27:46 +0100
committerMichael Williamson <mike@zwobble.org>2016-04-01 10:27:46 +0100
commite855df09f88d1e18e99d8a1d8be75fb944a19a99 (patch)
tree0fd9630db7e7ef6e689cf0b419666b6dc29b7722 /src
parent2c96d40d14215b600bc1255c56126d67eff48625 (diff)
Fix reading of static field references
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java2
-rw-r--r--src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java7
2 files changed, 7 insertions, 2 deletions
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");
}