Implement nqp::flushfh on JVM.

Raku · Oct 3, 2013 · a4e9ac9 · a4e9ac9
1 parent 1eb7d09
commit a4e9ac9
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 1 deletion.
diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -1897,7 +1897,8 @@ QAST::OperationsJAST.map_classlib_core_op('tellfh', $TYPE_OPS, 'tellfh', [$RT_OB
 QAST::OperationsJAST.map_classlib_core_op('readfh', $TYPE_OPS, 'readfh', [$RT_OBJ, $RT_OBJ, $RT_INT], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('writefh', $TYPE_OPS, 'writefh', [$RT_OBJ, $RT_OBJ], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('printfh', $TYPE_OPS, 'printfh', [$RT_OBJ, $RT_STR], $RT_STR, :tc);
-QAST::OperationsJAST.map_classlib_core_op('sayfh', $TYPE_OPS, 'sayfh', [$RT_OBJ, $RT_STR], $RT_STR, :tc);
+QAST::OperationsJAST.map_classlib_core_op('sayfh', $TYPE_OPS, 'sayfh', [$RT_OBJ, $RT_STR], $RT_STR, :tc);QAST::OperationsJAST.map_classlib_core_op('sayfh', $TYPE_OPS, 'sayfh', [$RT_OBJ, $RT_STR], $RT_STR, :tc);
+QAST::OperationsJAST.map_classlib_core_op('flushfh', $TYPE_OPS, 'flushfh', [$RT_OBJ], $RT_OBJ, :tc);QAST::OperationsJAST.map_classlib_core_op('sayfh', $TYPE_OPS, 'sayfh', [$RT_OBJ, $RT_STR], $RT_STR, :tc);
 QAST::OperationsJAST.map_classlib_core_op('readlinefh', $TYPE_OPS, 'readlinefh', [$RT_OBJ], $RT_STR, :tc);
 QAST::OperationsJAST.map_classlib_core_op('readlineintfh', $TYPE_OPS, 'readlineintfh', [$RT_OBJ, $RT_STR], $RT_STR, :tc);
 QAST::OperationsJAST.map_classlib_core_op('readallfh', $TYPE_OPS, 'readallfh', [$RT_OBJ], $RT_STR, :tc);

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java b/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java
@@ -68,4 +68,12 @@ public long tell(ThreadContext tc) {
             throw ExceptionHandling.dieInternal(tc, e);
         }
     }
+
+    public void flush(ThreadContext tc) {
+        try {
+            fc.force(false);
+        } catch (IOException e) {
+            throw ExceptionHandling.dieInternal(tc, e);
+        }
+    }
 }
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/io/IIOSyncWritable.java b/src/vm/jvm/runtime/org/perl6/nqp/io/IIOSyncWritable.java
@@ -6,4 +6,5 @@ public interface IIOSyncWritable {
     public void print(ThreadContext tc, String s);
     public void say(ThreadContext tc, String s);
     public void write(ThreadContext tc, byte[] bytes);
+    public void flush(ThreadContext tc);
 }
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/io/ProcessHandle.java b/src/vm/jvm/runtime/org/perl6/nqp/io/ProcessHandle.java
@@ -45,6 +45,10 @@ 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;

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/io/SocketHandle.java b/src/vm/jvm/runtime/org/perl6/nqp/io/SocketHandle.java
@@ -32,4 +32,8 @@ public void connect(ThreadContext tc, String host, int port) {
             throw ExceptionHandling.dieInternal(tc, e);
         }
     }
+
+    public void flush(ThreadContext tc) {
+        // Not provided.
+    }
 }
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/io/StandardWriteHandle.java b/src/vm/jvm/runtime/org/perl6/nqp/io/StandardWriteHandle.java
@@ -58,4 +58,8 @@ public void say(ThreadContext tc, String s) {
         print(tc, s);
         print(tc, System.lineSeparator());
     }
+
+    public void flush(ThreadContext tc) {
+        ps.flush();
+    }
 }
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java
@@ -566,6 +566,21 @@ public static String sayfh(SixModelObject obj, String data, ThreadContext tc) {
         return data;
     }
 
+    public static SixModelObject flushfh(SixModelObject obj, ThreadContext tc) {
+        if (obj instanceof IOHandleInstance) {
+            IOHandleInstance h = (IOHandleInstance)obj;
+            if (h.handle instanceof IIOSyncWritable)
+                ((IIOSyncWritable)h.handle).flush(tc);
+            else
+                throw ExceptionHandling.dieInternal(tc,
+                    "This handle does not support flush");
+        }
+        else {
+            die_s("flushfh requires an object with the IOHandle REPR", tc);
+        }
+        return obj;
+    }
+
     public static String readlinefh(SixModelObject obj, ThreadContext tc) {
         if (obj instanceof IOHandleInstance) {
             IOHandleInstance h = (IOHandleInstance)obj;