diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/rdoc/code_objects.rb | 5 | ||||
| -rw-r--r-- | lib/rdoc/diagram.rb | 4 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_c.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 9 | ||||
| -rw-r--r-- | lib/rdoc/ri/ri_paths.rb | 2 |
6 files changed, 15 insertions, 11 deletions
@@ -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> * lib/rubygems, test/rubygems: Fix new 1.9 warnings. diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb index d6c4f1bdb9..d681982492 100644 --- a/lib/rdoc/code_objects.rb +++ b/lib/rdoc/code_objects.rb @@ -126,6 +126,7 @@ module RDoc @title = title @@sequence.succ! @sequence = @@sequence.dup + @comment = nil set_comment(comment) end @@ -385,8 +386,8 @@ module RDoc module_name = modules.shift result = find_module_named(module_name) if result - modules.each do |module_name| - result = result.find_module_named(module_name) + modules.each do |name| + result = result.find_module_named(name) break unless result end end diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb index 9fdc49c02e..9d4234bc50 100644 --- a/lib/rdoc/diagram.rb +++ b/lib/rdoc/diagram.rb @@ -140,8 +140,8 @@ module RDoc graph << m unless mod.includes.empty? - mod.includes.each do |m| - m_full_name = find_full_name(m.name, mod) + mod.includes.each do |inc| + m_full_name = find_full_name(inc.name, mod) if @local_names.include?(m_full_name) @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}", 'to' => "#{mod.full_name.gsub( /:/,'_' )}", diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb index 49f53b5e08..98f4b3f02e 100644 --- a/lib/rdoc/parsers/parse_c.rb +++ b/lib/rdoc/parsers/parse_c.rb @@ -166,7 +166,7 @@ module RDoc class C_Parser - attr_accessor :progress + attr_writer :progress extend ParserFactory parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/) diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index e039a058b6..dcdcf6cef2 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -38,7 +38,7 @@ module RubyToken class Token NO_TEXT = "??".freeze - attr :text + attr_accessor :text def initialize(line_no, char_no) @line_no = line_no @@ -53,7 +53,7 @@ module RubyToken self end - attr_reader :line_no, :char_no, :text + attr_reader :line_no, :char_no end class TkNode < Token @@ -1934,9 +1934,8 @@ module RDoc meth.singleton = true else unget_tk dot - back_tk.reverse_each do - |tk| - unget_tk tk + back_tk.reverse_each do |token| + unget_tk token end name = name_t.name diff --git a/lib/rdoc/ri/ri_paths.rb b/lib/rdoc/ri/ri_paths.rb index 4a67e44ba5..167b4b521d 100644 --- a/lib/rdoc/ri/ri_paths.rb +++ b/lib/rdoc/ri/ri_paths.rb @@ -55,7 +55,7 @@ module RI 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) - return path.select { |path| File.directory? path } + return path.select { |directory| File.directory? directory } end # Returns the selected documentation directories including nonexistent |