1 files changed, 9 insertions, 12 deletions
diff --git a/core/coroutines.nom b/core/coroutines.nom
index f03cfc8..782c20e 100644
--- a/core/coroutines.nom
+++ b/core/coroutines.nom
@@ -16,16 +16,13 @@ test:
     
     for % in coroutine %co: %nums::add %
     assume (%nums == [4, 5, 6, 6, 6]) or barf "Coroutine iteration failed"
-[coroutine %body, generator %body] all compile to (..)
-    Lua value "\
-        ..(function()
-            \(%body as lua statements)
-        end)"
+[coroutine %body, generator %body] all compile to "\
+    ..(function()
+        \(%body as lua statements)
+    end)"
 
-(->) compiles to (Lua value "coroutine.yield(true)")
-(-> %) compiles to (Lua value "coroutine.yield(true, \(% as lua expr))")
-(for % in coroutine %co %body) compiles to (..)
-    Lua "\
-        ..for junk,\(% as lua expr) in coroutine.wrap(\(%co as lua expr)) do
-            \(%body as lua statements)
-        end"
+(-> %) compiles to "coroutine.yield(true, \((% as lua expr) if % else "nil"))"
+(for % in coroutine %co %body) compiles to "\
+    ..for _junk,\(% as lua expr) in coroutine.wrap(\(%co as lua expr)) do
+        \(%body as lua statements)
+    end"