Timothy gillespie/swipl wasm integration

.gitignore

@@ -4,7 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
-/src/util/diproche/diprocheProgram
+/diproche_source
 
 # testing
 /coverage

package.json

@@ -7,6 +7,7 @@
     "@types/react-router-dom": "^4.3.4",
     "@types/shortid": "0.0.29",
     "bootstrap": "^4.3.1",
+    "diproche": "git+https://github.com/TimothyGillespie/Diproche-Prolog.git",
     "jquery": "^3.4.1",
     "lodash": "^4.17.15",
     "node-sass": "^4.12.0",
@@ -20,11 +21,12 @@
     "typescript": "3.4.2"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "npm run copy-diproche && react-scripts start",
     "lint": "tslint --project .",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "build": "npm run copy-diproche && react-scripts build",
+    "test": "npm run copy-diproche && react-scripts test",
+    "eject": "react-scripts eject",
+    "copy-diproche": "shx cp -r ./node_modules/diproche/*.pl ./diproche_source"
   },
   "eslintConfig": {
     "extends": "react-app"

src/util/prolog/fubar.test.ts

@@ -1,14 +1,25 @@
 import "../../../swipl-wasm/swipl-web";
-import { loadingFinishedPromise, query } from "./fubar";
+import { loadingFinishedPromise, query, result } from "./fubar";
 
 describe("Fubar", () => {
 	test("Tests bob is a man", async () => {
 		await loadingFinishedPromise;
 		query("man(bob).");
+		console.log("Inside the test");
+		console.log(result);
 	});
 
 	test("Tests frank is not a man", async () => {
 		await loadingFinishedPromise;
-		query("man(frank).");
+		query("diproche_fo([[wir,zeigen,[a,and,b],<->,[b,and,a]],[=>],[angenommen,a,and,b],[dann,a],[ferner,gilt,b],[damit,folgt,b,and,a],[qed],[abs],[<=],[nehmen,wir,jetzt,an,dass,b,and,a],[dann,folgt,a],[ausserdem,folgt,b],[also,gilt,nun,a,and,b],[qed],[damit,gilt,[a,and,b],<->,[c,and,a]]], X).");
+		console.log("Inside the test");
+		console.log(result);
+	});
+
+	test("Gets X", async () => {
+		await loadingFinishedPromise;
+		query("man(X).");
+		console.log("Inside the test");
+		console.log(result);
 	});
 });

src/util/prolog/fubar.ts

@@ -1,11 +1,24 @@
 import fs from "fs";
+import path from "path";
 import { FS } from "../../../swipl-wasm/swipl-web";
 
 // tslint:disable-next-line:prefer-const
 let bindings: any = null;
 let stdin = "";
 let stdinPosition = 0;
 
+const basePathDiproche: string = path.resolve(__dirname, "../../../diproche_source");
+const diprocheFiles: string[] = fs.readdirSync(basePathDiproche);
+const diprocheMap: Map<string, string> = new Map();
+diprocheFiles.forEach((fileName: string) => {
+	const filePath: string = path.resolve(basePathDiproche, "./" + fileName);
+	diprocheMap.set(fileName.replace(".pl", ""), fs.readFileSync(filePath, "utf8"));
+});
+
+// var to make this variable global
+// tslint:disable-next-line:no-var-keyword
+export var result: string[] = [];
+
 // We use this to provide data into
 // the SWI stdin.
 const setStdin = (s: string) => {
@@ -98,6 +111,10 @@ function initialise(initBindings: any, initModule: any) {
 	);
 }
 
+function pushToResultArray(value: string): void {
+	result.push(value);
+}
+
 const swiplWasm = fs.readFileSync("swipl-wasm/swipl-web.wasm");
 const swiplWasmData = fs.readFileSync("swipl-wasm/swipl-web.data").buffer;
 
@@ -106,7 +123,7 @@ const swiplWasmData = fs.readFileSync("swipl-wasm/swipl-web.data").buffer;
 export const Module = {
 	noInitialRun: true,
 	locateFile: (url: string) => `swipl-wasm/${url}`,
-	print: console.log,
+	print: pushToResultArray,
 	printErr: console.error,
 	wasmBinary: swiplWasm,
 	preRun: [() => FS.init(readStdin)], // sets up stdin
@@ -118,8 +135,11 @@ export const Module = {
 		// Initialise SWI-Prolog.
 		initialise(bindings, Module);
 
-		FS.writeFile("/file.pl", "man(bob).");
-		query("consult('/file.pl').");
+		diprocheMap.forEach((programCode: string, fileName: string) => {
+			FS.writeFile("/" + fileName + ".pl", programCode);
+		});
+
+		query("consult('/diproche.pl').");
 
 		loadingFinished();
 	},