yugui	2010-01-30 21:46:10 +0900 (Sat, 30 Jan 2010)

  New Revision: 26480

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26480

  Log:
    merges r25297 from trunk into ruby_1_9_1.
    and another fix for [ruby-core:26047].
    --
    * lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
      attr_reader.  [ruby-core:26047]
    
    * lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
      character class range.
    --
    * lib/irb/extend-command.rb (IRB::def_extend_command): [ruby-core:26047]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/irb/context.rb
    branches/ruby_1_9_1/lib/irb/extend-command.rb
    branches/ruby_1_9_1/lib/irb/ruby-lex.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26479)
+++ ruby_1_9_1/ChangeLog	(revision 26480)
@@ -1,3 +1,11 @@
+Sun Oct 11 10:27:09 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
+	  attr_reader.  [ruby-core:26047]
+
+	* lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
+	  character class range.
+
 Sun Oct 11 09:04:08 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc
Index: ruby_1_9_1/lib/irb/context.rb
===================================================================
--- ruby_1_9_1/lib/irb/context.rb	(revision 26479)
+++ ruby_1_9_1/lib/irb/context.rb	(revision 26480)
@@ -163,8 +163,6 @@
       @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
     end
 
-    attr_reader :irb_name
-
     def prompt_mode=(mode)
       @prompt_mode = mode
       pconf = IRB.conf[:PROMPT][mode]
Index: ruby_1_9_1/lib/irb/extend-command.rb
===================================================================
--- ruby_1_9_1/lib/irb/extend-command.rb	(revision 26479)
+++ ruby_1_9_1/lib/irb/extend-command.rb	(revision 26480)
@@ -131,7 +131,7 @@
 	      args << "*opts"
 	      arity = -arity - 1
 	    end
-	    args.unshift *(1..arity).map {|i| "arg" + i.to_s }
+	    args.unshift(*(1..arity).map {|i| "arg" + i.to_s })
 	    args << "&block"
 	    args = args.join(", ")
 	    eval <<-"EOS2", binding, __FILE__, __LINE__+1
Index: ruby_1_9_1/lib/irb/ruby-lex.rb
===================================================================
--- ruby_1_9_1/lib/irb/ruby-lex.rb	(revision 26479)
+++ ruby_1_9_1/lib/irb/ruby-lex.rb	(revision 26480)
@@ -705,7 +705,7 @@
 
     @OP.def_rule('@') do
       |op, io|
-      if peek(0) =~ /[\w_@]/
+      if peek(0) =~ /[\w@]/
 	ungetc
 	identify_identifier
       else
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26479)
+++ ruby_1_9_1/version.h	(revision 26480)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 385
+#define RUBY_PATCHLEVEL 386
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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