Refactor ===, ==, =~ and = parsing in lexer.rb

adambeynon · adambeynon · commit 1e0955f55e85 · 2013-07-31T19:13:34.000+01:00
diff --git a/lib/opal/lexer.rb b/lib/opal/lexer.rb
@@ -397,6 +397,29 @@ def next_token
           scanner.pos = scanner.pos - 1
           return '!', '!'
 
+        elsif scanner.scan(/\=/)
+          @lex_state = if after_operator?
+                         :expr_arg
+                       else
+                         :expr_beg
+                       end
+
+          if scanner.scan(/\=/)
+            if scanner.scan(/\=/)
+              return '===', '==='
+            end
+
+            return '==', '=='
+          end
+
+          if scanner.scan(/\~/)
+            return '=~', '=~'
+          elsif scanner.scan(/\>/)
+            return '=>', '=>'
+          end
+
+          return '=', '='
+
         elsif scanner.scan(/\"/)
           @string_parse = { :beg => '"', :end => '"', :interpolate => true }
           return :STRING_BEG, scanner.matched
@@ -766,38 +789,6 @@ def next_token
           @lex_state = :expr_beg
           return '?', scanner.matched
 
-        elsif scanner.scan(/\=\=\=/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '===', '==='
-          end
-          @lex_state = :expr_beg
-          return '===', '==='
-
-        elsif scanner.scan(/\=\=/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '==', '=='
-          end
-          @lex_state = :expr_beg
-          return '==', '=='
-
-        elsif scanner.scan(/\=\~/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '=~', '=~'
-          end
-          @lex_state = :expr_beg
-          return '=~', '=~'
-
-        elsif scanner.scan(/\=\>/)
-          @lex_state = :expr_beg
-          return '=>', '=>'
-
-        elsif scanner.scan(/\=/)
-          @lex_state = :expr_beg
-          return '=', '='
-
         elsif scanner.scan(/\~/)
           if @lex_state == :expr_fname
             @lex_state = :expr_end
