[Truffle] Moving String#end_with? out to Rubinius.

jruby · Mar 23, 2015 · 53bc732 · 53bc732
1 parent 505bdbc
commit 53bc732
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/spec/truffle/tags/core/string/end_with_tags.txt b/spec/truffle/tags/core/string/end_with_tags.txt
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
@@ -1214,25 +1214,6 @@ public RubyEncoding encoding(RubyString string) {
         }
     }
 
-    @CoreMethod(names = "end_with?", required = 1)
-    public abstract static class EndWithNode extends CoreMethodNode {
-
-        public EndWithNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
-        public EndWithNode(EndWithNode prev) {
-            super(prev);
-        }
-
-        @Specialization
-        public boolean endWith(RubyString string, RubyString b) {
-            notDesignedForCompilation();
-
-            return string.toString().endsWith(b.toString());
-        }
-    }
-
     @CoreMethod(names = "force_encoding", required = 1)
     public abstract static class ForceEncodingNode extends CoreMethodNode {
 

diff --git a/truffle/src/main/ruby/core/rubinius/common/string.rb b/truffle/src/main/ruby/core/rubinius/common/string.rb
@@ -527,6 +527,17 @@ def codepoints
     end
   end
 
+  def end_with?(*suffixes)
+    suffixes.each do |original_suffix|
+      suffix = Rubinius::Type.check_convert_type original_suffix, String, :to_str
+      unless suffix
+        raise TypeError, "no implicit conversion of #{original_suffix.class} into String"
+      end
+      return true if self[-suffix.length, suffix.length] == suffix
+    end
+    false
+  end
+
   def to_sub_replacement(result, match)
     index = 0
     while index < @num_bytes