Permalink
Browse files

* 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

fixes #125
  • Loading branch information...
1 parent 0c82d6d commit 803653a94027596864d8776e64807906fd44bb68 @tenderlove tenderlove committed Apr 5, 2013
Showing with 19 additions and 10 deletions.
  1. +8 −0 CHANGELOG.rdoc
  2. +0 −6 lib/psych.rb
  3. +7 −0 lib/psych/exception.rb
  4. +3 −4 lib/psych/syntax_error.rb
  5. +1 −0 lib/psych/visitors/to_ruby.rb
View
@@ -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:06:04 2013 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: correctly register
View
@@ -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.
View
@@ -0,0 +1,7 @@
+module Psych
+ class Exception < RuntimeError
+ end
+
+ class BadAlias < Exception
+ end
+end
@@ -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
@@ -1,4 +1,5 @@
require 'psych/scalar_scanner'
+require 'psych/exception'
unless defined?(Regexp::NOENCODING)
Regexp::NOENCODING = 32

0 comments on commit 803653a

Please sign in to comment.