shyouhei	2008-06-29 17:24:56 +0900 (Sun, 29 Jun 2008)

  New Revision: 17668

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/rdoc/parsers/parse_rb.rb
    branches/ruby_1_8_7/version.h

  Log:
    merge revision(s) 17497:
    * lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
      magic comment.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/lib/rdoc/parsers/parse_rb.rb?r1=17668&r2=17667&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17668&r2=17667&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17668&r2=17667&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17667)
+++ ruby_1_8_7/ChangeLog	(revision 17668)
@@ -1,3 +1,8 @@
+Sun Jun 29 17:24:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
+	  magic comment.
+
 Sun Jun 29 17:22:09 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17667)
+++ ruby_1_8_7/version.h	(revision 17668)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 27
+#define RUBY_PATCHLEVEL 28
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/rdoc/parsers/parse_rb.rb
===================================================================
--- ruby_1_8_7/lib/rdoc/parsers/parse_rb.rb	(revision 17667)
+++ ruby_1_8_7/lib/rdoc/parsers/parse_rb.rb	(revision 17668)
@@ -1546,10 +1546,15 @@
 
       tk = get_tk
       while tk.kind_of?(TkCOMMENT)
-        if first_line && tk.text[0,2] == "#!"
+        if first_line && /\A#!/ =~ tk.text
           skip_tkspace
           tk = get_tk
+        elsif first_line && /\A#\s*-\*-/ =~ tk.text
+          first_line = false
+          skip_tkspace
+          tk = get_tk
         else
+          first_line = false
           res << tk.text << "\n"
           tk = get_tk
           if tk.kind_of? TkNL
@@ -1557,7 +1562,6 @@
             tk = get_tk
           end
         end
-        first_line = false
       end
       unget_tk(tk)
       res

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