archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r29140 and r29141 from trunk into ruby_1_9_2.

Browse source 
--
* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-10-23 09:37:26 +00:00
parent 8ebcdf9ddf
commit 0d069bd2df
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Aug 29 23:54:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Sat Sep 25 22:48:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBRUBY_DLDFLAGS): fix quoting. * configure.in (LIBRUBY_DLDFLAGS): fix quoting.

4
lib/rdoc/parser/ruby.rb
View file

@ -526,7 +526,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
else else
break unless @scanner.continue break unless @scanner.continue
end end
when TkCOMMENT when TkCOMMENT, TkASSIGN, TkOPASGN
unget_tk(tk) unget_tk(tk)
break break
when nil then when nil then
@ -568,7 +568,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
case name = get_class_specification case name = get_class_specification
when "self", container.name when "self", container.name
parse_statements container, SINGLE parse_statements container, SINGLE
else when /\A[A-Z]/
other = RDoc::TopLevel.find_class_named name other = RDoc::TopLevel.find_class_named name
unless other then unless other then

2
test/rdoc/test_rdoc_parser_ruby.rb
View file

@ -429,6 +429,8 @@ end
class A class A
class << B class << B
end end
class << d = Object.new
end
end end
CODE CODE

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 21 #define RUBY_PATCHLEVEL 22
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1