From bd810795c589a81e8939b53ad921f823e7133ee9 Mon Sep 17 00:00:00 2001 From: why Date: Tue, 13 May 2003 06:34:18 +0000 Subject: * lib/yaml/rubytypes.rb: object and struct loading * lib/yaml.rb: YAML::detect_implicit will discover typing for a Ruby string * ext/syck/: Fixed portable comments, misuse of NULL and methods without return VALUEs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/yaml/rubytypes.rb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'lib/yaml') diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb index 727c31ca78..3d4992a29f 100644 --- a/lib/yaml/rubytypes.rb +++ b/lib/yaml/rubytypes.rb @@ -160,25 +160,18 @@ class Struct end YAML.add_ruby_type( 'struct' ) { |type, val| - type =~ /^struct:(\w+)/ if Hash === val - type = $1 - struct_type = nil - struct_def = [] - struct_name = "" - if $1.to_s.length > 1 - struct_name = $1[0..$1.length] - struct_def << struct_name - end + struct_type = nil # # Use existing Struct if it exists # begin - struct_type = Struct.const_get( struct_name ) + struct_name, struct_type = YAML.read_type_class( type, Struct ) rescue NameError end if not struct_type + struct_def = [ type.split( ':', 4 ).last ] struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) ) end -- cgit v1.2.3