Merge pull request #495 from aycabta/handle-plus-minus-and-number

Handle TkPLUS or TkMINUS and number as TkINTEGER

Author: hsbt

lib/rdoc/ruby_lex.rb

@@ -378,6 +378,10 @@ def token
       else
         tk = tk1
       end
+    elsif (TkPLUS === tk or TkMINUS === tk) and peek(0) =~ /\d/ then
+      tk1 = token
+      set_token_position tk.seek, tk.line_no, tk.char_no
+      tk = Token(tk1.class, tk.text + tk1.text)
     end
     #      Tracer.off
     tk

test/test_rdoc_ruby_lex.rb

@@ -556,6 +556,19 @@ def test_class_tokenize_regexp_escape
     assert_equal expected, tokens
   end
 
+  def test_class_tokenize_number_with_sign_character
+    tokens = RDoc::RubyLex.tokenize "+3--3r", nil
+
+    expected = [
+      @TK::TkINTEGER .new(0, 1, 0, "+3"),
+      @TK::TkMINUS   .new(2, 1, 2, "-"),
+      @TK::TkRATIONAL.new(3, 1, 3, "-3r"),
+      @TK::TkNL      .new(6, 1, 6, "\n"),
+    ]
+
+    assert_equal expected, tokens
+  end
+
   def test_class_tokenize_regexp_continuing_backslash
     tokens = RDoc::RubyLex.tokenize "/(?<!\\\\)\\n\z/", nil