From fd5dde9224680d46dd7081d051f1320194ff59ea Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 30 Oct 2016 18:05:25 +0000 Subject: Move transformation of constructor calls into hoist code --- .../couscous/frontends/java/JavaExpressionReader.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/frontends') 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); } } -- cgit v1.2.3