* ext/psych/lib/psych/exception.rb: there should be only one exception

tenderlove · tenderlove · commit 476a62fbbec0 · 2013-04-05T17:55:53.000Z
base class. Fixes tenderlove/psych #125 * ext/psych/lib/psych.rb: require the correct exception class * ext/psych/lib/psych/syntax_error.rb: ditto * ext/psych/lib/psych/visitors/to_ruby.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Apr  6 02:54:08 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/exception.rb: there should be only one exception
+	  base class. Fixes tenderlove/psych #125
+	* ext/psych/lib/psych.rb: require the correct exception class
+	* ext/psych/lib/psych/syntax_error.rb: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ditto
+
 Sat Apr  6 02:30:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (new_defined): remove all extra parentheses, and return
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
@@ -221,12 +221,6 @@ module Psych
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
 
-  class Exception < RuntimeError
-  end
-
-  class BadAlias < Exception
-  end
-
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
diff --git a/ext/psych/lib/psych/exception.rb b/ext/psych/lib/psych/exception.rb
@@ -0,0 +1,7 @@
+module Psych
+  class Exception < RuntimeError
+  end
+
+  class BadAlias < Exception
+  end
+end
diff --git a/ext/psych/lib/psych/syntax_error.rb b/ext/psych/lib/psych/syntax_error.rb
@@ -1,8 +1,7 @@
-module Psych
-  class Error < RuntimeError
-  end
+require 'psych/exception'
 
-  class SyntaxError < Error
+module Psych
+  class SyntaxError < Psych::Exception
     attr_reader :file, :line, :column, :offset, :problem, :context
 
     def initialize file, line, col, offset, problem, context
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -1,4 +1,5 @@
 require 'psych/scalar_scanner'
+require 'psych/exception'
 
 unless defined?(Regexp::NOENCODING)
   Regexp::NOENCODING = 32

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require 'psych/scalar_scanner'`
	`2`	`+require 'psych/exception'`
`2`	`3`
`3`	`4`	`unless defined?(Regexp::NOENCODING)`
`4`	`5`	`Regexp::NOENCODING = 32`