diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-20 02:40:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-20 02:40:15 +0000 |
| commit | d4e661b4ad7589eb0656e92bc4b702b499a65cd1 (patch) | |
| tree | c110162265f9e79c0d4dc84323effd517757e91b | |
| parent | 43920ad28c013f4b60799893942870ef9f1e9fc9 (diff) | |
* lib/yaml.rb (YAML::YAML): adjust Marshal version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/yaml.rb | 8 | ||||
| -rw-r--r-- | lib/yaml/rubytypes.rb | 7 |
3 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,7 @@ +Sat Dec 20 11:40:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/yaml.rb (YAML::YAML): adjust Marshal version. + Sat Dec 20 02:41:02 2003 GOTOU Yuuzou <gotoyuzo@notwork.org> * lib/webrick/cgi.rb: add file. (yet another CGI library) @@ -14,7 +18,7 @@ Sat Dec 20 02:18:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Dec 19 21:24:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org> - * lib/webrick/httprequest.rb (meta_vers): should not set + * lib/webrick/httprequest.rb (meta_vers): should not set HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH. * lib/webrick/https.rb (HTTPRequest#parse): should check presence diff --git a/lib/yaml.rb b/lib/yaml.rb index d33f2e202a..e89171f205 100644 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -1,4 +1,4 @@ -# vim:sw=4:ts=4 +# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4 # $Id$ # # YAML.rb @@ -152,15 +152,15 @@ module YAML def YAML.object_maker( obj_class, val, is_attr = false ) if Hash === val name = obj_class.name - ostr = sprintf( "\004\006o:%c%s\000", name.length + 5, name ) + ostr = sprintf( "%c%co:%c%s\000", Marshal::MAJOR_VERSION, Marshal::MINOR_VERSION, + name.length + 5, name ) if is_attr ostr[ -1, 1 ] = Marshal.dump( val ).sub( /^[^{]+\{/, '' ) - p ostr end o = ::Marshal.load( ostr ) unless is_attr val.each_pair { |k,v| - o.instance_eval "@#{k} = v" + o.instance_variable_set("@#{k}", v) } end o diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb index a29c4fda8b..0e5d5b17d6 100644 --- a/lib/yaml/rubytypes.rb +++ b/lib/yaml/rubytypes.rb @@ -1,3 +1,4 @@ +# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4 require 'date' # # Type conversions @@ -23,7 +24,7 @@ class Object YAML::quick_emit( self.object_id, opts ) { |out| out.map( self.to_yaml_type ) { |map| to_yaml_properties.each { |m| - map.add( m[1..-1], instance_eval( m ) ) + map.add( m[1..-1], instance_variable_get( m ) ) } } } @@ -253,7 +254,7 @@ class Exception out.map( self.to_yaml_type ) { |map| map.add( 'message', self.message ) to_yaml_properties.each { |m| - map.add( m[1..-1], instance_eval( m ) ) + map.add( m[1..-1], instance_variable_get( m ) ) } } } @@ -264,7 +265,7 @@ YAML.add_ruby_type( /^exception/ ) { |type, val| type, obj_class = YAML.read_type_class( type, Exception ) o = YAML.object_maker( obj_class, { 'mesg' => val.delete( 'message' ) }, true ) val.each_pair { |k,v| - o.instance_eval "@#{k} = v" + o.instance_variable_set("@#{k}", v) } o } |