Merge pull request #718 from krekoten/proc_call

Proc#call when self is lambda
topazproject · May 20, 2013 · ae837696161f6096ce410b9d39dd87dbd58fc59c · ae83769
2 parents cf8b9f6 + bba7edf
commit ae837696161f6096ce410b9d39dd87dbd58fc59c
Unified Split

Showing with 5 additions and 10 deletions.

+0 −2 spec/tags/core/proc/call_tags.txt

+0 −2 spec/tags/core/proc/case_compare_tags.txt

+0 −2 spec/tags/core/proc/element_reference_tags.txt

+0 −2 spec/tags/core/proc/yield_tags.txt

+5 −2 topaz/objspace.py
diff --git a/spec/tags/core/proc/call_tags.txt b/spec/tags/core/proc/call_tags.txt
diff --git a/spec/tags/core/proc/case_compare_tags.txt b/spec/tags/core/proc/case_compare_tags.txt
diff --git a/spec/tags/core/proc/element_reference_tags.txt b/spec/tags/core/proc/element_reference_tags.txt
diff --git a/spec/tags/core/proc/yield_tags.txt b/spec/tags/core/proc/yield_tags.txt
diff --git a/topaz/objspace.py b/topaz/objspace.py
@@ -639,8 +639,11 @@ def invoke_block(self, block, args_w, block_arg=None):
             block=block.block, parent_interp=block.parent_interp,
             regexp_match_cell=block.regexp_match_cell,
         )
-        if len(bc.arg_pos) != 0 or bc.splat_arg_pos != -1 or bc.block_arg_pos != -1:
-            frame.handle_block_args(self, bc, args_w, block_arg)
+        if block.is_lambda:
+            frame.handle_args(self, bc, args_w, block_arg)
+        else:
+            if len(bc.arg_pos) != 0 or bc.splat_arg_pos != -1 or bc.block_arg_pos != -1:
+                frame.handle_block_args(self, bc, args_w, block_arg)
         assert len(block.cells) == len(bc.freevars)
         for i in xrange(len(bc.freevars)):
             frame.cells[len(bc.cellvars) + i] = block.cells[i]