diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/psych/lib/psych.rb | 6 | ||||
| -rw-r--r-- | ext/psych/lib/psych/exception.rb | 7 | ||||
| -rw-r--r-- | ext/psych/lib/psych/syntax_error.rb | 7 | ||||
| -rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 1 |
5 files changed, 19 insertions, 10 deletions
@@ -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 index 3ca6117484..7d7d2bfb00 100644 --- 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 new file mode 100644 index 0000000000..d96c527cfb --- /dev/null +++ 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 index f972256f9e..e200ef0060 100644 --- 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 index b59bc38830..75c7bc0c55 100644 --- 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 |