4 commits

Author	SHA1	Message	Date
tenderlove	dc22968239	* 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	2011-07-18 04:38:37 +00:00
tenderlove	9e448999a0	converting require_relative to just regular requires ... git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e	2011-03-30 03:38:53 +00:00
tenderlove	6e5aa6311a	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support ... when multiple merge keys are specified. * test/psych/test_merge_keys.rb: tests for multi-merge key support git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e	2011-01-22 02:51:14 +00:00
tenderlove	5b1c06c74b	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually ... part of YAML 1.1, so they should be supported. Remove warning and merge keys to parent. [ruby-core:34679] * test/psych/test_merge_keys.rb: test for merge keys git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e	2011-01-22 02:34:50 +00:00