matz	2008-03-04 21:37:05 +0900 (Tue, 04 Mar 2008)

  New Revision: 15689

  Modified files:
    trunk/ChangeLog
    trunk/lib/irb/workspace.rb
    trunk/lib/irb.rb

  Log:
    * 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.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15689&r2=15688&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/irb/workspace.rb?r1=15689&r2=15688&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/irb.rb?r1=15689&r2=15688&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15688)
+++ ChangeLog	(revision 15689)
@@ -1,3 +1,11 @@
+Tue Mar  4 21:35:59 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* hash.c (rb_hash_aset): should not copy key string when
Index: lib/irb/workspace.rb
===================================================================
--- lib/irb/workspace.rb	(revision 15688)
+++ lib/irb/workspace.rb	(revision 15689)
@@ -93,8 +93,10 @@
 	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
Index: lib/irb.rb
===================================================================
--- lib/irb.rb	(revision 15688)
+++ lib/irb.rb	(revision 15689)
@@ -156,12 +156,13 @@
 	  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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/