1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/irb.rb (IRB::Irb::eval_input): SyntaxError should not be

considered as IRB bug.  [ruby-dev:33991]

* lib/irb/workspace.rb (IRB::WorkSpace::filter_backtrace): should
  filter 'irb.rb' as well for context mode 2 and 3.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-03-04 12:37:05 +00:00
parent a110ef359a
commit 772c19298d
3 changed files with 13 additions and 2 deletions

View file

@ -1,3 +1,11 @@
Tue Mar 4 21:35:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb.rb (IRB::Irb::eval_input): SyntaxError should not be
considered as IRB bug. [ruby-dev:33991]
* lib/irb/workspace.rb (IRB::WorkSpace::filter_backtrace): should
filter 'irb.rb' as well for context mode 2 and 3.
Tue Mar 4 19:10:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_aset): should not copy key string when

View file

@ -156,12 +156,13 @@ module IRB
end
if exc
print exc.class, ": ", exc, "\n"
if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/
if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
!(SyntaxError === exc)
irb_bug = true
else
irb_bug = false
end
messages = []
lasts = []
levels = 0

View file

@ -93,8 +93,10 @@ EOF
end
when 2
return nil if bt =~ /irb\/.*\.rb/
return nil if bt =~ /irb\.rb/
when 3
return nil if bt =~ /irb\/.*\.rb/
return nil if bt =~ /irb\.rb/
bt.sub!(/:\s*in `irb_binding'/, '')
end
bt