kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix 1.9 warnings in RDoc

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2007-12-23 07:13:09 +00:00
parent 0ef8ed93bc
commit edfcee2bd2
6 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Dec 23 16:12:40 2007 Eric Hodel <drbrain@segment7.net>
* lib/rdoc: Fix 1.9 warnings.
Sun Dec 23 15:28:37 2007 Eric Hodel <drbrain@segment7.net> Sun Dec 23 15:28:37 2007 Eric Hodel <drbrain@segment7.net>
* lib/rubygems, test/rubygems: Fix new 1.9 warnings. * lib/rubygems, test/rubygems: Fix new 1.9 warnings.

5
lib/rdoc/code_objects.rb
View file

@ -126,6 +126,7 @@ module RDoc
@title = title @title = title
@@sequence.succ! @@sequence.succ!
@sequence = @@sequence.dup @sequence = @@sequence.dup
@comment = nil
set_comment(comment) set_comment(comment)
end end
@ -385,8 +386,8 @@ module RDoc
module_name = modules.shift module_name = modules.shift
result = find_module_named(module_name) result = find_module_named(module_name)
if result if result
modules.each do |module_name| modules.each do |name|
result = result.find_module_named(module_name) result = result.find_module_named(name)
break unless result break unless result
end end
end end

4
lib/rdoc/diagram.rb
View file

@ -140,8 +140,8 @@ module RDoc
graph << m graph << m
unless mod.includes.empty? unless mod.includes.empty?
mod.includes.each do |m| mod.includes.each do |inc|
m_full_name = find_full_name(m.name, mod) m_full_name = find_full_name(inc.name, mod)
if @local_names.include?(m_full_name) if @local_names.include?(m_full_name)
@global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}", @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
'to' => "#{mod.full_name.gsub( /:/,'_' )}", 'to' => "#{mod.full_name.gsub( /:/,'_' )}",

2
lib/rdoc/parsers/parse_c.rb
View file

@ -166,7 +166,7 @@ module RDoc
class C_Parser class C_Parser
attr_accessor :progress attr_writer :progress
extend ParserFactory extend ParserFactory
parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/) parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)

9
lib/rdoc/parsers/parse_rb.rb
View file

@ -38,7 +38,7 @@ module RubyToken
class Token class Token
NO_TEXT = "??".freeze NO_TEXT = "??".freeze
attr :text attr_accessor :text
def initialize(line_no, char_no) def initialize(line_no, char_no)
@line_no = line_no @line_no = line_no
@ -53,7 +53,7 @@ module RubyToken
self self
end end
attr_reader :line_no, :char_no, :text attr_reader :line_no, :char_no
end end
class TkNode < Token class TkNode < Token
@ -1934,9 +1934,8 @@ module RDoc
meth.singleton = true meth.singleton = true
else else
unget_tk dot unget_tk dot
back_tk.reverse_each do back_tk.reverse_each do |token|
|tk| unget_tk token
unget_tk tk
end end
name = name_t.name name = name_t.name

2
lib/rdoc/ri/ri_paths.rb
View file

@ -55,7 +55,7 @@ module RI
def self.path(use_system, use_site, use_home, use_gems, *extra_dirs) def self.path(use_system, use_site, use_home, use_gems, *extra_dirs)
path = raw_path(use_system, use_site, use_home, use_gems, *extra_dirs) path = raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
return path.select { |path| File.directory? path } return path.select { |directory| File.directory? directory }
end end
# Returns the selected documentation directories including nonexistent # Returns the selected documentation directories including nonexistent