Fix specs where proc passed to lambda stays a proc?

jruby · May 12, 2015 · 7e94aec · 7e94aec
1 parent 7c78686
commit 7e94aec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1268,7 +1268,10 @@ public static RubyProc proc(ThreadContext context, IRubyObject recv, Block block
 
     @JRubyMethod(module = true, visibility = PRIVATE)
     public static RubyProc lambda(ThreadContext context, IRubyObject recv, Block block) {
-        return context.runtime.newProc(Block.Type.LAMBDA, block);
+        // If we encounter a amp'd proc we leave it a proc for some reason.
+        Block.Type type = block.type == Block.Type.PROC ? block.type : Block.Type.LAMBDA;
+
+        return context.runtime.newProc(type, block);
     }
 
     @JRubyMethod(name = "proc", module = true, visibility = PRIVATE)

diff --git a/spec/tags/ruby/core/proc/hash_tags.txt b/spec/tags/ruby/core/proc/hash_tags.txt
diff --git a/spec/tags/ruby/core/proc/lambda_tags.txt b/spec/tags/ruby/core/proc/lambda_tags.txt