ruby-lex.rb: fix continued line conditions

* lib/irb/ruby-lex.rb (RubyLex#lex): fix conditions for continued line; empty lines, a semicolon, first line in `begin` block, just after `else` are not continued. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ragesoss · Apr 20, 2017 · f14f0d3 · f14f0d3
1 parent 716ce65
commit f14f0d3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
@@ -262,9 +262,18 @@ def each_top_level_statement
   end
 
   def lex
-    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
-        !@continue or
-        tk.nil?)
+    continue = @continue
+    while tk = token
+      case tk
+      when TkNL, TkEND_OF_SCRIPT
+        @continue = continue unless continue.nil?
+        break unless @continue
+      when TkSPACE, TkCOMMENT
+      when TkSEMICOLON, TkBEGIN, TkELSE
+        @continue = continue = false
+      else
+        continue = nil
+      end
     end
     line = get_readed
     if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?

diff --git a/test/irb/test_ruby-lex.rb b/test/irb/test_ruby-lex.rb
@@ -55,15 +55,15 @@ def test_prompt
       src, lineno = "#{<<-"begin;"}#{<<~'end;'}", __LINE__+1
       begin;
         #            #;# LTYPE:INDENT:CONTINUE
-        x            #;# -:0:- # FIXME: a comment should not `continue'
+        x            #;# -:0:-
         x(           #;# -:0:-
         )            #;# -:1:*
         a \          #;# -:0:-
                      #;# -:0:*
         a;           #;# -:0:-
-        a            #;# -:0:- # FIXME: a semicolon should not `continue'
+        a            #;# -:0:-
                      #;# -:0:-
-        a            #;# -:0:- # FIXME: an empty line should not `continue'
+        a            #;# -:0:-
         a =          #;# -:0:-
           '          #;# -:0:*
           '          #;# ':0:*
@@ -73,11 +73,11 @@ def test_prompt
           "          #;# -:1:-
           "          #;# ":1:-
           begin      #;# -:1:-
-            a        #;# -:2:- # FIXME: the first line should not be `continue'd
+            a        #;# -:2:-
             a        #;# -:2:-
           end        #;# -:2:-
         else         #;# -:1:-
-          nil        #;# -:1:- # FIXME: just after `else' should not be `continue'd
+          nil        #;# -:1:-
         end          #;# -:1:-
       end;
       top_level_statement(src.gsub(/[ \t]*#;#.*/, ''))