A proc call can use an implicit block. Fixes #3202.

rubinius · Apr 8, 2016 · a31755a · a31755a
1 parent b8c365d
commit a31755a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/core/kernel.rb b/core/kernel.rb
@@ -725,9 +725,29 @@ def private_singleton_methods
   end
   private :private_singleton_methods
 
-  def proc(&prc)
-    raise ArgumentError, "block required" unless prc
-    return prc
+  def proc
+    env = nil
+
+    Rubinius.asm do
+      push_block
+      # assign a pushed block to the above local variable "env"
+      set_local 0
+    end
+
+    unless env
+      # Support for ancient pre-block-pass style:
+      # def something
+      #   proc
+      # end
+      # something { a_block } => Proc instance
+      env = Rubinius::BlockEnvironment.of_sender
+
+      unless env
+        raise ArgumentError, "tried to create a Proc object without a block"
+      end
+    end
+
+    Proc.new(&env)
   end
   module_function :proc
 

diff --git a/spec/tags/ruby/core/kernel/proc_tags.txt b/spec/tags/ruby/core/kernel/proc_tags.txt