diff options
author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-16 19:08:03 +0000 |
---|---|---|
committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-16 19:08:03 +0000 |
commit | abe1214b3dd57b3a24d722ba592146db8eaabd40 (patch) | |
tree | 5fbc86b061de7618c69e6469d18805f6b376cc1d /lib/rexml/parseexception.rb | |
parent | db0fac02665cb9e1e638959733e9572c845b4710 (diff) |
Cross-ported the REXML changes (3.0.8) from the development branch to the
stable branch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/parseexception.rb')
-rw-r--r-- | lib/rexml/parseexception.rb | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb index 66a4214548..feb7a7e638 100644 --- a/lib/rexml/parseexception.rb +++ b/lib/rexml/parseexception.rb @@ -1,49 +1,51 @@ module REXML - class ParseException < RuntimeError - attr_accessor :source, :parser, :continued_exception + class ParseException < RuntimeError + attr_accessor :source, :parser, :continued_exception - def initialize( message, source=nil, parser=nil, exception=nil ) - super(message) - @source = source - @parser = parser - @continued_exception = exception - end + def initialize( message, source=nil, parser=nil, exception=nil ) + super(message) + @source = source + @parser = parser + @continued_exception = exception + end - def to_s - # Quote the original exception, if there was one - if @continued_exception - err = @continued_exception.inspect - err << "\n" - err << @continued_exception.backtrace.join("\n") - err << "\n...\n" - else - err = "" - end + def to_s + # Quote the original exception, if there was one + if @continued_exception + err = @continued_exception.inspect + err << "\n" + err << @continued_exception.backtrace.join("\n") + err << "\n...\n" + else + err = "" + end - # Get the stack trace and error message - err << super + # Get the stack trace and error message + err << super - # Add contextual information - if @source - err << "\nLine: #{line}\n" - err << "Position: #{position}\n" - err << "Last 80 unconsumed characters:\n" - err << @source.buffer[0..80].gsub(/\n/, ' ') - end - - err - end + # Add contextual information + if @source + err << "\nLine: #{line}\n" + err << "Position: #{position}\n" + err << "Last 80 unconsumed characters:\n" + err << @source.buffer[0..80].gsub(/\n/, ' ') + end + + err + end - def position - @source.current_line[0] if @source and @source.current_line - end + def position + @source.current_line[0] if @source and defined? @source.current_line and + @source.current_line + end - def line - @source.current_line[2] if @source and @source.current_line - end + def line + @source.current_line[2] if @source and defined? @source.current_line and + @source.current_line + end - def context - @source.current_line - end - end + def context + @source.current_line + end + end end |