[GR-23468] DelegatingInput/OutputStream should not malform higher code points.

PullRequest: js/1495

Author: iamstolis

graal-js/src/com.oracle.truffle.js.scriptengine.test/src/com/oracle/truffle/js/scriptengine/test/TestEngine.java

@@ -47,6 +47,8 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 
 import javax.script.Bindings;
 import javax.script.Compilable;
@@ -57,6 +59,8 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Source;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -232,4 +236,26 @@ public void moduleWithDependency() throws IOException, ScriptException {
         assertSame(42, ((Number) result).intValue());
     }
 
+    @Test
+    public void unicodeOutput() throws ScriptException {
+        String text = "Tu\u010d\u0148\u00e1\u010d\u010d\u00ed \ud83d\udca9!";
+        ScriptEngine engine = getEngine();
+        StringWriter output = new StringWriter();
+        engine.getContext().setWriter(output);
+        engine.eval("print('" + text + "');");
+        assertEquals(text + '\n', output.toString());
+    }
+
+    @Test
+    public void unicodeInput() throws ScriptException {
+        String text = "Tu\u010d\u0148\u00e1\u010d\u010d\u00ed \ud83d\udca9!";
+        ScriptEngine engine = GraalJSScriptEngine.create(
+                        Engine.newBuilder().build(),
+                        Context.newBuilder("js").allowExperimentalOptions(true).option("js.shell", "true"));
+        StringReader input = new StringReader(text);
+        engine.getContext().setReader(input);
+        Object result = engine.eval("readline()");
+        assertEquals(text, result);
+    }
+
 }

graal-js/src/com.oracle.truffle.js.scriptengine/src/com/oracle/truffle/js/scriptengine/GraalJSScriptEngine.java

@@ -48,6 +48,11 @@
 import java.io.Writer;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
 import java.util.Objects;
 import java.util.function.Predicate;
 
@@ -567,11 +572,26 @@ private void checkSyntax(Source source) throws ScriptException {
     private static class DelegatingInputStream extends InputStream implements Proxy {
 
         private Reader reader;
+        private CharsetEncoder encoder = Charset.defaultCharset().newEncoder();
+        private CharBuffer charBuffer = CharBuffer.allocate(2);
+        private ByteBuffer byteBuffer = (ByteBuffer) ByteBuffer.allocate((int) encoder.maxBytesPerChar() * 2).flip();
 
         @Override
         public int read() throws IOException {
             if (reader != null) {
-                return reader.read();
+                while (!byteBuffer.hasRemaining()) {
+                    int c = reader.read();
+                    if (c == -1) {
+                        return -1;
+                    }
+                    byteBuffer.clear();
+                    charBuffer.put((char) c);
+                    charBuffer.flip();
+                    encoder.encode(charBuffer, byteBuffer, false);
+                    charBuffer.compact();
+                    byteBuffer.flip();
+                }
+                return byteBuffer.get();
             }
             return 0;
         }
@@ -585,11 +605,23 @@ void setReader(Reader reader) {
     private static class DelegatingOutputStream extends OutputStream implements Proxy {
 
         private Writer writer;
+        private CharsetDecoder decoder = Charset.defaultCharset().newDecoder();
+        private ByteBuffer byteBuffer = ByteBuffer.allocate((int) Charset.defaultCharset().newEncoder().maxBytesPerChar() * 2);
+        private CharBuffer charBuffer = CharBuffer.allocate(byteBuffer.capacity() * (int) decoder.maxCharsPerByte());
 
         @Override
         public void write(int b) throws IOException {
             if (writer != null) {
-                writer.write(b);
+                byteBuffer.put((byte) b);
+                byteBuffer.flip();
+                decoder.decode(byteBuffer, charBuffer, false);
+                byteBuffer.compact();
+                charBuffer.flip();
+                while (charBuffer.hasRemaining()) {
+                    char c = charBuffer.get();
+                    writer.write(c);
+                }
+                charBuffer.clear();
             }
         }
 

graal-js/test/testNashorn.json

@@ -187,9 +187,6 @@
     "filePath" : "basic/JDK-8015267.js",
     "status" : "FAIL",
     "comment" : "Java interop migration"
-  }, {
-    "filePath" : "basic/JDK-8015345.js",
-    "status" : "FAIL"
   }, {
     "filePath" : "basic/JDK-8015352.js",
     "runInIsolation" : true