Merge pull request #6716 from dearblue/proc-identity

Fixes identity for proc object

mrbgems/mruby-proc-ext/src/proc.c

@@ -104,7 +104,7 @@ proc_inspect(mrb_state *mrb, mrb_value self)
 {
   struct RProc *p = mrb_proc_ptr(self);
   mrb_value str = mrb_str_new_lit(mrb, "#<Proc:");
-  mrb_str_cat_str(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(self)));
+  mrb_str_cat_str(mrb, str, mrb_ptr_to_str(mrb, p));
 
   if (!MRB_PROC_CFUNC_P(p)) {
     const mrb_irep *irep = p->body.irep;

src/proc.c

@@ -358,6 +358,7 @@ mrb_proc_eql(mrb_state *mrb, mrb_value self, mrb_value other)
   }
   else if (MRB_PROC_CFUNC_P(p2)) return FALSE;
   else if (p1->body.irep != p2->body.irep) return FALSE;
+  else if (MRB_PROC_ENV(p1) != MRB_PROC_ENV(p2)) return FALSE;
   return TRUE;
 }
 
@@ -371,7 +372,7 @@ static mrb_value
 proc_hash(mrb_state *mrb, mrb_value self)
 {
   const struct RProc *p = mrb_proc_ptr(self);
-  return mrb_int_value(mrb, (mrb_int)(((intptr_t)p->body.irep)^MRB_TT_PROC));
+  return mrb_int_value(mrb, (mrb_int)((intptr_t)p->body.irep^((intptr_t)MRB_PROC_ENV(p)>>2)^MRB_TT_PROC));
 }
 
 /* 15.3.1.2.6  */

test/t/proc.rb

@@ -178,3 +178,21 @@ assert('Creation of a proc through the block of a method') do
     m{ break }.call
   end
 end
+
+assert('identity check for proc object') do
+  b = []
+  t = 2
+  while t > 0
+    b << ->{}
+    t -= 1
+  end
+  assert_true b[0] == b[1]
+  assert_equal b[0].hash, b[1].hash
+
+  b = []
+  2.times {
+    b << ->{}
+  }
+  assert_false b[0] == b[1]
+  assert_not_equal b[0].hash, b[1].hash
+end