Remove duplication in lexer for string endings

opal · Dec 1, 2013 · 7deaaa6 · 7deaaa6
1 parent 03fda15
commit 7deaaa6
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -220,14 +220,12 @@ def next_string_token
 
         if check(eos_regx)
           scan(/[ \t]*#{Regexp.escape(str_parse[:end])}/)
-          self.strterm = nil
 
           if str_parse[:scanner]
             @scanner_stack << str_parse[:scanner]
             @scanner = str_parse[:scanner]
           end
 
-          @lex_state = :expr_end
           return :tSTRING_END
         end
       end
@@ -241,11 +239,9 @@ def next_string_token
           self.yylval = ' '
           return :tSPACE
         end
-        self.strterm = nil
 
         if str_parse[:balance]
           if str_parse[:nesting] == 0
-            @lex_state = :expr_end
 
             if str_parse[:type] == :regexp
               self.yylval = scan(/\w+/)
@@ -259,11 +255,9 @@ def next_string_token
           end
 
         elsif ['"', "'"].include? str_parse[:beg]
-          @lex_state = :expr_end
           return :tSTRING_END
 
         elsif str_parse[:beg] == '`'
-          @lex_state = :expr_end
           return :tSTRING_END
 
         elsif str_parse[:beg] == '/' || str_parse[:type] == :regexp
@@ -277,7 +271,6 @@ def next_string_token
             @scanner = str_parse[:scanner]
           end
 
-          @lex_state = :expr_end
           return :tSTRING_END
         end
       end
@@ -571,7 +564,14 @@ def yylex
       c = ''
 
       if self.strterm
-        return next_string_token
+        token = next_string_token
+
+        if token == :tSTRING_END or token == :tREGEXP_END
+          self.strterm = nil
+          @lex_state = :expr_end
+        end
+
+        return token
       end
 
       while true