Add nqp::setinputlinesep for JVM.

Author: donaldh

src/vm/jvm/QAST/Compiler.nqp

@@ -1889,6 +1889,7 @@ QAST::OperationsJAST.map_classlib_core_op('getstdin', $TYPE_OPS, 'getstdin', [],
 QAST::OperationsJAST.map_classlib_core_op('getstdout', $TYPE_OPS, 'getstdout', [], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('getstderr', $TYPE_OPS, 'getstderr', [], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('setencoding', $TYPE_OPS, 'setencoding', [$RT_OBJ, $RT_STR], $RT_OBJ, :tc);
+QAST::OperationsJAST.map_classlib_core_op('setinputlinesep', $TYPE_OPS, 'setinputlinesep', [$RT_OBJ, $RT_STR], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('tellfh', $TYPE_OPS, 'tellfh', [$RT_OBJ], $RT_INT, :tc);
 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);

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

@@ -0,0 +1,7 @@
+package org.perl6.nqp.io;
+
+import org.perl6.nqp.runtime.ThreadContext;
+
+public interface IIOLineSeparable {
+    public void setInputLineSeparator(ThreadContext tc, String sep);
+}

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

@@ -1,18 +1,11 @@
 package org.perl6.nqp.io;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
 
 import jline.ConsoleReader;
 

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

@@ -13,13 +13,14 @@
 import org.perl6.nqp.runtime.ThreadContext;
 
 public abstract class SyncHandle implements IIOClosable, IIOEncodable, 
-        IIOSyncReadable, IIOSyncWritable {
+        IIOSyncReadable, IIOSyncWritable, IIOLineSeparable {
 
     protected ByteChannel chan;
     protected CharsetEncoder enc;
     protected CharsetDecoder dec;
     protected boolean eof = false;
     protected ByteBuffer readBuffer;
+    protected byte[] linesep = { '\n' };
 
     public void close(ThreadContext tc) {
         try {
@@ -84,9 +85,19 @@ public synchronized String readline(ThreadContext tc) {
                 int start = readBuffer.position();
                 int end = start;
                 while (!foundLine && end < readBuffer.limit()) {
-                    if (readBuffer.get(end) == '\n')
+                    int index = 0;
+                    while (index < linesep.length
+                            && end + index < readBuffer.limit()
+                            && readBuffer.get(end + index) == linesep[index])
+                        index++;
+                    
+                    if (index == linesep.length)
+                    {
+                        end += index;
                         foundLine = true;
-                    end++;
+                    } else {
+                        end++;
+                    }
                 }
 
                 /* Copy what we found into the results. */
@@ -169,4 +180,13 @@ public void say(ThreadContext tc, String s) {
         print(tc, s);
         print(tc, System.lineSeparator());
     }
+
+    public void setInputLineSeparator(ThreadContext tc, String sep) {
+        try {
+            linesep = enc.charset().newEncoder().encode(
+                CharBuffer.wrap(sep)).array();
+        } catch (IOException e) {
+            throw ExceptionHandling.dieInternal(tc, e);
+        }
+    }
 }

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

@@ -39,6 +39,7 @@
 import org.perl6.nqp.io.IIOClosable;
 import org.perl6.nqp.io.IIOEncodable;
 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;
@@ -444,6 +445,23 @@ else if (encoding.equals("binary"))
         return obj;
     }
 
+    public static SixModelObject setinputlinesep(SixModelObject obj, String sep, ThreadContext tc) {
+        if (obj instanceof IOHandleInstance) {
+            IOHandleInstance h = (IOHandleInstance)obj;
+        
+            if (h.handle instanceof IIOLineSeparable)
+                ((IIOLineSeparable)h.handle).setInputLineSeparator(tc, sep);
+            else
+                throw ExceptionHandling.dieInternal(tc,
+                    "This handle does not support setting input line separator");
+        }
+        else {
+            throw ExceptionHandling.dieInternal(tc,
+                "setinputlinesep requires an object with the IOHandle REPR");
+        }
+        return obj;
+    }
+    
     public static long tellfh(SixModelObject obj, ThreadContext tc) {
         if (obj instanceof IOHandleInstance) {
             IOHandleInstance h = (IOHandleInstance)obj;