aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/zwobble/couscous/frontends
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-10-30 18:05:25 +0000
committerMichael Williamson <mike@zwobble.org>2016-10-30 18:05:25 +0000
commitfd5dde9224680d46dd7081d051f1320194ff59ea (patch)
treedcb0a55ea765b21b08f0a80a453f2fdfdbd524ae /src/main/java/org/zwobble/couscous/frontends
parentd58b27ee89a014aa294b25baffd53c7a96a64be3 (diff)
Move transformation of constructor calls into hoist code
Diffstat (limited to 'src/main/java/org/zwobble/couscous/frontends')
-rw-r--r--src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java14
1 files changed, 2 insertions, 12 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 aa64543..823310e 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
@@ -284,20 +284,10 @@ public class JavaExpressionReader {
GeneratedClosure closure =
javaReader.readAnonymousClass(scope, expression.getAnonymousClassDeclaration());
return closure.generateConstructor(arguments);
- } else if (declaringClass.isNested() && !Modifier.isStatic(declaringClass.getModifiers())) {
- if (expression.getExpression() == null) {
- Type type = typeOf(declaringClass);
- return methodCall(
- thisReference(typeOf(declaringClass.getDeclaringClass())),
- // TODO: remove duplication with JavaReader in name generation
- // TODO: handle this when hoisting (i.e. in HoistNestedTypes)
- "create_" + declaringClass.getName(),
- arguments,
- type);
- } else {
+ } else {
+ if (expression.getExpression() != null) {
throw new UnsupportedOperationException();
}
- } else {
return constructorCall(typeOf(expression), arguments);
}
}