jruby · Feb 6, 2015 · Feb 6, 2015
Showing with 35 additions and 6 deletions.

+0 −5 spec/truffle/tags/core/string/comparison_tags.txt

+33 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java

+2 −0 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
diff --git a/spec/truffle/tags/core/string/comparison_tags.txt b/spec/truffle/tags/core/string/comparison_tags.txt
@@ -1,10 +1,5 @@
-fails:String#<=> with String returns -1 when self is less than other
-fails:String#<=> with String returns 1 when self is greater than other
-fails:String#<=> with String considers string that comes lexicographically first to be less if strings have same size
-fails:String#<=> with String compares shorter string with corresponding number of first chars of longer string
 fails:String#<=> with String ignores encoding difference
 fails:String#<=> with String compares the indices of the encodings when the strings have identical non-ASCII-compatible bytes
 fails:String#<=> returns nil if its argument provides neither #to_str nor #<=>
-fails:String#<=> uses the result of calling #to_str for comparison when #to_str is defined
 fails:String#<=> uses the result of calling #<=> on its argument when #<=> is defined but #to_str is not
 fails:String#<=> returns nil if argument also uses an inverse comparison for <=>
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -122,6 +122,8 @@ public boolean equal(RubyString a, Object b) {
     @CoreMethod(names = "<=>", required = 1)
     public abstract static class CompareNode extends CoreMethodNode {
 
+        @Child private ToStrNode toStrNode;
+
         public CompareNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
@@ -134,7 +136,37 @@ public CompareNode(CompareNode prev) {
         public int compare(RubyString a, RubyString b) {
             notDesignedForCompilation();
 
-            return a.toString().compareTo(b.toString());
+            final int result = a.toString().compareTo(b.toString());
+
+            if (result < 0) {
+                return -1;
+            } else if (result > 0) {
+                return 1;
+            }
+
+            return 0;
+        }
+
+        @Specialization(guards = "!isRubyString(arguments[1])")
+        public Object compare(VirtualFrame frame, RubyString a, Object b) {
+            notDesignedForCompilation();
+
+            if (toStrNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                toStrNode = insert(ToStrNodeFactory.create(getContext(), getSourceSection(), null));
+            }
+
+            try {
+                final RubyString coerced = toStrNode.executeRubyString(frame, b);
+
+                return compare(a, coerced);
+            } catch (RaiseException e) {
+                if (e.getRubyException().getClass().equals(getContext().getCoreLibrary().getTypeErrorClass())) {
+                    return getContext().getCoreLibrary().getNilObject();
+                } else {
+                    throw e;
+                }
+            }
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -943,6 +943,8 @@ public RubyClass getTimeClass() {
         return timeClass;
     }
 
+    public RubyClass getTypeErrorClass() { return typeErrorClass; }
+
     public RubyClass getTrueClass() {
         return trueClass;
     }