drbrain	2008-04-05 06:16:19 +0900 (Sat, 05 Apr 2008)

  New Revision: 15904

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/generator/html.rb
    trunk/lib/rdoc/options.rb
    trunk/lib/rdoc/parsers/parse_rb.rb
    trunk/lib/webrick/httprequest.rb

  Log:
    * lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
    
    * lib/rdoc/generator/html.rb: ditto.
    
    * lib/rdoc/options.rb: Fix shadowed variable warning.
    
    * lib/webrick/httprequest.rb: Fix redefined method warning.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/generator/html.rb?r1=15904&r2=15903&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/webrick/httprequest.rb?r1=15904&r2=15903&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/parsers/parse_rb.rb?r1=15904&r2=15903&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15904&r2=15903&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/options.rb?r1=15904&r2=15903&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15903)
+++ ChangeLog	(revision 15904)
@@ -1,3 +1,13 @@
+Sat Apr  5 05:50:57 2008  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
+
+	* lib/rdoc/generator/html.rb: ditto.
+
+	* lib/rdoc/options.rb: Fix shadowed variable warning.
+
+	* lib/webrick/httprequest.rb: Fix redefined method warning.
+
 Fri Apr  4 23:24:06 2008  NARUSE, Yui  <naruse@r...>
 
 	* re.c (rb_memsearch_qs): wrong boundary condition.
Index: lib/webrick/httprequest.rb
===================================================================
--- lib/webrick/httprequest.rb	(revision 15903)
+++ lib/webrick/httprequest.rb	(revision 15904)
@@ -23,7 +23,7 @@
     attr_reader :request_method, :unparsed_uri, :http_version
 
     # Request-URI
-    attr_reader :request_uri, :host, :port, :path
+    attr_reader :request_uri, :path
     attr_accessor :script_name, :path_info, :query_string
 
     # Header and entity body
Index: lib/rdoc/parsers/parse_rb.rb
===================================================================
--- lib/rdoc/parsers/parse_rb.rb	(revision 15903)
+++ lib/rdoc/parsers/parse_rb.rb	(revision 15904)
@@ -23,6 +23,7 @@
 
 require "rdoc/parsers/parserfactory"
 
+$TOKEN_DEBUG ||= nil
 #$TOKEN_DEBUG = $DEBUG_RDOC
 
 # Definitions of all tokens involved in the lexical analysis
Index: lib/rdoc/generator/html.rb
===================================================================
--- lib/rdoc/generator/html.rb	(revision 15903)
+++ lib/rdoc/generator/html.rb	(revision 15904)
@@ -68,6 +68,7 @@
   def initialize(options) #:not-new:
     @options = options
     load_html_template
+    @main_page_path = nil
   end
 
   ##
@@ -256,7 +257,7 @@
     end
 
     unless @main_page_path then
-      file = @files.find { |file| file.document_self }
+      file = @files.find { |context| context.document_self }
       @main_page_path = file.path if file
     end
 
Index: lib/rdoc/options.rb
===================================================================
--- lib/rdoc/options.rb	(revision 15903)
+++ lib/rdoc/options.rb	(revision 15904)
@@ -189,7 +189,7 @@
   def parse(argv)
     accessors = []
 
-    opt = OptionParser.new do |opt|
+    opts = OptionParser.new do |opt|
       opt.program_name = File.basename $0
       opt.version = RDoc::VERSION
       opt.summary_indent = ' ' * 4
@@ -513,7 +513,7 @@
       end
     end
 
-    opt.parse! argv
+    opts.parse! argv
 
     @files = argv.dup
 
@@ -539,7 +539,7 @@
     end
 
   rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
-    puts opt
+    puts opts
     puts
     puts e
     exit 1

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