diff --git a/experiments/modern/package.json b/experiments/modern/package.json
index f4a4288f..1a5d15a1 100644
--- a/experiments/modern/package.json
+++ b/experiments/modern/package.json
@@ -6,6 +6,7 @@
"jszip": "^3.2.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
+ "react-dropzone": "^10.1.5",
"react-scripts": "3.0.1",
"xml-js": "^1.6.11"
},
@@ -14,9 +15,9 @@
"build": "react-scripts build",
"test": "react-scripts test --no-watchman",
"eject": "react-scripts eject",
- "decompile": "cd src/maki-interpreter/reference/maki_decompiler_1.1 && perl mdc.pl ../../fixtures/standardframe.maki",
- "interpret": "node ./src/maki-interpreter/cli.js ./fixtures/standardframe.maki",
- "debug": "node --inspect-brk ./src/maki-interpreter/cli.js ./fixtures/standardframe.maki"
+ "decompile": "cd src/maki-interpreter/reference/maki_decompiler_1.1 && perl mdc.pl \"../../reference/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki\"",
+ "interpret": "node ./src/maki-interpreter/cli.js \"./reference/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki\"",
+ "debug": "node --inspect-brk ./src/maki-interpreter/cli.js ./reference/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki"
},
"eslintConfig": {
"extends": "react-app"
diff --git a/experiments/modern/src/debugger/Command.js b/experiments/modern/src/debugger/Command.js
new file mode 100644
index 00000000..df422340
--- /dev/null
+++ b/experiments/modern/src/debugger/Command.js
@@ -0,0 +1,23 @@
+import React from "react";
+import Variable from "./Variable";
+export default function Command({ command, variables }) {
+ const arg = command.arguments[0];
+ let foo = null;
+ switch (command.opcode) {
+ case 1:
+ foo = (
+
+ Variable(
+ )
+
+ );
+ break;
+ default:
+ foo = null;
+ }
+ return (
+ <>
+ ({command.opcode}) {command.command.name.toUpperCase()} {foo}
+
+ );
+}
diff --git a/experiments/modern/src/debugger/Value.js b/experiments/modern/src/debugger/Value.js
new file mode 100644
index 00000000..78e46ddc
--- /dev/null
+++ b/experiments/modern/src/debugger/Value.js
@@ -0,0 +1,15 @@
+import React from "react";
+import VariableClass from "../maki-interpreter/variable";
+import Variable from "./Variable";
+
+export default function Value({ value }) {
+ if (value instanceof VariableClass) {
+ return (
+ <>
+ Variable(
+ )
+
+ );
+ }
+ return value ? value.toString() : null;
+}
diff --git a/experiments/modern/src/debugger/Variable.js b/experiments/modern/src/debugger/Variable.js
new file mode 100644
index 00000000..8029335a
--- /dev/null
+++ b/experiments/modern/src/debugger/Variable.js
@@ -0,0 +1,32 @@
+import runtime from "../maki-interpreter/runtime";
+
+function quote(str) {
+ return `"${str}"`;
+}
+
+export default function Variable({ variable }) {
+ let type = "UNKOWN";
+ switch (variable.typeName) {
+ case "OBJECT":
+ const obj = runtime[variable.type];
+ if (obj == null) {
+ type = "Unknown object";
+ } else {
+ type = obj.getClassName();
+ }
+ break;
+ case "STRING": {
+ const value = variable.getValue();
+ return `${variable.typeName}(${value == null ? "NULL" : quote(value)})`;
+ }
+ case "INT":
+ case "FLOAT":
+ case "DOUBLE":
+ case "BOOLEAN":
+ const value = variable.getValue();
+ return `${variable.typeName}(${value == null ? "NULL" : value})`;
+ default:
+ throw new Error(`Unknown variable type ${variable.typeName}`);
+ }
+ return type;
+}
diff --git a/experiments/modern/src/debugger/index.js b/experiments/modern/src/debugger/index.js
new file mode 100644
index 00000000..a89bd7f5
--- /dev/null
+++ b/experiments/modern/src/debugger/index.js
@@ -0,0 +1,177 @@
+import React from "react";
+import run from "../maki-interpreter/interpreter";
+import System from "../maki-interpreter/runtime/System";
+import runtime from "../maki-interpreter/runtime";
+import Variable from "./Variable";
+import Value from "./Value";
+import Command from "./Command";
+import { useDropzone } from "react-dropzone";
+
+function readFileAsArrayBuffer(file) {
+ return new Promise((resolve, reject) => {
+ const fileReader = new FileReader();
+ fileReader.onload = () => {
+ resolve(fileReader.result);
+ };
+ fileReader.onerror = reject;
+ fileReader.readAsArrayBuffer(file);
+ });
+}
+
+function Wrapper() {
+ const [maki, setMaki] = React.useState(null);
+ const onDrop = React.useCallback(async acceptedFiles => {
+ if (acceptedFiles.length !== 1) {
+ alert("Only drop one file at a time");
+ return;
+ }
+ const file = acceptedFiles[0];
+ const arrayBuffer = await readFileAsArrayBuffer(file);
+ setMaki(arrayBuffer);
+ // Do something with the files
+ }, []);
+ const { getRootProps, getInputProps, isDragActive } = useDropzone({ onDrop });
+ return (
+
+ {maki == null ? (
+ <>
+
+ Drop a .maki file here to debug
+
+
+
+ ) : (
+
+ )}
+
+ );
+}
+
+/*
+async function fetchTestScript() {
+ const response = await fetch(basicTestUrl);
+ return response.arrayBuffer();
+}
+*/
+
+function Debugger({ maki }) {
+ // This is all a huge disaster
+ const [commandOffset, setCommandOffset] = React.useState(0);
+ const [variables, setVariables] = React.useState(null);
+ const [stack, setStack] = React.useState(null);
+ const [commands, setCommands] = React.useState(null);
+ const [next, setNext] = React.useState(() => {});
+ const system = new System();
+
+ React.useEffect(() => {
+ run({
+ runtime,
+ data: maki,
+ system,
+ logger: ({ i, stack, program }) => {
+ const done = new Promise((resolve, reject) => {
+ // setState accepts a creator function, so we have to pass a function that returns our function.
+ setNext(() => resolve);
+ });
+ setVariables([...program.variables]);
+ setStack([...stack]);
+ setCommands([...program.commands]);
+ setCommandOffset(i);
+ return done;
+ },
+ });
+ }, []);
+
+ React.useEffect(() => {
+ function handler(e) {
+ switch (e.key) {
+ case ";":
+ next();
+ break;
+ default:
+ console.log(e.key);
+ }
+ }
+ document.addEventListener("keydown", handler);
+ return () => document.removeEventListener("keydown", handler);
+ });
+
+ return (
+
+
+
+
Commands
+
+
+ {commands != null &&
+ commands.map((command, i) => (
+
+ | {i} |
+
+
+ |
+
+ ))}
+
+
+
+
+
Stack
+
+
+ {stack != null &&
+ stack.map((value, i) => (
+
+ | {i} |
+
+
+ |
+
+ ))}
+
+
+
+
+
Variables
+
+
+ {variables != null &&
+ variables.map((variable, i) => (
+
+ | {i} |
+
+
+ |
+
+ ))}
+
+
+
+