Generate opt args in def before outputting vars to avoid missed yields

opal · Oct 23, 2013 · b069185 · b069185
1 parent 49aaf1c
commit b069185
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/lib/opal/nodes/def.rb b/lib/opal/nodes/def.rb
@@ -59,21 +59,20 @@ def compile
 
           line "#{splat} = $slice.call(arguments, #{argc});" if splat
 
-          scope_name = scope.identity
-
-          if scope.uses_block?
-            add_temp "$iter = #{scope_name}._p"
-            add_temp "#{yielder} = $iter || nil"
-          end
-
           opt[1..-1].each do |o|
             next if o[2][2] == :undefined
             line "if (#{variable(o[1])} == null) {"
             line '  ', expr(o)
             line "}"
           end if opt
 
+          # must do this after opt args incase opt arg uses yield
+          scope_name = scope.identity
+
           if scope.uses_block?
+            add_temp "$iter = #{scope_name}._p"
+            add_temp "#{yielder} = $iter || nil"
+
             line "#{scope_name}._p = null;"
           end