diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-03-23 11:02:41 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-03-23 11:02:41 -0700 |
commit | 8be32c99e14b9d5cbb6499411c58c41558a0ef31 (patch) | |
tree | b3627773cf52d66380b13a4a977793bb3c856e4d /lib | |
parent | 668fbbe73c6706b40060f457418b8045c16a667b (diff) | |
download | psych-8be32c99e14b9d5cbb6499411c58c41558a0ef31.zip |
adding tests and fixing bugs with ruby symbols. thanks Peter McLain!
Diffstat (limited to 'lib')
-rw-r--r-- | lib/psych/visitors/to_ruby.rb | 6 | ||||
-rw-r--r-- | lib/psych/visitors/yaml_tree.rb | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb index 1289ff9..2790cde 100644 --- a/lib/psych/visitors/to_ruby.rb +++ b/lib/psych/visitors/to_ruby.rb @@ -74,6 +74,8 @@ module Psych } args.push(args.delete_at(1) == '...') Range.new(*args) + when /^!ruby\/sym(bol)?:?(.*)?$/ + o.value.to_sym else @ss.tokenize o.value end @@ -170,7 +172,9 @@ module Psych when /^!ruby\/object:?(.*)?$/ name = $1 || 'Object' - revive((resolve_class(name) || Object), o) + obj = revive((resolve_class(name) || Object), o) + @st[o.anchor] = obj if o.anchor + obj else hash = {} @st[o.anchor] = hash if o.anchor diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index 83f11bf..523cfe1 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -54,6 +54,7 @@ module Psych end map = append Nodes::Mapping.new(nil, tag, false) + register(o, map) @stack.push map dump_ivars(o, map) |