From ceab1511da3ca41bcf24a3675513dd1ee2c0e193 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 08:24:56 +0000 Subject: merge revision(s) 17497: * lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip magic comment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/rdoc/parsers/parse_rb.rb | 8 ++++++-- version.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f6347f522..d8eee5fbd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 29 17:24:43 2008 Nobuyoshi Nakada + + * lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip + magic comment. + Sun Jun 29 17:22:09 2008 Nobuyoshi Nakada * ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index 58ba06084e..750c483c15 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -1546,10 +1546,15 @@ module RDoc 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 @@ module RDoc tk = get_tk end end - first_line = false end unget_tk(tk) res diff --git a/version.h b/version.h index 1bcb071a94..d6ea114592 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3