Merge pull request #245 from cygx/openmodes-jvm

Implement extended file open modes on JVM
Raku · Oct 6, 2015 · 867e81b · 867e81b
2 parents 7ae59c9 + c2610de
commit 867e81b
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 16 deletions.
diff --git a/src/vm/js/nqp-runtime/io.js b/src/vm/js/nqp-runtime/io.js
@@ -102,7 +102,7 @@ FileHandle.prototype.$$to_bool = function(ctx) {
 };
 
 op.open = function(name, mode) {
-  var modes = {r: 'r', w: 'w', wa: 'a'};
+  var modes = {r: 'r', w: 'w', wa: 'a', '-ct': 'w', '-ca': 'a'};
   if (!modes[mode]) { throw 'unknown mode to open: ' + mode }
   var fh = new FileHandle(fs.openSync(name, modes[mode]));
   fh.encoding = 'utf8';

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java b/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java
@@ -4,8 +4,11 @@
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
+import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.perl6.nqp.runtime.ExceptionHandling;
 import org.perl6.nqp.runtime.ThreadContext;
@@ -15,25 +18,47 @@ public class FileHandle extends SyncHandle implements IIOSeekable {
     FileChannel fc;
     protected boolean eof = false;
 
+    public static OpenOption[] resolveOpenMode(String mode) {
+        if(mode.length() == 0)
+            return null;
+
+        int pos = 0;
+        List<OpenOption> opts = new ArrayList<OpenOption>();
+
+        switch (mode.charAt(pos++)) {
+            case 'r': opts.add(StandardOpenOption.READ); break;
+            case '-': opts.add(StandardOpenOption.WRITE); break;
+            case '+': opts.add(StandardOpenOption.READ);
+                      opts.add(StandardOpenOption.WRITE); break;
+
+            /* legacy alias for "-c" or "-ct" if by itself */
+            case 'w': opts.add(StandardOpenOption.WRITE);
+                      opts.add(StandardOpenOption.CREATE);
+                      if(pos == mode.length())
+                          opts.add(StandardOpenOption.TRUNCATE_EXISTING);
+                      break;
+
+            default : return null;
+        }
+
+        while (pos < mode.length()) switch (mode.charAt(pos++)) {
+            case 'a': opts.add(StandardOpenOption.APPEND); break;
+            case 'c': opts.add(StandardOpenOption.CREATE); break;
+            case 't': opts.add(StandardOpenOption.TRUNCATE_EXISTING); break;
+            case 'x': opts.add(StandardOpenOption.CREATE_NEW); break;
+            default : return null;
+        }
+
+        return opts.toArray(new OpenOption[opts.size()]);
+    }
+
     public FileHandle(ThreadContext tc, String filename, String mode) {
         try {
             Path p = new File(filename).toPath();
-            if (mode.equals("r")) {
-                fc = FileChannel.open(p, StandardOpenOption.READ);
-            }
-            else if (mode.equals("w")) {
-                fc = FileChannel.open(p, StandardOpenOption.WRITE,
-                                           StandardOpenOption.CREATE,
-                                           StandardOpenOption.TRUNCATE_EXISTING);
-            }
-            else if (mode.equals("wa")) {
-                fc = FileChannel.open(p, StandardOpenOption.WRITE,
-                                           StandardOpenOption.CREATE,
-                                           StandardOpenOption.APPEND);
-            }
-            else {
+            OpenOption[] opts = resolveOpenMode(mode);
+            if(opts == null)
                 ExceptionHandling.dieInternal(tc, "Unhandled file open mode '" + mode + "'");
-            }
+            fc = FileChannel.open(p, opts);
             chan = fc;
             setEncoding(tc, Charset.forName("UTF-8"));
         } catch (IOException e) {