diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2009-12-17 09:48:38 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2009-12-17 09:48:38 -0800 |
commit | cb8c3eb5a62c792d657eb7318d033ef52d2127a3 (patch) | |
tree | 428d6067f4a475d8ae97ec09bcf21f53f49ea5c5 /lib | |
parent | 31126b53bbe0d88f0c1050f81ce88f847c13b5d3 (diff) | |
download | psych-cb8c3eb5a62c792d657eb7318d033ef52d2127a3.zip |
testing self referential structs
Diffstat (limited to 'lib')
-rw-r--r-- | lib/psych/visitors/to_ruby.rb | 10 | ||||
-rw-r--r-- | lib/psych/visitors/yaml_tree.rb | 28 |
2 files changed, 23 insertions, 15 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb index aed56ed..cadb8cf 100644 --- a/lib/psych/visitors/to_ruby.rb +++ b/lib/psych/visitors/to_ruby.rb @@ -67,8 +67,6 @@ module Psych end def visit_Psych_Nodes_Sequence o - list = [] - @st[o.anchor] = list if o.anchor case o.tag when '!omap', 'tag:yaml.org,2002:omap' map = Psych::Omap.new @@ -78,6 +76,8 @@ module Psych } map else + list = [] + @st[o.anchor] = list if o.anchor o.children.each { |c| list.push accept c } list end @@ -95,10 +95,13 @@ module Psych string when /!ruby\/struct:?(.*)?$/ klass = resolve_class($1) - members = o.children.map { |c| accept c } if klass s = klass.allocate + @st[o.anchor] = s if o.anchor + + members = o.children.map { |c| accept c } + struct_members = s.members.map { |x| x.to_sym } members.each_slice(2) { |k,v| if struct_members.include? k.to_sym @@ -109,6 +112,7 @@ module Psych } s else + members = o.children.map { |c| accept c } h = Hash[*members] Struct.new(*h.map { |k,v| k.to_sym }).new(*h.map { |k,v| v }) end diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index 995a890..e4e6947 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -15,17 +15,23 @@ module Psych target.class.ancestors.each do |klass| next unless klass.name method_name = :"visit_#{klass.name.split('::').join('_')}" - return send(method_name, target) if respond_to?(method_name) + + if respond_to?(method_name) + + # return any aliases we find + if node = @st[target.object_id] + node.anchor = target.object_id.to_s + return append Nodes::Alias.new target.object_id.to_s + end + + return send(method_name, target) + end + end raise TypeError, "Can't dump #{target.class}" end def visit_Psych_Set o - if node = @st[o.object_id] - node.anchor = o.object_id.to_s - return append Nodes::Alias.new o.object_id.to_s - end - map = Nodes::Mapping.new(nil, '!set', false) @st[o.object_id] = map @@ -40,11 +46,6 @@ module Psych end def visit_Psych_Omap o - if node = @st[o.object_id] - node.anchor = o.object_id.to_s - return append Nodes::Alias.new o.object_id.to_s - end - seq = Nodes::Sequence.new(nil, '!omap', false) @st[o.object_id] = seq @@ -75,7 +76,10 @@ module Psych def visit_Struct o tag = ['!ruby/struct', o.class.name].compact.join(':') - @stack.push append Nodes::Mapping.new(nil, tag, false) + map = Nodes::Mapping.new(nil, tag, false) + @st[o.object_id] = map + + @stack.push append map o.members.each do |member| accept member accept o[member] |