From c0fc10f59a858a417dd5efc61db339671f97c968 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 29 Aug 2016 16:20:06 +0100
Subject: Desugar all types at once

---
 src/main/java/org/zwobble/couscous/interpreter/JavaProject.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(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 3e4b182..f813faf 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/JavaProject.java
@@ -13,6 +13,8 @@ import org.zwobble.couscous.transforms.DesugarSwitchToIfElse;
 
 import java.util.List;
 
+import static org.zwobble.couscous.util.ExtraLists.list;
+
 public class JavaProject {
     private static final InterpreterType OBJECT_TYPE = IntrinsicInterpreterType.classBuilder("java.lang.Object")
         .build();
@@ -28,8 +30,8 @@ public class JavaProject {
         NodeTransformer switchTransformer = DesugarSwitchToIfElse.transformer();
         NodeTransformer forTransformer = DesugarForToWhile.transformer();
         Iterable<InterpreterType> concreteTypes = Iterables.transform(
-            classNodes,
-            classNode -> new UserDefinedInterpreterType(forTransformer.transformTypeDeclaration(switchTransformer.transformTypeDeclaration(classNode)))
+            NodeTransformer.applyAll(list(switchTransformer, forTransformer), classNodes),
+            UserDefinedInterpreterType::new
         );
         return builder()
                 .addClasses(concreteTypes)
-- 
cgit v1.2.3