jruby · Jan 5, 2015 · Jan 5, 2015
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/DirNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/DirNodes.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyArray;
 import org.jruby.truffle.runtime.core.RubyProc;
@@ -59,6 +60,32 @@ public Object chdir(VirtualFrame frame, RubyString path, RubyProc block) {
 
     }
 
+    @CoreMethod(names = { "delete", "rmdir", "unlink" }, onSingleton = true, optional = 1)
+    public abstract static class DeleteNode extends CoreMethodNode {
+
+        public DeleteNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public DeleteNode(DeleteNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public int delete(RubyString path) {
+            notDesignedForCompilation();
+
+            File dir = new File(path.toString());
+            if (!dir.isDirectory()) {
+                throw new UnsupportedOperationException(path.toString());
+            }
+            dir.delete();
+
+            return 0;
+        }
+
+    }
+
     @CoreMethod(names = {"exist?", "exists?"}, onSingleton = true, optional = 1)
     public abstract static class ExistsNode extends CoreMethodNode {
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/rubinius/TimePrimitiveNodes.java b/core/src/main/java/org/jruby/truffle/nodes/rubinius/TimePrimitiveNodes.java
@@ -213,10 +213,9 @@ public RubyString timeStrftime(VirtualFrame frame, RubyTime time, RubyString for
 
 
         @CompilerDirectives.TruffleBoundary
-        public ByteList format(DateTime time, long nanoseconds, ByteList format) {
-            // TODO: converts everything to JRuby objects and back - should find a more direct way using ByteList
+        public ByteList format(DateTime time, long nanoseconds, ByteList pattern) {
             final RubyDateFormatter rdf = getContext().getRuntime().getCurrentContext().getRubyDateFormatter();
-            return rdf.compileAndFormat(org.jruby.RubyString.newString(getContext().getRuntime(), format), false, time, nanoseconds, null).getByteList();
+            return rdf.formatToByteList(rdf.compilePattern(pattern, false), time, nanoseconds, null);
         }
 
     }

diff --git a/core/src/main/java/org/jruby/util/RubyDateFormatter.java b/core/src/main/java/org/jruby/util/RubyDateFormatter.java
@@ -67,8 +67,6 @@ public class RubyDateFormatter {
     static enum Format {
         /** encoding to give to output */
         FORMAT_ENCODING,
-        /** taint output */
-        FORMAT_TAINT,
         /** raw string, no formatting */
         FORMAT_STRING,
         /** formatter */
@@ -243,7 +241,10 @@ private void addToPattern(List<Token> compiledPattern, String str) {
     }
 
     public List<Token> compilePattern(RubyString format, boolean dateLibrary) {
-        ByteList pattern = format.getByteList();
+        return compilePattern(format.getByteList(), dateLibrary);
+    }
+
+    public List<Token> compilePattern(ByteList pattern, boolean dateLibrary) {
         List<Token> compiledPattern = new LinkedList<Token>();
 
         Encoding enc = pattern.getEncoding();
@@ -254,10 +255,6 @@ public List<Token> compilePattern(RubyString format, boolean dateLibrary) {
             compiledPattern.add(new Token(Format.FORMAT_ENCODING, enc));
         }
 
-        if (format.isTaint()) {
-            compiledPattern.add(new Token(Format.FORMAT_TAINT));
-        }
-
         ByteArrayInputStream in = new ByteArrayInputStream(pattern.getUnsafeBytes(), pattern.getBegin(), pattern.getRealSize());
         Reader reader = new InputStreamReader(in, context.runtime.getEncodingService().charsetForEncoding(pattern.getEncoding()));
         lexer.yyreset(reader);
@@ -358,13 +355,20 @@ static enum FieldType {
 
     /** Convenience method when using no pattern caching */
     public RubyString compileAndFormat(RubyString pattern, boolean dateLibrary, DateTime dt, long nsec, IRubyObject sub_millis) {
-        return format(compilePattern(pattern, dateLibrary), dt, nsec, sub_millis);
+        RubyString out = format(compilePattern(pattern, dateLibrary), dt, nsec, sub_millis);
+        if (pattern.isTaint()) {
+            out.taint(context);
+        }
+        return out;
     }
 
     public RubyString format(List<Token> compiledPattern, DateTime dt, long nsec, IRubyObject sub_millis) {
+        return context.runtime.newString(formatToByteList(compiledPattern, dt, nsec, sub_millis));
+    }
+
+    public ByteList formatToByteList(List<Token> compiledPattern, DateTime dt, long nsec, IRubyObject sub_millis) {
         RubyTimeOutputFormatter formatter = RubyTimeOutputFormatter.DEFAULT_FORMATTER;
         ByteList toAppendTo = new ByteList();
-        boolean taint = false;
 
         for (Token token: compiledPattern) {
             String output = null;
@@ -376,9 +380,6 @@ public RubyString format(List<Token> compiledPattern, DateTime dt, long nsec, IR
                 case FORMAT_ENCODING:
                     toAppendTo.setEncoding((Encoding) token.getData());
                     continue; // go to next token
-                case FORMAT_TAINT:
-                    taint = true;
-                    continue; // go to next token
                 case FORMAT_OUTPUT:
                     formatter = (RubyTimeOutputFormatter) token.getData();
                     continue; // go to next token
@@ -553,10 +554,7 @@ public RubyString format(List<Token> compiledPattern, DateTime dt, long nsec, IR
             toAppendTo.append(output.getBytes(context.runtime.getEncodingService().charsetForEncoding(toAppendTo.getEncoding())));
         }
 
-        RubyString str = context.runtime.newString(toAppendTo);
-        if (taint)
-            str.taint(context);
-        return str;
+        return toAppendTo;
     }
 
     /**

diff --git a/lib/ruby/stdlib/date/format.rb b/lib/ruby/stdlib/date/format.rb
@@ -135,7 +135,9 @@ def to_hash
   end
 
   def strftime(fmt='%F')
-    JRuby.runtime.current_context.getRubyDateFormatter.compileAndFormat(fmt, true, @dt, 0, @sub_millis.nonzero?)
+    out = JRuby.runtime.current_context.getRubyDateFormatter.compileAndFormat(fmt, true, @dt, 0, @sub_millis.nonzero?)
+    out.taint if fmt.tainted?
+    out
   end
 
 # alias_method :format, :strftime