[Truffle] Re-implement String#include? using Rubinius.

jruby · Jan 5, 2015 · 77fd248 · chrisseaton · Jan 5, 2015 · chrisseaton
1 parent 9e53642
commit 77fd248
Showing 6 changed files with 108 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -737,7 +737,7 @@ public int getByte(RubyString string, int index) {
         }
     }
 
-    @CoreMethod(names = "include?", required = 1)
+    @CoreMethod(names = "__include?", required = 1)
     public abstract static class IncludeQueryNode extends CoreMethodNode {
 
         public IncludeQueryNode(RubyContext context, SourceSection sourceSection) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java b/core/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
@@ -14,6 +14,7 @@
 import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.*;
+import org.jruby.util.StringSupport;
 
 /**
  * Rubinius primitives associated with the Ruby {@code String} class.
@@ -64,4 +65,30 @@ public RubyString stringToF(RubyString string) {
 
     }
 
+    @RubiniusPrimitive(name = "string_index")
+    public static abstract class StringIndexPrimitiveNode extends RubiniusPrimitiveNode {
+
+        public StringIndexPrimitiveNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public StringIndexPrimitiveNode(StringIndexPrimitiveNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public Object stringIndex(RubyString string, RubyString pattern, int start) {
+            final int index = StringSupport.index(string, string.getBytes(), string.length(),
+                    pattern, pattern.getBytes(), pattern.length(),
+                    start, string.getBytes().getEncoding());
+
+            if (index == -1) {
+                return getContext().getCoreLibrary().getNilObject();
+            }
+
+            return index;
+        }
+
+    }
+
 }
diff --git a/core/src/main/ruby/jruby/truffle/core.rb b/core/src/main/ruby/jruby/truffle/core.rb
@@ -27,6 +27,7 @@
 
 require_relative 'core/rubinius/kernel/bootstrap/time'
 require_relative 'core/rubinius/kernel/bootstrap/type'
+require_relative 'core/rubinius/kernel/bootstrap/string'
 
 require_relative 'core/rubinius/kernel/common/kernel'
 require_relative 'core/rubinius/kernel/common/array'
@@ -39,5 +40,6 @@
 require_relative 'core/rubinius/kernel/common/integer'
 require_relative 'core/rubinius/kernel/common/float'
 require_relative 'core/rubinius/kernel/common/numeric'
+require_relative 'core/rubinius/kernel/common/string'
 
 require_relative 'core/shims'
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/bootstrap/string.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/bootstrap/string.rb
@@ -0,0 +1,36 @@
+# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Rubinius nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Only part of Rubinius' string.rb
+
+class String
+
+  def find_string(pattern, start)
+    Rubinius.primitive :string_index
+    raise PrimitiveFailure, "String#find_string primitive failed"
+  end
+
+end
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/string.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/string.rb
@@ -0,0 +1,42 @@
+# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Rubinius nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Only part of Rubinius' string.rb
+
+class String
+
+  def include?(needle)
+    if needle.kind_of? Fixnum
+      needle = needle % 256
+      str_needle = needle.chr
+    else
+      str_needle = StringValue(needle)
+    end
+
+    !!find_string(str_needle, 0)
+  end
+
+end
diff --git a/spec/truffle/tags/core/string/include_tags.txt b/spec/truffle/tags/core/string/include_tags.txt