Ported tests for type analysis.

1 files changed, 10 insertions, 7 deletions

diff --git a/stdlib/source/spec/compositor/common.lux b/stdlib/source/spec/compositor/common.lux
index 4967c0f8c..df332df57 100644
--- a/stdlib/source/spec/compositor/common.lux
+++ b/stdlib/source/spec/compositor/common.lux
@@ -60,13 +60,16 @@
         (Bundle anchor expression statement)
         Expander
         (-> expression statement)
-        (IO (Error [Runner Definer]))))
+        (IO (Error [(statement.State+ anchor expression statement)
+                    Runner
+                    Definer]))))
   (do io.monad
     [?state (platform.initialize expander platform bundle program)]
     (wrap (do error.monad
-            [[bundle' state] ?state
-             #let [state (get@ [#statement.generation
-                                #statement.state]
-                               state)]]
-            (wrap [(..runner platform state)
-                   (..definer platform state)])))))
+            [[statement-bundle statement-state] ?state
+             #let [generation-state (get@ [#statement.generation
+                                           #statement.state]
+                                          statement-state)]]
+            (wrap [[statement-bundle statement-state]
+                   (..runner platform generation-state)
+                   (..definer platform generation-state)])))))