implement nqp::closefh_i on jvm

Author: FROGGS

src/vm/jvm/QAST/Compiler.nqp

@@ -2008,6 +2008,7 @@ QAST::OperationsJAST.map_classlib_core_op('readallfh', $TYPE_OPS, 'readallfh', [
 QAST::OperationsJAST.map_classlib_core_op('getcfh', $TYPE_OPS, 'getcfh', [$RT_OBJ], $RT_STR, :tc);
 QAST::OperationsJAST.map_classlib_core_op('eoffh', $TYPE_OPS, 'eoffh', [$RT_OBJ], $RT_INT, :tc);
 QAST::OperationsJAST.map_classlib_core_op('closefh', $TYPE_OPS, 'closefh', [$RT_OBJ], $RT_OBJ, :tc);
+QAST::OperationsJAST.map_classlib_core_op('closefh_i', $TYPE_OPS, 'closefhi', [$RT_OBJ], $RT_INT, :tc);
 
 QAST::OperationsJAST.map_classlib_core_op('chmod', $TYPE_OPS, 'chmod', [$RT_STR, $RT_INT], $RT_INT, :tc);
 QAST::OperationsJAST.map_classlib_core_op('unlink', $TYPE_OPS, 'unlink', [$RT_STR], $RT_INT, :tc);

src/vm/jvm/runtime/org/perl6/nqp/io/IIOExitable.java

@@ -0,0 +1,7 @@
+package org.perl6.nqp.io;
+
+import org.perl6.nqp.runtime.ThreadContext;
+
+public interface IIOExitable {
+    public int exitValue(ThreadContext tc) throws IllegalThreadStateException;
+}

src/vm/jvm/runtime/org/perl6/nqp/io/ProcessChannel.java

@@ -0,0 +1,49 @@
+package org.perl6.nqp.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.Charset;
+import java.util.Map;
+
+import org.perl6.nqp.runtime.ExceptionHandling;
+import org.perl6.nqp.runtime.ThreadContext;
+
+public class ProcessChannel implements ByteChannel {
+    protected WritableByteChannel stdin;
+    protected ReadableByteChannel stdout;
+    protected Process process;
+    
+    public ProcessChannel(Process process, OutputStream stdin, InputStream stdout) {
+        this.stdin = Channels.newChannel(stdin);
+        this.stdout = Channels.newChannel(stdout);
+        this.process = process;
+    }
+
+    public int read(ByteBuffer dst) throws IOException {
+        return stdout.read(dst);
+    }
+
+    public boolean isOpen() {
+        return stdin.isOpen();
+    }
+
+    public void close() throws IOException {
+        stdin.close();
+        stdout.close();
+    }
+
+    public int exitValue() throws IllegalThreadStateException {
+        return process.exitValue();
+    }
+
+    public int write(ByteBuffer src) throws IOException {
+        return stdin.write(src);
+    }
+}

src/vm/jvm/runtime/org/perl6/nqp/io/ProcessHandle.java

@@ -37,7 +37,7 @@ public ProcessHandle(ThreadContext tc, String cmd, String dir, Map<String, Strin
 
         try {
             process = pb.start();
-            chan = new ProcessChannel(process.getOutputStream(), process.getInputStream());
+            chan = new ProcessChannel(process, process.getOutputStream(), process.getInputStream());
             setEncoding(tc, Charset.forName("UTF-8"));
         } catch (IOException e) {
             throw ExceptionHandling.dieInternal(tc, e);
@@ -47,31 +47,4 @@ public ProcessHandle(ThreadContext tc, String cmd, String dir, Map<String, Strin
     public void flush(ThreadContext tc) {
         // Not provided.
     }
-    
-    static class ProcessChannel implements ByteChannel {
-        protected WritableByteChannel stdin;
-        protected ReadableByteChannel stdout;
-        
-        public ProcessChannel(OutputStream stdin, InputStream stdout) {
-            this.stdin = Channels.newChannel(stdin);
-            this.stdout = Channels.newChannel(stdout);
-        }
-
-        public int read(ByteBuffer dst) throws IOException {
-            return stdout.read(dst);
-        }
-
-        public boolean isOpen() {
-            return stdin.isOpen();
-        }
-
-        public void close() throws IOException {
-            stdin.close();
-            stdout.close();
-        }
-
-        public int write(ByteBuffer src) throws IOException {
-            return stdin.write(src);
-        }
-    }
 }

src/vm/jvm/runtime/org/perl6/nqp/io/SyncHandle.java

@@ -15,7 +15,7 @@
 import org.perl6.nqp.runtime.ThreadContext;
 
 public abstract class SyncHandle implements IIOClosable, IIOEncodable,
-        IIOSyncReadable, IIOSyncWritable, IIOLineSeparable {
+        IIOSyncReadable, IIOSyncWritable, IIOLineSeparable, IIOExitable {
 
     protected ByteChannel chan;
     protected CharsetEncoder enc;
@@ -32,6 +32,19 @@ public void close(ThreadContext tc) {
         }
     }
 
+    public int exitValue(ThreadContext tc) throws IllegalThreadStateException {
+        try {
+            if (chan instanceof ProcessChannel) {
+                return ((ProcessChannel)chan).exitValue();
+            }
+            else
+                throw ExceptionHandling.dieInternal(tc,
+                    "This channel does not support exitValue");
+        } catch (IllegalThreadStateException e) {
+            throw ExceptionHandling.dieInternal(tc, e);
+        }
+    }
+
     public void setEncoding(ThreadContext tc, Charset cs) {
         enc = cs.newEncoder();
         dec = cs.newDecoder();

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -44,12 +44,14 @@
 import org.perl6.nqp.io.IIOCancelable;
 import org.perl6.nqp.io.IIOClosable;
 import org.perl6.nqp.io.IIOEncodable;
+import org.perl6.nqp.io.IIOExitable;
 import org.perl6.nqp.io.IIOInteractive;
 import org.perl6.nqp.io.IIOLineSeparable;
 import org.perl6.nqp.io.IIOSeekable;
 import org.perl6.nqp.io.IIOSyncReadable;
 import org.perl6.nqp.io.IIOSyncWritable;
 import org.perl6.nqp.io.ProcessHandle;
+import org.perl6.nqp.io.ProcessChannel;
 import org.perl6.nqp.io.ServerSocketHandle;
 import org.perl6.nqp.io.SocketHandle;
 import org.perl6.nqp.io.StandardReadHandle;
@@ -755,6 +757,24 @@ public static SixModelObject closefh(SixModelObject obj, ThreadContext tc) {
         return obj;
     }
 
+    public static long closefhi(SixModelObject obj, ThreadContext tc) {
+        if (obj instanceof IOHandleInstance) {
+            IOHandleInstance h = (IOHandleInstance)obj;
+            if (h.handle instanceof IIOClosable
+             && h.handle instanceof IIOExitable) {
+                ((IIOClosable)h.handle).close(tc);
+                return (long)((IIOExitable)h.handle).exitValue(tc);
+            }
+            else
+                throw ExceptionHandling.dieInternal(tc,
+                    "This handle does not support close or exitValue");
+        }
+        else {
+            die_s("closefhi requires an object with the IOHandle REPR", tc);
+        }
+        return -1;
+    }
+
     public static Set<PosixFilePermission> modeToPosixFilePermission(long mode) {
         Set<PosixFilePermission> perms = EnumSet.noneOf(PosixFilePermission.class);
         if ((mode & 0001) != 0) perms.add(PosixFilePermission.OTHERS_EXECUTE);