shyouhei	2008-06-16 15:42:38 +0900 (Mon, 16 Jun 2008)

  New Revision: 17357

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/eval.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16514:
    * proc.c (proc_dup): should copy safe_level from src proc
      properly.  a patch from Keita Yamaguchi
      <keita.yamaguchi at gmail.com>


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17357&r2=17356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17357&r2=17356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/eval.c?r1=17357&r2=17356&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17356)
+++ ruby_1_8_5/ChangeLog	(revision 17357)
@@ -1,3 +1,9 @@
+Mon Jun 16 15:40:37 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* proc.c (proc_dup): should copy safe_level from src proc
+	  properly.  a patch from Keita Yamaguchi
+	  <keita.yamaguchi at gmail.com>
+
 Sun Jun 15 23:31:10 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17356)
+++ ruby_1_8_5/version.h	(revision 17357)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2008-06-15"
+#define RUBY_RELEASE_DATE "2008-06-16"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 220
+#define RUBY_RELEASE_CODE 20080616
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 16
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_5/eval.c
===================================================================
--- ruby_1_8_5/eval.c	(revision 17356)
+++ ruby_1_8_5/eval.c	(revision 17357)
@@ -8251,16 +8251,25 @@
  * MISSING: documentation
  */
 
+#define PROC_TSHIFT (FL_USHIFT+1)
+#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
+#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
+
+static int proc_get_safe_level(VALUE);
+
 static VALUE
 proc_dup(self)
     VALUE self;
 {
     struct BLOCK *orig, *data;
     VALUE bind;
+    int safe = proc_get_safe_level(self);
 
     Data_Get_Struct(self, struct BLOCK, orig);
     bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
     blk_dup(data, orig);
+    if (safe > PROC_TMAX) safe = PROC_TMAX;
+    FL_SET(bind, (safe << PROC_TSHIFT) & PROC_TMASK);
 
     return bind;
 }
@@ -8322,10 +8331,6 @@
     return bind;
 }
 
-#define PROC_TSHIFT (FL_USHIFT+1)
-#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
-#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
-
 #define SAFE_LEVEL_MAX PROC_TMASK
 
 static void

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/