Trailing whitespace

Author: drbrain

lib/rdoc/markup/to_html.rb

@@ -312,7 +312,7 @@ def convert_string_fancy(item)
 
     # convert -- to em-dash, (-- to en-dash)
       gsub(/---?/, '—'). #gsub(/--/, '–').
-      
+
     # convert ... to elipsis (and make sure .... becomes .<elipsis>)
       gsub(/\.\.\.\./, '.&#8230;').gsub(/\.\.\./, '&#8230;').
 

lib/rdoc/markup/to_html_crossref.rb

@@ -10,7 +10,7 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   attr_accessor :context
 
   # Regular expressions to match class and method references.
-  # 
+  #
   # 1.) There can be a '\' in front of text to suppress
   #     any cross-references (note, however, that the single '\'
   #     is written as '\\\\' in order to escape it twice, once

lib/rdoc/parser/c.rb

@@ -124,7 +124,7 @@ def do_aliases
   end
 
   def do_classes
-    @content.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do 
+    @content.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do
       |var_name, class_name|
       handle_class_module(var_name, "module", class_name, nil, nil)
     end

lib/rdoc/parser/f95.rb

@@ -295,7 +295,7 @@ def scan
 
         @stats.add_module f9x_module
 
-        f9x_comment = COMMENTS_ARE_UPPER ? 
+        f9x_comment = COMMENTS_ARE_UPPER ?
           find_comments(pre_comment.join("\n"))  + "\n" + module_trailing :
             module_trailing + "\n" + find_comments(module_code.sub(/^.*$\n/i, ''))
         f9x_module.comment = f9x_comment
@@ -320,8 +320,8 @@ def scan
         program_code = module_program_code
         program_trailing = module_program_trailing
         # progress "p" # HACK what stats thingy does this correspond to?
-        program_comment = COMMENTS_ARE_UPPER ? 
-          find_comments(pre_comment.join("\n")) + "\n" + program_trailing : 
+        program_comment = COMMENTS_ARE_UPPER ?
+          find_comments(pre_comment.join("\n")) + "\n" + program_trailing :
             program_trailing + "\n" + find_comments(program_code.sub(/^.*$\n/i, ''))
         program_comment = "\n\n= <i>Program</i> <tt>#{program_name}</tt>\n\n" \
                           + program_comment
