From d58b27ee89a014aa294b25baffd53c7a96a64be3 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 30 Oct 2016 17:21:10 +0000 Subject: Extract inner type hoisting to separate step --- src/main/java/org/zwobble/couscous/interpreter/JavaProject.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/JavaProject.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java index f813faf..a85d126 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java +++ b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java @@ -10,6 +10,7 @@ import org.zwobble.couscous.interpreter.values.BoxedIntegerInterpreterValue; import org.zwobble.couscous.interpreter.values.InternalCouscousInterpreterValue; import org.zwobble.couscous.transforms.DesugarForToWhile; import org.zwobble.couscous.transforms.DesugarSwitchToIfElse; +import org.zwobble.couscous.transforms.HoistNestedTypes; import java.util.List; @@ -30,7 +31,9 @@ public class JavaProject { NodeTransformer switchTransformer = DesugarSwitchToIfElse.transformer(); NodeTransformer forTransformer = DesugarForToWhile.transformer(); Iterable concreteTypes = Iterables.transform( - NodeTransformer.applyAll(list(switchTransformer, forTransformer), classNodes), + HoistNestedTypes.hoist( + NodeTransformer.applyAll(list(switchTransformer, forTransformer), classNodes) + ), UserDefinedInterpreterType::new ); return builder() -- cgit v1.2.3