Remove unnecessary singleton assignments

Author: st0012

lib/rdoc/code_object/any_method.rb

@@ -53,10 +53,9 @@ def initialize(text, name, singleton: false)
   # Adds +an_alias+ as an alias for this method in +context+.
 
   def add_alias an_alias, context = nil
-    method = self.class.new an_alias.text, an_alias.new_name
+    method = self.class.new an_alias.text, an_alias.new_name, singleton: singleton
 
     method.record_location an_alias.file
-    method.singleton = self.singleton
     method.params = self.params
     method.visibility = self.visibility
     method.comment = an_alias.comment

lib/rdoc/code_object/class_module.rb

@@ -419,8 +419,7 @@ def marshal_load array # :nodoc:
         @visibility = visibility
 
         methods.each do |name, file|
-          method = RDoc::AnyMethod.new nil, name
-          method.singleton = true if type == 'class'
+          method = RDoc::AnyMethod.new nil, name, singleton: type == 'class'
           method.record_location RDoc::TopLevel.new file
           add_method method
         end

lib/rdoc/parser/c.rb

@@ -1013,10 +1013,9 @@ def handle_method(type, var_name, meth_name, function, param_count,
         type = 'method' # force public
       end
 
-      meth_obj = RDoc::AnyMethod.new '', meth_name
+      singleton = singleton || %w[singleton_method module_function].include?(type)
+      meth_obj = RDoc::AnyMethod.new '', meth_name, singleton: singleton
       meth_obj.c_function = function
-      meth_obj.singleton =
-        singleton || %w[singleton_method module_function].include?(type)
 
       p_count = Integer(param_count) rescue -1
 

lib/rdoc/parser/prism_ruby.rb

@@ -298,8 +298,7 @@ def handle_meta_method_comment(comment, node)
       end
     elsif line_no || node
       method_name ||= call_node_name_arguments(node).first if is_call_node
-      meth = RDoc::AnyMethod.new(@container, method_name)
-      meth.singleton = @singleton || singleton_method
+      meth = RDoc::AnyMethod.new(@container, method_name, singleton: @singleton || singleton_method)
       handle_consecutive_comment_directive(meth, comment)
       comment.normalize
       meth.call_seq = comment.extract_call_seq
@@ -315,7 +314,6 @@ def handle_meta_method_comment(comment, node)
         meth,
         line_no: line_no,
         visibility: visibility,
-        singleton: @singleton || singleton_method,
         params: '()',
         calls_super: false,
         block_params: nil,
@@ -511,7 +509,7 @@ def add_method(name, receiver_name:, receiver_fallback_type:, visibility:, singl
     return if @in_proc_block
 
     receiver = receiver_name ? find_or_create_module_path(receiver_name, receiver_fallback_type) : @container
-    meth = RDoc::AnyMethod.new(nil, name)
+    meth = RDoc::AnyMethod.new(nil, name, singleton: singleton)
     if (comment = consecutive_comment(start_line))
       handle_consecutive_comment_directive(@container, comment)
       handle_consecutive_comment_directive(meth, comment)
@@ -530,7 +528,6 @@ def add_method(name, receiver_name:, receiver_fallback_type:, visibility:, singl
       meth,
       line_no: start_line,
       visibility: visibility,
-      singleton: singleton,
       params: params,
       calls_super: calls_super,
       block_params: block_params,
@@ -550,12 +547,11 @@ def add_method(name, receiver_name:, receiver_fallback_type:, visibility:, singl
     end
   end
 
-  private def internal_add_method(container, meth, line_no:, visibility:, singleton:, params:, calls_super:, block_params:, tokens:) # :nodoc:
+  private def internal_add_method(container, meth, line_no:, visibility:, params:, calls_super:, block_params:, tokens:) # :nodoc:
     meth.name ||= meth.call_seq[/\A[^()\s]+/] if meth.call_seq
     meth.name ||= 'unknown'
     meth.store = @store
     meth.line = line_no
-    meth.singleton = singleton
     container.add_method(meth) # should add after setting singleton and before setting visibility
     meth.visibility = visibility
     meth.params ||= params

lib/rdoc/parser/ruby.rb

@@ -1357,10 +1357,9 @@ def parse_meta_method(container, single, tk, comment)
 
     return unless name
 
-    meth = RDoc::MetaMethod.new get_tkread, name
+    meth = RDoc::MetaMethod.new get_tkread, name, singleton: singleton
     record_location meth
     meth.line   = line_no
-    meth.singleton = singleton
 
     remove_token_listener self
 
@@ -1460,9 +1459,8 @@ def parse_method(container, single, tk, comment)
 
     return unless name
 
-    meth = RDoc::AnyMethod.new get_tkread, name
+    meth = RDoc::AnyMethod.new get_tkread, name, singleton: single == SINGLE ? true : singleton
     look_for_directives_in meth, comment
-    meth.singleton = single == SINGLE ? true : singleton
     if singleton
       # `current_line_visibility' is useless because it works against
       # the normal method named as same as the singleton method, after

test/rdoc/test_rdoc_context.rb

@@ -89,8 +89,7 @@ def test_add_alias_method
   end
 
   def test_add_alias_method_singleton
-    meth = RDoc::AnyMethod.new nil, 'old_name'
-    meth.singleton = true
+    meth = RDoc::AnyMethod.new nil, 'old_name', singleton: true
 
     as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment', singleton: true
 

test/rdoc/test_rdoc_cross_reference.rb

@@ -176,11 +176,9 @@ def assert_resolve_method(x)
     @c1.methods_hash.clear
 
     i_op = RDoc::AnyMethod.new nil, x
-    i_op.singleton = false
     @c1.add_method i_op
 
-    c_op = RDoc::AnyMethod.new nil, x
-    c_op.singleton = true
+    c_op = RDoc::AnyMethod.new nil, x, singleton: true
     @c1.add_method c_op
 
     assert_ref i_op, x

test/rdoc/test_rdoc_markup_to_html_crossref.rb

@@ -122,7 +122,6 @@ def test_convert_RDOCLINK_rdoc_ref_method_label
 
   def test_convert_RDOCLINK_rdoc_ref_method_percent
     m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-    m.singleton = false
 
     result = @to.convert 'rdoc-ref:C1#%'
 
@@ -137,7 +136,6 @@ def test_convert_RDOCLINK_rdoc_ref_method_percent
 
   def test_convert_RDOCLINK_rdoc_ref_method_escape_html
     m = @c1.add_method RDoc::AnyMethod.new nil, '<<'
-    m.singleton = false
 
     result = @to.convert 'rdoc-ref:C1#<<'
 
@@ -151,7 +149,6 @@ def test_convert_RDOCLINK_rdoc_ref_method_escape_html
 
   def test_convert_RDOCLINK_rdoc_ref_method_percent_label
     m = @c1.add_method RDoc::AnyMethod.new nil, '%'
-    m.singleton = false
 
     result = @to.convert 'rdoc-ref:C1#%@f'
 

test/rdoc/test_rdoc_ri_driver.rb

@@ -1214,8 +1214,7 @@ def test_list_methods_matching_regexp
     @cFoo.add_method index
     @store1.save_method @cFoo, index
 
-    c_index = RDoc::AnyMethod.new nil, '[]'
-    c_index.singleton = true
+    c_index = RDoc::AnyMethod.new nil, '[]', singleton: true
     c_index.record_location @top_level
     @cFoo.add_method c_index
     @store1.save_method @cFoo, c_index
@@ -1577,9 +1576,8 @@ def util_store
     @bother.params = "(things)"
     @bother.record_location @top_level
 
-    @new = @cFoo_Bar.add_method RDoc::AnyMethod.new nil, 'new'
+    @new = @cFoo_Bar.add_method RDoc::AnyMethod.new nil, 'new', singleton: true
     @new.record_location @top_level
-    @new.singleton = true
 
     @attr = @cFoo_Bar.add_attribute RDoc::Attr.new nil, 'attr', 'RW', ''
     @attr.record_location @top_level

test/rdoc/test_rdoc_stats.rb

@@ -397,14 +397,12 @@ def test_report_method_class
     c.record_location @tl
     c.add_comment 'C', @tl
 
-    m1 = RDoc::AnyMethod.new nil, 'm1'
+    m1 = RDoc::AnyMethod.new nil, 'm1', singleton: true
     m1.record_location @tl
-    m1.singleton = true
     c.add_method m1
 
-    m2 = RDoc::AnyMethod.new nil, 'm2'
+    m2 = RDoc::AnyMethod.new nil, 'm2', singleton: true
     m2.record_location @tl
-    m2.singleton = true
     c.add_method m2
     m2.comment = 'm2'