usa	2008-01-31 17:31:20 +0900 (Thu, 31 Jan 2008)

  New Revision: 15358

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_marshal.rb
    trunk/marshal.c

  Log:
    * marshal.c (r_object0): no need to call r_entry for immediate values.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bootstraptest/test_marshal.rb?r1=15358&r2=15357&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15358&r2=15357&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/marshal.c?r1=15358&r2=15357&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15357)
+++ ChangeLog	(revision 15358)
@@ -1,3 +1,7 @@
+Thu Jan 31 17:30:42 2008  NAKAMURA Usaku  <usa@r...>
+
+	* marshal.c (r_object0): no need to call r_entry for immediate values.
+
 Thu Jan 31 15:46:30 2008  NAKAMURA Usaku  <usa@r...>
 
 	* lib/rdoc/ri/formatter.rb (output): add accessor.
Index: bootstraptest/test_marshal.rb
===================================================================
--- bootstraptest/test_marshal.rb	(revision 15357)
+++ bootstraptest/test_marshal.rb	(revision 15358)
@@ -1,5 +1,5 @@
 
 assert_normal_exit %q{
-  Marshal.load(Marshal.dump({"k"=>"v"}), lambda {|v| })
+  Marshal.load(Marshal.dump({"k"=>"v"}), lambda {|v| v})
 }
 
Index: marshal.c
===================================================================
--- marshal.c	(revision 15357)
+++ marshal.c	(revision 15358)
@@ -1208,19 +1208,16 @@
 
       case TYPE_NIL:
 	v = Qnil;
-	v = r_entry(v, arg);
 	v = r_leave(v, arg);
 	break;
 
       case TYPE_TRUE:
 	v = Qtrue;
-	v = r_entry(v, arg);
 	v = r_leave(v, arg);
 	break;
 
       case TYPE_FALSE:
 	v = Qfalse;
-	v = r_entry(v, arg);
 	v = r_leave(v, arg);
 	break;
 
@@ -1229,7 +1226,6 @@
 	    long i = r_long(arg);
 	    v = LONG2FIX(i);
 	}
-	v = r_entry(v, arg);
 	v = r_leave(v, arg);
 	break;
 
@@ -1505,7 +1501,6 @@
 
       case TYPE_SYMBOL:
 	v = ID2SYM(r_symreal(arg));
-	v = r_entry(v, arg);
 	v = r_leave(v, arg);
 	break;
 

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