@@ -410,12 +410,12 @@ def parse_program_or_module(container, code,
     # This information is used when "add_method" and
     # "set_visibility_for" are called.
     #
-    visibility_default, visibility_info = 
+    visibility_default, visibility_info =
               parse_visibility(remaining_lines.join("\n"), visibility, container)
     @@public_methods.concat visibility_info
     if visibility_default == :public
       if !cascaded_modules_list.empty?
-        cascaded_modules = 
+        cascaded_modules =
           Attr.new("Cascaded Modules",
                    "Imported modules all of whose components are published again",
                    "",
@@ -499,7 +499,7 @@ def parse_program_or_module(container, code,
       type_trailing = find_comments($4)
       next if type_trailing =~ /^:nodoc:/
       type_visibility = $1
-      type_comment = COMMENTS_ARE_UPPER ? 
+      type_comment = COMMENTS_ARE_UPPER ?
         find_comments($~.pre_match) + "\n" + type_trailing :
           type_trailing + "\n" + find_comments(type_code.sub(/^.*$\n/i, ''))
       type_element_visibility_public = true
@@ -567,8 +567,8 @@ def parse_program_or_module(container, code,
     end
 
     if !derived_types_comment.empty?
-      derived_types_table = 
-        Attr.new("Derived Types", "Derived_Types", "", 
+      derived_types_table =
+        Attr.new("Derived Types", "Derived_Types", "",
                  derived_types_comment)
       container.add_attribute(derived_types_table)
     end
@@ -733,8 +733,8 @@ def parse_program_or_module(container, code,
         subroutine_trailing = procedure_trailing
         subroutine_code     = procedure_code
 
-        subroutine_comment = COMMENTS_ARE_UPPER ? 
-          pre_comment.join("\n") + "\n" + subroutine_trailing : 
+        subroutine_comment = COMMENTS_ARE_UPPER ?
+          pre_comment.join("\n") + "\n" + subroutine_trailing :
             subroutine_trailing + "\n" + subroutine_code.sub(/^.*$\n/i, '')
         subroutine = AnyMethod.new("subroutine", subroutine_name)
         parse_subprogram(subroutine, subroutine_params,
@@ -787,7 +787,7 @@ def parse_program_or_module(container, code,
 
       # The visibility of procedure is specified
       #
-      set_visibility(container, procedure_name, 
+      set_visibility(container, procedure_name,
                      visibility_default, @@public_methods)
 
       # The alias for this procedure from external modules
@@ -871,11 +871,11 @@ def parse_program_or_module(container, code,
           next if !old_meth
           nolink = old_meth.visibility == :private ? true : nil
           nolink = nil if @options.show_all
-          new_meth = 
-             initialize_external_method(generic_name, proc, 
-                                        old_meth.params, nil, 
-                                        old_meth.comment, 
-                                        old_meth.clone.token_stream[0].text, 
+          new_meth =
+             initialize_external_method(generic_name, proc,
+                                        old_meth.params, nil,
+                                        old_meth.comment,
+                                        old_meth.clone.token_stream[0].text,
                                         true, nolink)
           new_meth.singleton = old_meth.singleton
 
@@ -937,10 +937,10 @@ def parse_program_or_module(container, code,
         end
 
         if indicated_method
-          external_method = 
-            initialize_external_method(generic_name, proc, 
-                                       indicated_method.params, 
-                                       indicated_file, 
+          external_method =
+            initialize_external_method(generic_name, proc,
+                                       indicated_method.params,
+                                       indicated_file,
                                        indicated_method.comment)
 
           @stats.add_method external_method
@@ -1004,12 +1004,12 @@ def parse_program_or_module(container, code,
   # Parse arguments, comment, code of subroutine and function.  Return
   # AnyMethod object.
 
-  def parse_subprogram(subprogram, params, comment, code, 
+  def parse_subprogram(subprogram, params, comment, code,
                        before_contains=nil, function=nil, prefix=nil)
     subprogram.singleton = false
     prefix = "" if !prefix
     arguments = params.sub(/\(/, "").sub(/\)/, "").split(",") if params
-    args_comment, params_opt = 
+    args_comment, params_opt =
       find_arguments(arguments, code.sub(/^s*?contains\s*?(!.*?)?$.*/im, ""),
                      nil, nil, true)
     params_opt = "( " + params_opt + " ) " if params_opt
@@ -1086,7 +1086,7 @@ def find_arguments(args, text, all=nil, indent=nil, modified_params=nil)
         if arg == defitem.varname.strip.chomp || all
           args_rdocforms << <<-"EOF"
 
-#{indent}<tt><b>#{defitem.varname.chomp.strip}#{defitem.arraysuffix}</b> #{defitem.inivalue}</tt> :: 
+#{indent}<tt><b>#{defitem.varname.chomp.strip}#{defitem.arraysuffix}</b> #{defitem.inivalue}</tt> ::
 #{indent}   <tt>#{defitem.types.chomp.strip}</tt>
 EOF
           if !defitem.comment.chomp.strip.empty?
@@ -1096,7 +1096,7 @@ def find_arguments(args, text, all=nil, indent=nil, modified_params=nil)
             }
             args_rdocforms << <<-"EOF"
 
-#{indent}   <tt></tt> :: 
+#{indent}   <tt></tt> ::
 #{indent}       <tt></tt>
 #{indent}       #{comment.chomp.strip}
 EOF
@@ -1130,7 +1130,7 @@ def find_namelists(text, before_contains=nil)
     before_contains = "" if !before_contains
     while lines =~ /^\s*?namelist\s+\/\s*?(\w+)\s*?\/([\s\w\,]+)$/i
       lines = $~.post_match
-      nml_comment = COMMENTS_ARE_UPPER ? 
+      nml_comment = COMMENTS_ARE_UPPER ?
           find_comments($~.pre_match) : find_comments($~.post_match)
       nml_name = $1
       nml_args = $2.split(",")
@@ -1193,7 +1193,7 @@ def initialize_external_method(new, old, params, file, comment, token=nil,
 
     if internal
       external_alias_header = "#{INTERNAL_ALIAS_MES} "
-      external_alias_text   = external_alias_header + old 
+      external_alias_text   = external_alias_header + old
     elsif file
       external_alias_header = "#{EXTERNAL_ALIAS_MES} "
       external_alias_text   = external_alias_header + file + "#" + old
@@ -1325,8 +1325,8 @@ def check_external_aliases(subname, params, comment, test=nil)
                   subname.upcase == alias_item["old_name"].upcase &&
                           @options.ignore_case
 
-        new_meth = initialize_external_method(alias_item["new_name"], 
-                                              subname, params, @file_name, 
+        new_meth = initialize_external_method(alias_item["new_name"],
+                                              subname, params, @file_name,
                                               comment)
         new_meth.visibility = alias_item["visibility"]
 
@@ -1402,7 +1402,7 @@ def united_to_one_line(f90src)
             brank_flag = false
             now_continuing = false
             next ""
-          else 
+          else
             brank_flag     = false
             now_continuing = false
             ignore         = false
@@ -1595,7 +1595,7 @@ def remove_trailing_alias(text)
     comment_block = Array.new
     checked = false
     lines.each do |line|
-      if !checked 
+      if !checked
         if /^\s?#{INTERNAL_ALIAS_MES}/ =~ line ||
             /^\s?#{EXTERNAL_ALIAS_MES}/ =~ line
           checked = true
@@ -1676,9 +1676,9 @@ def initialize(varname, types, inivalue, arraysuffix, comment,
 
     def to_s
       return <<-EOF
-<Fortran95Definition: 
+<Fortran95Definition:
 varname=#{@varname}, types=#{types},
-inivalue=#{@inivalue}, arraysuffix=#{@arraysuffix}, nodoc=#{@nodoc}, 
+inivalue=#{@inivalue}, arraysuffix=#{@arraysuffix}, nodoc=#{@nodoc},
 comment=
 #{@comment}
 >

lib/rdoc/ri/display.rb

@@ -119,35 +119,35 @@ def display_class_info(klass)
       return display_class_method_list(klass)
     end
   end
-  
+
   ##
   # Given a Hash mapping a class' methods to method types (returned by
-  # display_class_method_list), this method allows the user to
-  # choose one of the methods.
-  
+  # display_class_method_list), this method allows the user to choose one of
+  # the methods.
+
   def get_class_method_choice(method_map)
     if CAN_USE_READLINE
       # prepare abbreviations for tab completion
       abbreviations = method_map.keys.abbrev
-      Readline.completion_proc = proc do |string| 
+      Readline.completion_proc = proc do |string|
         abbreviations.values.uniq.grep(/^#{string}/)
       end
     end
-    
+
     @formatter.raw_print_line "\nEnter the method name you want.\n"
     @formatter.raw_print_line "Class methods can be preceeded by '::' and instance methods by '#'.\n"
 
     if CAN_USE_READLINE
       @formatter.raw_print_line "You can use tab to autocomplete.\n"
       @formatter.raw_print_line "Enter a blank line to exit.\n"
-      
+
       choice_string = Readline.readline(">> ").strip
     else
       @formatter.raw_print_line "Enter a blank line to exit.\n"
       @formatter.raw_print_line ">> "
       choice_string = $stdin.gets.strip
     end
-    
+
     if choice_string == ''
       return nil
     else
@@ -172,11 +172,10 @@ def get_class_method_choice(method_map)
       end
     end
   end
-  
 
   ##
-  # Display methods on +klass+
-  # Returns a hash mapping method name to method contents (HACK?)
+  # Display methods on +klass+.  Returns a hash mapping method name to method
+  # contents
 
   def display_class_method_list(klass)
     method_map = {}
@@ -187,16 +186,16 @@ def display_class_method_list(klass)
                   :instance_methods,
                   :instance_method_extensions,
                  ]
-    
+
     class_data.each do |data_type|
       data = klass.send data_type
-      
+
       unless data.nil? or data.empty? then
         @formatter.blankline
-        
+
         heading = data_type.to_s.split('_').join(' ').capitalize << ':'
         @formatter.display_heading heading, 2, ''
-        
+
         method_names = []
         data.each do |item|
           method_names << item.name
@@ -268,7 +267,7 @@ def display_method_list(methods)
       end
     end
   end
-  
+
   ##
   # Display a list of +methods+ and allow the user to select one of them.
 
@@ -280,9 +279,9 @@ def display_method_list_choice(methods)
       methods.each_with_index do |method, index|
         @formatter.raw_print_line "%3d %s [%s]\n" % [index + 1, method.full_name, method.source_path]
       end
-      
+
       @formatter.raw_print_line ">> "
-      
+
       choice = $stdin.gets.strip!
 
       if(choice == '')
@@ -294,7 +293,7 @@ def display_method_list_choice(methods)
       if ((choice == 0) || (choice > methods.size)) then
         @formatter.raw_print_line "Invalid choice!\n"
       else
-        method = methods[choice - 1] 
+        method = methods[choice - 1]
         display_method_info(method)
       end
     end

lib/rdoc/ri/driver.rb

@@ -11,16 +11,16 @@
 
 class RDoc::RI::Driver
 
-  #
-  # This class offers both Hash and OpenStruct functionality.
-  # We convert from the Core Hash to this before calling any of
-  # the display methods, in order to give the display methods
-  # a cleaner API for accessing the data.
-  #
+  ##
+  # This class offers both Hash and OpenStruct functionality.  We convert from
+  # the Core Hash to this before calling any of the display methods, in order
+  # to give the display methods a cleaner API for accessing the data.
+
   class OpenStructHash < Hash
-    #
+
+    ##
     # This method converts from a Hash to an OpenStructHash.
-    #
+
     def self.convert(object)
       case object
       when Hash then
@@ -527,7 +527,7 @@ def lookup_ancestor(klass, orig_klass)
     ancestors = [orig_klass]
     ancestors.push(*cache.includes.map { |inc| inc['name'] })
     ancestors << cache.superclass
-    
+
     ancestor_index = ancestors.index(klass)
 
     if ancestor_index