summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoe Rafaniello <jrafanie@gmail.com>2012-07-13 13:14:10 -0400
committerJoe Rafaniello <jrafanie@gmail.com>2012-07-13 18:07:40 -0400
commit4027c6ddd0fc91d301dc80814884a220be774a0a (patch)
tree757add21f1dcd48f13958184b20c43d1a5eb9c6a /lib
parent81ff3dedbb72bfc0dccbb60b7ed079a1f9068de1 (diff)
downloadpsych-4027c6ddd0fc91d301dc80814884a220be774a0a.zip
From yaml, register a newly created String with aliases. To yaml, register Strings containing ivars with aliases.
Diffstat (limited to 'lib')
-rw-r--r--lib/psych/visitors/to_ruby.rb1
-rw-r--r--lib/psych/visitors/yaml_tree.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index eb4bab7..088301a 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/lib/psych/visitors/to_ruby.rb
@@ -148,6 +148,7 @@ module Psych
if klass
string = klass.allocate.replace string
+ register(o, string)
end
init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb
index 646fed7..948a976 100644
--- a/lib/psych/visitors/yaml_tree.rb
+++ b/lib/psych/visitors/yaml_tree.rb
@@ -254,7 +254,7 @@ module Psych
maptag = '!ruby/string'
maptag << ":#{o.class}" unless o.class == ::String
- @emitter.start_mapping nil, maptag, false, Nodes::Mapping::BLOCK
+ register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
@emitter.scalar 'str', nil, nil, true, false, Nodes::Scalar::ANY
@emitter.scalar str, nil, tag, plain, quote, style