Add Reader support for InputStreams

Author: mikera

convex-core/src/main/java/convex/core/json/JSON5Reader.java

@@ -1,6 +1,7 @@
 package convex.core.json;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 
 import org.antlr.v4.runtime.CharStream;
@@ -135,6 +136,10 @@ public static ACell read(java.io.Reader r) throws IOException {
 		return read(CharStreams.fromReader(r));
 	}
 
+	public static ACell read(InputStream is) throws IOException {
+		return read(CharStreams.fromStream(is));
+	}
+	
 	private static final ConvexErrorListener ERROR_LISTENER=new ConvexErrorListener();
 
 

convex-core/src/main/java/convex/core/json/JSONReader.java

@@ -1,6 +1,7 @@
 package convex.core.json;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 
 import org.antlr.v4.runtime.CharStream;
@@ -132,6 +133,11 @@ public static ACell read(java.io.Reader r) throws IOException {
 		return read(CharStreams.fromReader(r));
 	}
 
+	public static ACell read(InputStream is) throws IOException {
+		return read(CharStreams.fromStream(is));
+	}
+
+	
 	private static final ConvexErrorListener ERROR_LISTENER=new ConvexErrorListener();
 
 

convex-core/src/main/java/convex/core/lang/Reader.java

@@ -1,6 +1,7 @@
 package convex.core.lang;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 import convex.core.cvm.Syntax;
 import convex.core.data.ACell;
@@ -59,6 +60,10 @@ public static ACell read(java.io.Reader source) throws IOException {
 		return AntlrReader.read(source);
 	}
 
+	public static ACell read(InputStream stream) throws IOException {
+		return AntlrReader.read(stream);
+	}
+	
 	/**
 	 * Parses an expression and returns a canonical Cell representing a form
 	 * 
@@ -70,4 +75,6 @@ public static <R extends ACell> R read(String source) {
 		return (R) AntlrReader.read(source);
 	}
 
+
+
 }

convex-core/src/main/java/convex/core/lang/reader/AntlrReader.java

@@ -1,6 +1,7 @@
 package convex.core.lang.reader;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 
 import org.antlr.v4.runtime.CharStream;
@@ -387,6 +388,11 @@ public void enterAllForms(AllFormsContext ctx) {
 			pushList(); 
 		}
 	}
+	
+	public static ACell read(InputStream is) throws IOException {
+		return read(CharStreams.fromStream(is));
+	}
+
 
 	public static ACell read(String s) {
 		return read(CharStreams.fromString(s));

convex-core/src/test/java/convex/core/lang/ReaderTest.java

@@ -8,6 +8,11 @@
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Test;
 
 import convex.core.Result;
@@ -427,6 +432,15 @@ public void doIdempotencyTest(ACell cell) {
 		doReadPrintTest("^{} 0xa89e59cc8ab9fc6a13785a37938c85b306b24663415effc01063a6e25ef52ebcd3647d3a77e0a33908a372146fdccab6");
 	}
 
+	/**
+	 * Test cases that should read and print identically
+	 * @throws IOException 
+	 */
+	@Test public void testReadFromStream() throws IOException {
+		InputStream stream = new ByteArrayInputStream("[1 2 3]".getBytes(StandardCharsets.UTF_8));
+		assertEquals(Vectors.of(1,2,3),Reader.read(stream));
+	}
+	
 	/**
 	 * Test cases for strings with Java escapes
 	 */