Aya JavaScript Runtime

src/aya/StandaloneAya.java

@@ -17,6 +17,9 @@
 import aya.parser.SourceString;
 
 public class StandaloneAya {
+	/**
+	 * A Bare-bones aya entry point that does not provide interactivity or preserve state
+	 */
 
     public static void main(String[] args) {
 		StaticData.IO = new AyaStdIO(System.out, System.err, System.in, new ScannerInputWrapper(System.in));

src/aya/StaticData.java

@@ -49,8 +49,6 @@ public class StaticData {
 	//
 	private static StaticData _instance;
 
-
-
 	//
 	// Data loaded in the parser
 	//

src/web/AyaWeb.java

@@ -6,7 +6,6 @@
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
-//import org.teavm.jso.dom.html.HTMLDocument;
 
 import aya.AyaStdIO;
 import aya.StandaloneAya;
@@ -25,6 +24,10 @@ public class AyaWeb {
 	private static StringOut output = new StringOut();
 
     public static void main(String[] args) {
+
+    	//
+    	// Set up StaticData
+    	//
 		StaticData sd = StaticData.getInstance();
 
 		StaticData.IO = new AyaStdIO(
@@ -35,35 +38,26 @@ public static void main(String[] args) {
 
 		WebFilesystemIO fs = new WebFilesystemIO();
 		StaticData.FILESYSTEM = fs;
-
+
+		//
+		// Named Instructions
+		// Web build only supports a limited set of named instructions
+		//
 		WebAvailableNamedInstructionStore wsi = new WebAvailableNamedInstructionStore();
 		sd.addNamedInstructionStore(wsi);
-
-		//sd.addNamedInstructionStore(new DebugInstructionStore());
 		sd.addNamedInstructionStore(new JSONInstructionStore());
-		//sd.addNamedInstructionStore(new ImageInstructionStore());
-		//sd.addNamedInstructionStore(new GraphicsInstructionStore());
-		//sd.addNamedInstructionStore(new FStreamInstructionStore());
-		//sd.addNamedInstructionStore(new SystemInstructionStore());
-		//sd.addNamedInstructionStore(new DialogInstructionStore());
-		//sd.addNamedInstructionStore(new PlotInstructionStore());
 		sd.addNamedInstructionStore(new DateInstructionStore());
-		//sd.addNamedInstructionStore(new SocketInstructionStore());
 		sd.addNamedInstructionStore(new ColorInstructionStore());
 		sd.addNamedInstructionStore(new LinearAlgebraInstructionStore());
-		//sd.addNamedInstructionStore(new ThreadInstructionStore());
-
-    	exportSayHello(new ExportFunctionSayHello() {	
-			@Override
-			public String call(String s) {
-				return sayHello(s);
-			}
-		});
 
+		//
+		// Exported Functions Implementation
+		//
     	exportRunIsolated(new ExportFunctionRunIsolated() {
 			@Override
 			public String call(String s) {
-				return runIsolated(s);
+				StandaloneAya.runIsolated(input, StaticData.IO);
+		        return output.flushOut() + output.flushErr();
 			}
 		});
 
@@ -103,27 +97,10 @@ public String call(String source) {
 
     }
 
-    public static String runIsolated(String input) {
-    	StandaloneAya.runIsolated(input, StaticData.IO);
-        return output.flushOut() + output.flushErr();
-    }
-
-    //public static void example() {
-    //	String outstr = runIsolated("1 1 +");
-    //    var document = HTMLDocument.current();
-    //    var div = document.createElement("div");
-    //    //div.appendChild(document.createTextNode("Hello world"));
-    //    div.appendChild(document.createTextNode(outstr));
-    //    document.getBody().appendChild(div);
-    //}
-
-    private static String sayHello(String s) {
-    	return "Hello, " + s + "!";
-    }
+    //
+    // Exported Functions
+    //
 
-    @JSBody(params = "sayHello", script = "main.sayHello = sayHello;")
-    private static native void exportSayHello(ExportFunctionSayHello fn);
-
     @JSBody(params = "runIsolated", script = "main.runIsolated = runIsolated;")
     private static native void exportRunIsolated(ExportFunctionRunIsolated fn);
 
@@ -138,11 +115,6 @@ private static String sayHello(String s) {
 
 }
 
-@JSFunctor
-interface ExportFunctionSayHello extends JSObject {
-	String call(String s);
-}
-
 @JSFunctor
 interface ExportFunctionRunIsolated extends JSObject {
 	String call(String s);
@@ -161,5 +133,4 @@ interface ExportFunctionListFiles extends JSObject {
 @JSFunctor
 interface ExportFunctionLint extends JSObject {
 	String call(String source);
-}
-
+}

src/web/WebAvailableNamedInstructionStore.java

@@ -9,6 +9,11 @@
 import aya.obj.list.Str;
 
 public class WebAvailableNamedInstructionStore extends NamedInstructionStore {
+	/**
+	 * This class provides some overrides for aya instructions so they work in the web implementation
+	 * 
+	 * Only a small subset of instructions are supported
+	 */
 
 	@Override
 	protected void init() {

src/web/WebFilesystemIO.java

@@ -10,6 +10,12 @@
 import aya.io.fs.AbstractFilesystemIO;
 
 public class WebFilesystemIO extends AbstractFilesystemIO {
+	/**
+	 * A very basic virtual filesystem implementation
+	 * This is primarily used to load the standard library in the web implementation
+	 * 
+	 * Very few features outside of loading the standard library are supported
+	 */
 
 	private static class FileData {
 		public byte[] data;