diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-18 04:38:37 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-18 04:38:37 +0000 |
commit | dc22968239d57dddbfb5ef33ff07d013e7518611 (patch) | |
tree | 2da9454b6890037a3ca05abbb7e297a12417d05d /ext/psych | |
parent | d95cb162340c4b769397569b1e0760d226c054f6 (diff) | |
download | ruby-dc22968239d57dddbfb5ef33ff07d013e7518611.tar.gz |
* ext/psych/lib/psych.rb: define a new BadAlias error class.
* ext/psych/lib/psych/visitors/to_ruby.rb: raise an exception when
deserializing an alias that does not exist.
* test/psych/test_merge_keys.rb: corresponding test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych')
-rw-r--r-- | ext/psych/lib/psych.rb | 3 | ||||
-rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 31d73c1f03..8a4d63a49c 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -98,6 +98,9 @@ module Psych class Exception < RuntimeError end + class BadAlias < Exception + end + autoload :Stream, 'psych/stream' ### diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index b8eb698754..fd899f65a6 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -201,7 +201,7 @@ module Psych end def visit_Psych_Nodes_Alias o - @st[o.anchor] + @st.fetch(o.anchor) { raise BadAlias, "Unknown alias: #{o.anchor}" } end private |