[Truffle] Add String#bytes specialization which takes a block

jruby · Apr 19, 2016 · 55f6c7f · 55f6c7f · nirvdrum · Apr 20, 2016
1 parent a323ecb
commit 55f6c7f
Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/spec/truffle/tags/core/string/bytes_tags.txt b/spec/truffle/tags/core/string/bytes_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -609,11 +609,11 @@ public DynamicObject b(DynamicObject string) {
 
     }
 
-    @CoreMethod(names = "bytes")
-    public abstract static class BytesNode extends CoreMethodArrayArgumentsNode {
+    @CoreMethod(names = "bytes", needsBlock = true)
+    public abstract static class BytesNode extends YieldingCoreMethodNode {
 
         @Specialization
-        public DynamicObject bytes(DynamicObject string) {
+        public DynamicObject bytes(VirtualFrame frame, DynamicObject string, NotProvided block) {
             final Rope rope = rope(string);
             final byte[] bytes = rope.getBytes();
 
@@ -626,6 +626,18 @@ public DynamicObject bytes(DynamicObject string) {
             return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), store, store.length);
         }
 
+        @Specialization
+        public DynamicObject bytes(VirtualFrame frame, DynamicObject string, DynamicObject block) {
+            Rope rope = rope(string);
+            byte[] bytes = rope.getBytes();
+
+            for (int i = 0; i < bytes.length; i++) {
+                yield(frame, block, bytes[i] & 0xff);
+            }
+
+            return string;
+        }
+
     }
 
     @CoreMethod(names = "bytesize")