diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-31 08:31:20 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-31 08:31:20 +0000 |
commit | 1e3aa62254cb21f9e00dafb2d30e1447b6991024 (patch) | |
tree | 3e985f7862b8e4252823f8ea7c8f824b8ec7e519 | |
parent | 1672df18704da19c8abfa5c544de37790d1da19a (diff) |
* marshal.c (r_object0): no need to call r_entry for immediate values.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | bootstraptest/test_marshal.rb | 2 | ||||
-rw-r--r-- | marshal.c | 5 |
3 files changed, 5 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Thu Jan 31 17:30:42 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * marshal.c (r_object0): no need to call r_entry for immediate values. + Thu Jan 31 15:46:30 2008 NAKAMURA Usaku <usa@ruby-lang.org> * lib/rdoc/ri/formatter.rb (output): add accessor. diff --git a/bootstraptest/test_marshal.rb b/bootstraptest/test_marshal.rb index ecbcb60c91..7e34176169 100644 --- a/bootstraptest/test_marshal.rb +++ b/bootstraptest/test_marshal.rb @@ -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}) } @@ -1208,19 +1208,16 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) 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 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) long i = r_long(arg); v = LONG2FIX(i); } - v = r_entry(v, arg); v = r_leave(v, arg); break; @@ -1505,7 +1501,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) case TYPE_SYMBOL: v = ID2SYM(r_symreal(arg)); - v = r_entry(v, arg); v = r_leave(v, arg); break; |