Merge pull request #554 from aycabta/remove-old-token-name

Remove old token name

Author: hsbt

lib/rdoc/parser/ruby.rb

@@ -318,8 +318,7 @@ def error(msg)
   end
 
   ##
-  # Looks for a true or false token.  Returns false if TkFALSE or TkNIL are
-  # found.
+  # Looks for a true or false token.
 
   def get_bool
     skip_tkspace
@@ -1461,8 +1460,7 @@ def parse_method_name_singleton container, name_t # :nodoc:
     name_t2 = get_tk
 
     if (:on_kw == name_t[:kind] && 'self' == name_t[:text]) || (:on_op == name_t[:kind] && '%' == name_t[:text]) then
-      # NOTE: work around '[' being consumed early and not being re-tokenized
-      # as a TkAREF
+      # NOTE: work around '[' being consumed early
       if :on_lbracket == name_t2[:kind]
         get_tk
         name = '[]'

test/test_rdoc_parser_ruby.rb

@@ -2826,7 +2826,7 @@ def test_parse_statements_identifier_yields
     assert_nil m.params, 'Module parameter not removed'
   end
 
-  def test_parse_statements_stopdoc_TkALIAS
+  def test_parse_statements_stopdoc_alias
     klass = @top_level.add_class RDoc::NormalClass, 'Foo'
 
     util_parser "\n# :stopdoc:\nalias old new"
@@ -2837,7 +2837,7 @@ def test_parse_statements_stopdoc_TkALIAS
     assert_empty klass.unmatched_alias_lists
   end
 
-  def test_parse_statements_stopdoc_TkIDENTIFIER_alias_method
+  def test_parse_statements_stopdoc_identifier_alias_method
     klass = @top_level.add_class RDoc::NormalClass, 'Foo'
 
     util_parser "\n# :stopdoc:\nalias_method :old :new"
@@ -2848,7 +2848,7 @@ def test_parse_statements_stopdoc_TkIDENTIFIER_alias_method
     assert_empty klass.unmatched_alias_lists
   end
 
-  def test_parse_statements_stopdoc_TkIDENTIFIER_metaprogrammed
+  def test_parse_statements_stopdoc_identifier_metaprogrammed
     klass = @top_level.add_class RDoc::NormalClass, 'Foo'
 
     util_parser "\n# :stopdoc:\n# attr :meta"
@@ -2859,7 +2859,7 @@ def test_parse_statements_stopdoc_TkIDENTIFIER_metaprogrammed
     assert_empty klass.attributes
   end
 
-  def test_parse_statements_stopdoc_TkCONSTANT
+  def test_parse_statements_stopdoc_constant
     klass = @top_level.add_class RDoc::NormalClass, 'Foo'
 
     util_parser "\n# :stopdoc:\nA = v"
@@ -2869,7 +2869,7 @@ def test_parse_statements_stopdoc_TkCONSTANT
     assert_empty klass.constants
   end
 
-  def test_parse_statements_stopdoc_TkDEF
+  def test_parse_statements_stopdoc_def
     klass = @top_level.add_class RDoc::NormalClass, 'Foo'
 
     util_parser "\n# :stopdoc:\ndef m\n end"