1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/delegate.rb (Delegator#marshal_dump): exclude

Browse Source 
delegator-specific instance variables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-02-02 02:14:00 +00:00
parent 9f714e35ec
commit bafb881c1f
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Feb 2 11:13:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/delegate.rb (Delegator#marshal_dump): exclude
delegator-specific instance variables.
Mon Feb 1 21:26:41 2010 Yusuke Endoh <mame@tsg.ne.jp> Mon Feb 1 21:26:41 2010 Yusuke Endoh <mame@tsg.ne.jp>
* lib/matrix.rb (Vector#each2): returns a self. [ruby-dev:40241] * lib/matrix.rb (Vector#each2): returns a self. [ruby-dev:40241]

4
lib/delegate.rb
View File

@ -183,10 +183,10 @@ class Delegator
# Serialization support for the object returned by \_\_getobj\_\_. # Serialization support for the object returned by \_\_getobj\_\_.
def marshal_dump def marshal_dump
ivars = instance_variables.reject {|var| /\A@delegate_/ =~ var}
[ [
:__v2__, :__v2__,
instance_variables, ivars, ivars.map{|var| instance_variable_get(var)},
instance_variables.map{|var| instance_variable_get(var)},
__getobj__ __getobj__
] ]
end end

4
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2010-02-01" #define RUBY_RELEASE_DATE "2010-02-02"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 1 #define RUBY_RELEASE_DAY 2
#include "ruby/version.h" #include "ruby/version.h"