Fix parsing of <=> and setting of subsequent lex_state

Also fixes some bugs in parsing Kernel#<=> specs, so moved those back to rubyspec to use proper parsing.
opal · Sep 22, 2013 · e976e16 · e976e16
1 parent 7716ac7
commit e976e16
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/lib/opal/lexer.rb b/lib/opal/lexer.rb
@@ -721,11 +721,16 @@ def next_token
             @lex_state = :expr_beg
             return '<<', '<<'
           elsif scanner.scan(/\<\=\>/)
-            if @lex_state == :expr_fname
-              @lex_state = :expr_end
+            if after_operator?
+              @lex_state = :expr_arg
             else
+              if @lex_state == :expr_class
+                cmd_start = true
+              end
+
               @lex_state = :expr_beg
             end
+
             return '<=>', '<=>'
           elsif scanner.scan(/\<\=/)
             if @lex_state == :expr_fname

diff --git a/spec/filters/bugs/kernel.rb b/spec/filters/bugs/kernel.rb
@@ -3,4 +3,8 @@
 
   fails "Kernel.rand returns a float if no argument is passed"
   fails "Kernel.rand returns an integer for an integer argument"
+
+  fails "Kernel#<=> returns 0 if self is == to the argument"
+  fails "Kernel#<=> returns nil if self is eql? but not == to the argument"
+  fails "Kernel#<=> returns nil if self.==(arg) returns nil"
 end
diff --git a/spec/rubyspec/core/kernel/comparison_spec.rb b/spec/rubyspec/core/kernel/comparison_spec.rb
diff --git a/spec/rubyspecs b/spec/rubyspecs
@@ -213,4 +213,5 @@ library/set/length_spec
 library/set/member_spec
 library/set/merge_spec
 library/set/size_spec
-library/set/to_a_spec
+library/set/to_a_spec
+core/kernel/comparison_spec