Merge branch 'master' into handle-plus-minus-and-number

Author: aycabta

.travis.yml

@@ -6,9 +6,6 @@ notifications:
   email:
   - [email protected]
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
   - 2.2.7
   - 2.3.4
   - 2.4.1

appveyor.yml

@@ -10,11 +10,6 @@ deploy: off
 environment:
   NOBENCHMARK: 1
   matrix:
-    - ruby_version: "193"
-    - ruby_version: "200"
-    - ruby_version: "200-x64"
-    - ruby_version: "21"
-    - ruby_version: "21-x64"
     - ruby_version: "22"
     - ruby_version: "22-x64"
     - ruby_version: "23"

lib/rdoc.rb

@@ -65,7 +65,7 @@ class Error < RuntimeError; end
   ##
   # RDoc version you are using
 
-  VERSION = '5.1.0'
+  VERSION = '6.0.0.beta1'
 
   ##
   # Method visibilities

lib/rdoc/parser/ruby.rb

@@ -2022,31 +2022,25 @@ def scan
   def skip_optional_do_after_expression
     skip_tkspace false
     tk = get_tk
-    end_token = get_end_token tk
 
     b_nest = 0
     nest = 0
     @scanner.continue = false
 
     loop do
       case tk
-      when TkSEMICOLON then
+      when TkSEMICOLON, TkNL then
         break if b_nest.zero?
       when TkLPAREN, TkfLPAREN then
         nest += 1
+      when TkRPAREN then
+        nest -= 1
       when TkBEGIN then
         b_nest += 1
       when TkEND then
         b_nest -= 1
       when TkDO
         break if nest.zero?
-      when end_token then
-        if end_token == TkRPAREN
-          nest -= 1
-          break if @scanner.lex_state == :EXPR_END and nest.zero?
-        else
-          break unless @scanner.continue
-        end
       when nil then
         break
       end