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

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

+18 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java

+7 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
diff --git a/spec/truffle/tags/core/string/valid_encoding_tags.txt b/spec/truffle/tags/core/string/valid_encoding_tags.txt
@@ -1,6 +1 @@
-fails:String#valid_encoding? returns true if the String's encoding is valid
-fails:String#valid_encoding? returns true if self is valid in the current encoding and other encodings
-fails:String#valid_encoding? returns true for all encodings self is valid in
-fails:String#valid_encoding? returns false if self is valid in one encoding, but invalid in the one it's tagged with
-fails:String#valid_encoding? returns false if self contains a character invalid in the associated encoding
 fails:String#valid_encoding? returns false if a valid String had an invalid character appended to it
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
@@ -1864,6 +1864,24 @@ public RubyString upcaseBang(RubyString string) {
         }
     }
 
+    @CoreMethod(names = "valid_encoding?")
+    public abstract static class ValidEncodingQueryNode extends CoreMethodNode {
+
+        public ValidEncodingQueryNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public ValidEncodingQueryNode(ValidEncodingQueryNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public boolean validEncodingQuery(RubyString string) {
+            return string.scanForCodeRange() != StringSupport.CR_BROKEN;
+        }
+
+    }
+
     @CoreMethod(names = "capitalize!")
     public abstract static class CapitalizeBangNode extends CoreMethodNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyString.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
@@ -178,11 +178,12 @@ public int getCodeRange() {
     }
 
     @Override
+    @TruffleBoundary
     public int scanForCodeRange() {
         int cr = getCodeRange();
 
         if (cr == StringSupport.CR_UNKNOWN) {
-            cr = StringSupport.codeRangeScan(bytes.getEncoding(), bytes);
+            cr = slowCodeRangeScan();
             setCodeRange(cr);
         }
 
@@ -231,4 +232,9 @@ public RubyBasicObject allocate(RubyContext context, RubyClass rubyClass, RubyNo
 
     }
 
+    @TruffleBoundary
+    private int slowCodeRangeScan() {
+        return StringSupport.codeRangeScan(bytes.getEncoding(), bytes);
+    }
+
 }