yugui	2010-10-23 18:37:26 +0900 (Sat, 23 Oct 2010)

  New Revision: 29568

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

  Log:
    merges r29140 and r29141 from trunk into ruby_1_9_2.
    --
    * lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
      name signleton class.  [Bug #3759], [ruby-dev:42154]
    --
    * lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
      include assignment.  [Bug #3759], [ruby-dev:42154]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/rdoc/parser/ruby.rb
    branches/ruby_1_9_2/test/rdoc/test_rdoc_parser_ruby.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29567)
+++ ruby_1_9_2/ChangeLog	(revision 29568)
@@ -1,3 +1,11 @@
+Sun Aug 29 23:54:10 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
+	  include assignment.  [Bug #3759], [ruby-dev:42154]
+
+	* lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
+	  name signleton class.  [Bug #3759], [ruby-dev:42154]
+
 Sat Sep 25 22:48:30 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (LIBRUBY_DLDFLAGS): fix quoting.
Index: ruby_1_9_2/lib/rdoc/parser/ruby.rb
===================================================================
--- ruby_1_9_2/lib/rdoc/parser/ruby.rb	(revision 29567)
+++ ruby_1_9_2/lib/rdoc/parser/ruby.rb	(revision 29568)
@@ -526,7 +526,7 @@
         else
           break unless @scanner.continue
         end
-      when TkCOMMENT
+      when TkCOMMENT, TkASSIGN, TkOPASGN
         unget_tk(tk)
         break
       when nil then
@@ -568,7 +568,7 @@
       case name = get_class_specification
       when "self", container.name
         parse_statements container, SINGLE
-      else
+      when /\A[A-Z]/
         other = RDoc::TopLevel.find_class_named name
 
         unless other then
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29567)
+++ ruby_1_9_2/version.h	(revision 29568)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 21
+#define RUBY_PATCHLEVEL 22
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/rdoc/test_rdoc_parser_ruby.rb
===================================================================
--- ruby_1_9_2/test/rdoc/test_rdoc_parser_ruby.rb	(revision 29567)
+++ ruby_1_9_2/test/rdoc/test_rdoc_parser_ruby.rb	(revision 29568)
@@ -429,6 +429,8 @@
 class A
   class << B
   end
+  class << d = Object.new
+  end
 end
     CODE
 

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