refactor: split up code in 4 modules

Major codebase cleanup

.gitattributes

@@ -0,0 +1 @@
+* -text

.github/workflows/tagged-release.yml

@@ -11,6 +11,11 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '11'
       - name: Clone repository
         uses: GuillaumeFalourd/clone-github-repo-action@main
         with:

.gitignore

@@ -1,11 +1,21 @@
-.vscode
-.gradle
-.ignore
-/out
-/build
-/bin
-/dst
-/*.js
-!/build.js
-/dead-code
-/Metadata.java
+*
+
+!/src
+!/src/**/*
+/src/assets/js/ts.js
+
+!/doc
+!/doc/**/*
+
+!/tests
+!/tests/**/*
+
+
+!/.github
+!/.github/**/*
+
+!/.gitignore
+!/.gitattributes
+!/build.js
+!/LICENSE
+!/README.md

README.md

@@ -2,33 +2,28 @@
 
 **NOTE: This had nothing to do with Microsoft's dialect of EcmaScript**
 
-**WARNING: Currently, this code is mostly undocumented. Proceed with caution and a psychiatrist.**
+**WARNING: Currently, this code is undocumented. Proceed with caution and a psychiatrist.**
 
-JScript is an engine, capable of running EcmaScript 5, written entirely in Java. This engine has been developed with the goal of being easy to integrate with your preexisting codebase, **THE GOAL OF THIS ENGINE IS NOT PERFORMANCE**. My crude experiments show that this engine is 50x-100x slower than V8, which, although bad, is acceptable for most simple scripting purposes.
+JScript is an engine, capable of running EcmaScript 5, written entirely in Java. This engine has been developed with the goal of being easy to integrate with your preexisting codebase, **THE GOAL OF THIS ENGINE IS NOT PERFORMANCE**. My crude experiments show that this engine is 50x-100x slower than V8, which, although bad, is acceptable for most simple scripting purposes. Note that although the codebase has a Main class, this isn't meant to be a standalone program, but instead a library for running JavaScript code.
 
 ## Example
 
-The following will create a REPL using the engine as a backend. Not that this won't properly log errors. I recommend checking out the implementation in `Main.main`:
+The following is going to execute a simple javascript statement:
 
 ```java
-var engine = new PolyfillEngine(new File("."));
-var in = new BufferedReader(new InputStreamReader(System.in));
-engine.start();
+var engine = new Engine(false);
+// Initialize a standard environment, with implementations of most basic standard libraries (Object, Array, Symbol, etc.)
+var env = Internals.apply(new Environment());
 
-while (true) {
-    try {
-        var raw = in.readLine();
+// Queue code to load internal libraries and start engine
+var awaitable = engine.pushMsg(false, env, new Filename("tmp", "eval"), "10 + Math.sqrt(5 / 3)", null);
+// Run the engine on the same thread, until the event loop runs empty
+engine.run(true);
 
-        var res = engine.pushMsg(false, engine.global(), Map.of(), "<stdio>", raw, null).await();
-        Values.printValue(engine.context(), res);
-        System.out.println();
-    }
-    catch (EngineException e) {
-        try {
-            System.out.println("Uncaught " + e.toString(engine.context()));
-        }
-        catch (InterruptedException _e) {  return; }
-    }
-    catch (IOException | InterruptedException e) { return; }
-}
+// Get our result
+System.out.println(awaitable.await());
 ```
+
+## NOTE:
+
+To setup the typescript bundle in your sources, run `node build.js init-ts`. This will download the latest version of typescript, minify it, and add it to your src/assets folder. If you are going to work with the `node build.js debug|release` command, this is not a necessary step.

build.js

@@ -1,17 +1,9 @@
 const { spawn } = require('child_process');
 const fs = require('fs/promises');
 const pt = require('path');
-const { argv } = require('process');
+const { argv, exit } = require('process');
+const { Readable } = require('stream');
 
-const conf = {
-    name: "java-jscript",
-    author: "TopchetoEU",
-    javahome: "",
-    version: argv[3]
-};
-
-if (conf.version.startsWith('refs/tags/')) conf.version = conf.version.substring(10);
-if (conf.version.startsWith('v')) conf.version = conf.version.substring(1);
 
 async function* find(src, dst, wildcard) {
     const stat = await fs.stat(src);
@@ -36,9 +28,9 @@ async function copy(src, dst, wildcard) {
     await Promise.all(promises);
 }
 
-function run(cmd, ...args) {
+function run(suppressOutput, cmd, ...args) {
     return new Promise((res, rej) => {
-        const proc = spawn(cmd, args, { stdio: 'inherit' });
+        const proc = spawn(cmd, args, { stdio: suppressOutput ? 'ignore' : 'inherit' });
         proc.once('exit', code => {
             if (code === 0) res(code);
             else rej(new Error(`Process ${cmd} exited with code ${code}.`));
@@ -46,9 +38,87 @@ function run(cmd, ...args) {
     })
 }
 
-async function compileJava() {
+async function downloadTypescript(outFile) {
     try {
-        await fs.writeFile('Metadata.java', (await fs.readFile('src/me/topchetoeu/jscript/Metadata.java')).toString()
+        // Import the required libraries, without the need of a package.json
+        console.log('Importing modules...');
+        await run(true, 'npm', 'i', 'tar', 'zlib', 'uglify-js');
+        await fs.mkdir(pt.dirname(outFile), { recursive: true });
+        await fs.mkdir('tmp', { recursive: true });
+
+        const tar = require('tar');
+        const zlib = require('zlib');
+        const { minify } = await import('uglify-js');
+
+        // Download the package.json file of typescript
+        const packageDesc = await (await fetch('https://registry.npmjs.org/typescript/latest')).json();
+        const url = packageDesc.dist.tarball;
+
+        console.log('Extracting typescript...');
+        await new Promise(async (res, rej) => Readable.fromWeb((await fetch(url)).body)
+            .pipe(zlib.createGunzip())
+            .pipe(tar.x({ cwd: 'tmp', filter: v => v === 'package/lib/typescript.js' }))
+            .on('end', res)
+            .on('error', rej)
+        );
+
+        console.log('Compiling typescript to ES5...');
+
+        const ts = require('./tmp/package/lib/typescript');
+        const program = ts.createProgram([ 'tmp/package/lib/typescript.js' ], {
+            outFile: "tmp/typescript-es5.js",
+            target: ts.ScriptTarget.ES5,
+            module: ts.ModuleKind.None,
+            downlevelIteration: true,
+            allowJs: true,
+        });
+        program.emit();
+
+        console.log('Minifying typescript...');
+
+        const minified = minify((await fs.readFile('tmp/typescript-es5.js')).toString());
+        // const minified = { code: (await fs.readFile('tmp/typescript-es5.js')).toString() };
+        if (minified.error) throw minified.error;
+
+        // Patch unsupported regex syntax
+        minified.code = minified.code.replaceAll('[-/\\\\^$*+?.()|[\\]{}]', '[-/\\\\^$*+?.()|\\[\\]{}]');
+
+        const stream = await fs.open(outFile, 'w');
+
+        // Write typescript's license
+        await stream.write(new TextEncoder().encode(`
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+
+The following is a minified version of the unmodified Typescript 5.2
+***************************************************************************** */
+`));
+
+        await stream.write(minified.code);
+        console.log('Typescript bundling done!');
+    }
+    finally {
+        // Clean up all stuff left from typescript bundling
+        await fs.rm('tmp', { recursive: true, force: true });
+        await fs.rm('package.json');
+        await fs.rm('package-lock.json');
+        await fs.rm('node_modules', { recursive: true });
+    }
+}
+async function compileJava(conf) {
+    try {
+        await fs.writeFile('Metadata.java', (await fs.readFile('src/me/topchetoeu/jscript/common/Metadata.java')).toString()
             .replace('${VERSION}', conf.version)
             .replace('${NAME}', conf.name)
             .replace('${AUTHOR}', conf.author)
@@ -57,23 +127,67 @@ async function compileJava() {
         if (argv[2] === 'debug') args.push('-g');
         args.push('-d', 'dst/classes', 'Metadata.java');
     
+        console.log('Compiling java project...');
         for await (const path of find('src', undefined, v => v.endsWith('.java') && !v.endsWith('Metadata.java'))) args.push(path);
-        await run(conf.javahome + 'javac', ...args);
+        await run(false, conf.javahome + 'javac', ...args);
+        console.log('Compiled java project!');
     }
     finally {
         await fs.rm('Metadata.java');
     }
 }
+async function jar(conf, project, mainClass) {
+    const args = [
+        'jar', '-c',
+        '-f', `dst/${project}-v${conf.version}.jar`,
+    ];
+    if (mainClass) args.push('-e', mainClass);
+    args.push('-C', 'dst/classes', project.replaceAll('.', '/'));
+    console.log(args.join(' '));
+
+    await run(true, ...args);
+}
 
 (async () => {
     try {
-        try { await fs.rm('dst', { recursive: true }); } catch {}
-        await copy('src', 'dst/classes', v => !v.endsWith('.java'));
-        await compileJava();
-        await run('jar', '-c', '-f', 'dst/jscript.jar', '-e', 'me.topchetoeu.jscript.Main', '-C', 'dst/classes', '.');
+        if (argv[2] === 'init-ts') {
+            await downloadTypescript('src/me/topchetoeu/jscript/utils/assets/js/ts.js');
+        }
+        else {
+            const conf = {
+                name: "java-jscript",
+                author: "TopchetoEU",
+                javahome: "",
+                version: argv[3]
+            };
+
+            if (conf.version.startsWith('refs/tags/')) conf.version = conf.version.substring(10);
+            if (conf.version.startsWith('v')) conf.version = conf.version.substring(1);
+
+            try { await fs.rm('dst', { recursive: true }); } catch {}
+
+            await Promise.all([
+                (async () => {
+                    await copy('src', 'dst/classes', v => !v.endsWith('.java'));
+                    // await downloadTypescript('dst/classes/me/topchetoeu/jscript/utils/assets/js/ts.js');
+                })(),
+                compileJava(conf),
+            ]);
+
+            await Promise.all([
+                jar(conf, 'me.topchetoeu.jscript.common'),
+                jar(conf, 'me.topchetoeu.jscript.core'),
+                jar(conf, 'me.topchetoeu.jscript.lib'),
+                jar(conf, 'me.topchetoeu.jscript.utils'),
+                jar(conf, 'me.topchetoeu.jscript', 'me.topchetoeu.jscript.utils.JScriptRepl'),
+            ]);
+
+            console.log('Done!');
+        }
     }
     catch (e) {
         if (argv[2] === 'debug') throw e;
-        else console.log(e.toString());
+        console.log(e.toString());
+        exit(-1);
     }
 })();

src/me/topchetoeu/jscript/Main.java

@@ -1,153 +0,0 @@
-package me.topchetoeu.jscript;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import me.topchetoeu.jscript.engine.Context;
-import me.topchetoeu.jscript.engine.Engine;
-import me.topchetoeu.jscript.engine.Environment;
-import me.topchetoeu.jscript.engine.StackData;
-import me.topchetoeu.jscript.engine.debug.DebugServer;
-import me.topchetoeu.jscript.engine.debug.SimpleDebugger;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.NativeFunction;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Values;
-import me.topchetoeu.jscript.events.Observer;
-import me.topchetoeu.jscript.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.InterruptException;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
-import me.topchetoeu.jscript.lib.Internals;
-
-public class Main {
-    static Thread engineTask, debugTask;
-    static Engine engine;
-    static Environment env;
-    static int j = 0;
-
-    private static Observer<Object> valuePrinter = new Observer<Object>() {
-        public void next(Object data) {
-            Values.printValue(null, data);
-            System.out.println();
-        }
-
-        public void error(RuntimeException err) {
-            Values.printError(err, null);
-        }
-
-        @Override
-        public void finish() {
-            engineTask.interrupt();
-        }
-    };
-
-    public static void main(String args[]) {
-        System.out.println(String.format("Running %s v%s by %s", Metadata.NAME, Metadata.VERSION, Metadata.AUTHOR));
-        engine = new Engine(true);
-
-        env = new Environment(null, null, null);
-        var exited = new boolean[1];
-        var server = new DebugServer();
-        server.targets.put("target", (ws, req) -> new SimpleDebugger(ws, engine));
-
-        engineTask = engine.start();
-        debugTask = server.start(new InetSocketAddress("127.0.0.1", 9229), true);
-
-        engine.pushMsg(false, null, new NativeFunction((ctx, thisArg, _a) -> {
-            new Internals().apply(env);
-
-            env.global.define("exit", _ctx -> {
-                exited[0] = true;
-                throw new InterruptException();
-            });
-            env.global.define("go", _ctx -> {
-                try {
-                    var f = Path.of("do.js");
-                    var func = _ctx.compile(new Filename("do", "do/" + j++ + ".js"), new String(Files.readAllBytes(f)));
-                    return func.call(_ctx);
-                }
-                catch (IOException e) {
-                    throw new EngineException("Couldn't open do.js");
-                }
-            });
-            // TODO: make better API
-            env.global.define(true, new NativeFunction("include", (_ctx, th, __args) -> {
-                try {
-                    var currFilename = StackData.peekFrame(_ctx).function.loc().filename();
-                    var loc = Path.of("").toAbsolutePath();
-                    if (currFilename.protocol.equals("file")) loc = Path.of(currFilename.path).getParent();
-                    var path = loc.resolve(Path.of(__args.length >= 1 ? Values.toString(_ctx, __args[0]) : ""));
-                    var src = Files.readString(path);
-                    var func = _ctx.compile(Filename.fromFile(path.toFile()), src);
-                    var callArgs = new ArrayValue();
-                    if (__args.length >= 2 && __args[1] instanceof ArrayValue) callArgs = (ArrayValue)__args[1];
-                    return func.call(_ctx, null, callArgs);
-                }
-                catch (IOException e) { throw EngineException.ofError("IOError", "Couldn't open file."); }
-            }));
-
-            return null;
-        }), null).await();
-
-        try {
-            var tsEnv = env.child();
-            tsEnv.global.define(null, "module", false, new ObjectValue());
-            engine.pushMsg(
-                false, new Context(engine).pushEnv(tsEnv),
-                new Filename("jscript", "ts.js"),
-                Reading.resourceToString("js/ts.js"), null
-            ).await();
-            System.out.println("Loaded typescript!");
-
-            var ctx = new Context(engine).pushEnv(env.child());
-
-            engine.pushMsg(
-                false, ctx,
-                new Filename("jscript", "internals/bootstrap.js"), Reading.resourceToString("js/bootstrap.js"), null,
-                tsEnv.global.get(ctx, "ts"), env, new ArrayValue(null, Reading.resourceToString("js/lib.d.ts"))
-            ).await();
-        }
-        catch (EngineException e) {
-            Values.printError(e, "(while initializing TS)");
-        }
-
-        var reader = new Thread(() -> {
-            try {
-                for (var arg : args) {
-                    try {
-                        var file = Path.of(arg);
-                        var raw = Files.readString(file);
-                        valuePrinter.next(engine.pushMsg(false, new Context(engine).pushEnv(env), Filename.fromFile(file.toFile()), raw, null).await());
-                    }
-                    catch (EngineException e) { Values.printError(e, ""); }
-                }
-                for (var i = 0; ; i++) {
-                    try {
-                        var raw = Reading.read();
-
-                        if (raw == null) break;
-                        valuePrinter.next(engine.pushMsg(false, new Context(engine).pushEnv(env), new Filename("jscript", "repl/" + i + ".js"), raw, null).await());
-                    }
-                    catch (EngineException e) { Values.printError(e, ""); }
-                }
-            }
-            catch (IOException e) { exited[0] = true; }
-            catch (SyntaxException ex) {
-                if (exited[0]) return;
-                System.out.println("Syntax error:" + ex.msg);
-            }
-            catch (RuntimeException ex) {
-                if (!exited[0]) {
-                    System.out.println("Internal error ocurred:");
-                    ex.printStackTrace();
-                }
-            }
-            if (exited[0]) debugTask.interrupt();
-        });
-        reader.setDaemon(true);
-        reader.setName("STD Reader");
-        reader.start();
-    }
-}

src/me/topchetoeu/jscript/MessageReceiver.java

@@ -1,6 +0,0 @@
-package me.topchetoeu.jscript;
-
-public interface MessageReceiver {
-    void sendMessage(String msg);
-    void sendError(String msg);
-}

src/me/topchetoeu/jscript/Metadata.java

@@ -1,7 +0,0 @@
-package me.topchetoeu.jscript;
-
-public class Metadata {
-    public static final String VERSION = "${VERSION}";
-    public static final String AUTHOR = "${AUTHOR}";
-    public static final String NAME = "${NAME}";
-}

src/me/topchetoeu/jscript/Reading.java

@@ -1,36 +0,0 @@
-package me.topchetoeu.jscript;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import me.topchetoeu.jscript.exceptions.UncheckedException;
-
-public class Reading {
-    private static final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-
-    public static synchronized String read() throws IOException {
-        return reader.readLine();
-    }
-
-    public static String streamToString(InputStream in) {
-        try {
-            StringBuilder out = new StringBuilder();
-            BufferedReader br = new BufferedReader(new InputStreamReader(in));
-
-            for(var line = br.readLine(); line != null; line = br.readLine()) {
-                out.append(line).append('\n');
-            }
-
-            br.close();
-            return out.toString();
-        }
-        catch (Throwable e) { throw new UncheckedException(e); }
-    }
-    public static String resourceToString(String name) {
-        var str = Main.class.getResourceAsStream("/me/topchetoeu/jscript/" + name);
-        if (str == null) return null;
-        return streamToString(str);
-    }
-}

src/me/topchetoeu/jscript/common/Buffer.java

@@ -0,0 +1,53 @@
+package me.topchetoeu.jscript.common;
+
+public class Buffer {
+    private byte[] data;
+    private int length;
+
+    public void write(int i, byte[] val) {
+        if (i + val.length > data.length) {
+            var newCap = i + val.length + 1;
+            if (newCap < data.length * 2) newCap = data.length * 2;
+
+            var tmp = new byte[newCap];
+            System.arraycopy(this.data, 0, tmp, 0, length);
+            this.data = tmp;
+        }
+
+        System.arraycopy(val, 0, data, i, val.length);
+        if (i + val.length > length) length = i + val.length;
+    }
+    public int read(int i, byte[] buff) {
+        int n = buff.length;
+        if (i + n > length) n = length - i;
+        System.arraycopy(data, i, buff, 0, n);
+        return n;
+    }
+
+    public void append(byte b) {
+        write(length, new byte[] { b });
+    }
+
+    public byte[] data() {
+        var res = new byte[length];
+        System.arraycopy(this.data, 0, res, 0, length);
+        return res;
+    }
+    public int length() {
+        return length;
+    }
+
+    public Buffer(byte[] data) {
+        this.data = new byte[data.length];
+        this.length = data.length;
+        System.arraycopy(data, 0, this.data, 0, data.length);
+    }
+    public Buffer(int capacity) {
+        this.data = new byte[capacity];
+        this.length = 0;
+    }
+    public Buffer() {
+        this.data = new byte[128];
+        this.length = 0;
+    }
+}

src/me/topchetoeu/jscript/common/Filename.java

@@ -1,6 +1,7 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 import java.io.File;
+import java.nio.file.Path;
 
 public class Filename {
     public final String protocol;
@@ -40,9 +41,7 @@ public class Filename {
         return true;
     }
 
-    public static Filename fromFile(File file) {
-        return new Filename("file", file.getAbsolutePath());
-    }
+
 
 
     public Filename(String protocol, String path) {
@@ -51,4 +50,16 @@ public class Filename {
         this.protocol = protocol;
         this.path = path;
     }
+
+    public static Filename parse(String val) {
+        var i = val.indexOf("://");
+        if (i >= 0) return new Filename(val.substring(0, i).trim(), val.substring(i + 3).trim());
+        else return new Filename("file", val.trim());
+    }
+    public static Path normalize(String path) {
+        return Path.of(Path.of("/" + path.trim().replace("\\", "/")).normalize().toString().substring(1));
+    }
+    public static Filename fromFile(File file) {
+        return new Filename("file", file.getAbsolutePath());
+    }
 }

src/me/topchetoeu/jscript/common/Location.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 public class Location implements Comparable<Location> {
     public static final Location INTERNAL = new Location(0, 0, new Filename("jscript", "native"));
@@ -71,4 +71,23 @@ public class Location implements Comparable<Location> {
         this.start = start;
         this.filename = filename;
     }
+
+    public static Location parse(String raw) {
+        int i0 = -1, i1 = -1;
+        for (var i = raw.length() - 1; i >= 0; i--) {
+            if (raw.charAt(i) == ':') {
+                if (i1 == -1) i1 = i;
+                else if (i0 == -1) {
+                    i0 = i;
+                    break;
+                }
+            }
+        }
+
+        return new Location(
+            Integer.parseInt(raw.substring(i0 + 1, i1)),
+            Integer.parseInt(raw.substring(i1 + 1)),
+            Filename.parse(raw.substring(0, i0))
+        );
+    }
 }

src/me/topchetoeu/jscript/common/Metadata.java

@@ -0,0 +1,20 @@
+package me.topchetoeu.jscript.common;
+
+public class Metadata {
+    private static final String VERSION = "${VERSION}";
+    private static final String AUTHOR = "${AUTHOR}";
+    private static final String NAME = "${NAME}";
+
+    public static String version() {
+        if (VERSION.equals("$" + "{VERSION}")) return "1337-devel";
+        else return VERSION;
+    }
+    public static String author() {
+        if (AUTHOR.equals("$" + "{AUTHOR}")) return "anonymous";
+        else return AUTHOR;
+    }
+    public static String name() {
+        if (NAME.equals("$" + "{NAME}")) return "some-product";
+        else return NAME;
+    }
+}

src/me/topchetoeu/jscript/common/Reading.java

@@ -0,0 +1,33 @@
+package me.topchetoeu.jscript.common;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
+
+public class Reading {
+    private static final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+
+    public static synchronized String readline() throws IOException {
+        return reader.readLine();
+    }
+
+    /**
+     * Reads the given stream to a string
+     * @param in 
+     * @return
+     */
+    public static String streamToString(InputStream in) {
+        try {
+            return new String(in.readAllBytes());
+        }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+    public static InputStream resourceToStream(String name) {
+        return Reading.class.getResourceAsStream("/" + name);
+    }
+    public static String resourceToString(String name) {
+        return streamToString(resourceToStream(name));
+    }
+}

src/me/topchetoeu/jscript/common/ResultRunnable.java

@@ -0,0 +1,5 @@
+package me.topchetoeu.jscript.common;
+
+public interface ResultRunnable<T> {
+    T run();
+}

src/me/topchetoeu/jscript/common/events/Awaitable.java

@@ -0,0 +1,27 @@
+package me.topchetoeu.jscript.common.events;
+
+public interface Awaitable<T> {
+    public static interface ResultHandler<T> {
+        public void onResult(T data);
+    }
+    public static interface ErrorHandler {
+        public void onError(RuntimeException error);
+    }
+
+    T await();
+
+    default void handle(ResultHandler<T> onResult, ErrorHandler onError) {
+        var thread = new Thread(() -> {
+            try {
+                onResult.onResult(await());
+            }
+            catch (RuntimeException e) {
+                onError.onError(e);
+            }
+        }, "Awaiter");
+        thread.start();
+    }
+    default void handle(ResultHandler<T> onResult) {
+        handle(onResult, err -> {});
+    }
+}

src/me/topchetoeu/jscript/common/events/DataNotifier.java

@@ -1,34 +1,31 @@
-package me.topchetoeu.jscript.events;
-
-public class DataNotifier<T> implements Awaitable<T> {
-    private Notifier notifier = new Notifier();
-    private boolean isErr;
-    private T val;
-    private RuntimeException err;
-
-    public void error(RuntimeException t) {
-        err = t;
-        isErr = true;
-        notifier.next();
-    }
-    public void error(Throwable t) {
-        error(new RuntimeException(t));
-    }
-    public void next(T val) {
-        this.val = val;
-        isErr = false;
-        notifier.next();
-    }
-    public T await() {
-        notifier.await();
-
-        try {
-            if (isErr) throw err;
-            else return val;
-        }
-        finally {
-            this.err = null;
-            this.val = null;
-        }
-    }
-}
+package me.topchetoeu.jscript.common.events;
+
+public class DataNotifier<T> implements Awaitable<T> {
+    private Notifier notifier = new Notifier();
+    private boolean isErr;
+    private T val;
+    private RuntimeException err;
+
+    public void error(RuntimeException t) {
+        err = t;
+        isErr = true;
+        notifier.next();
+    }
+    public void next(T val) {
+        this.val = val;
+        isErr = false;
+        notifier.next();
+    }
+    public T await() {
+        notifier.await();
+
+        try {
+            if (isErr) throw err;
+            else return val;
+        }
+        finally {
+            this.err = null;
+            this.val = null;
+        }
+    }
+}

src/me/topchetoeu/jscript/common/events/Notifier.java

@@ -1,19 +1,19 @@
-package me.topchetoeu.jscript.events;
-
-import me.topchetoeu.jscript.exceptions.InterruptException;
-
-public class Notifier {
-    private boolean ok = false;
-
-    public synchronized void next() {
-        ok = true;
-        notifyAll();
-    }
-    public synchronized void await() {
-        try {
-            while (!ok) wait();
-            ok = false;
-        }
-        catch (InterruptedException e) { throw new InterruptException(e); }
-    }
-}
+package me.topchetoeu.jscript.common.events;
+
+import me.topchetoeu.jscript.core.exceptions.InterruptException;
+
+public class Notifier {
+    private boolean ok = false;
+
+    public synchronized void next() {
+        ok = true;
+        notifyAll();
+    }
+    public synchronized void await() {
+        try {
+            while (!ok) wait();
+            ok = false;
+        }
+        catch (InterruptedException e) { throw new InterruptException(e); }
+    }
+}

src/me/topchetoeu/jscript/common/json/JSON.java

@@ -1,243 +1,243 @@
-package me.topchetoeu.jscript.json;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import me.topchetoeu.jscript.Filename;
-import me.topchetoeu.jscript.engine.Context;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
-import me.topchetoeu.jscript.parsing.Operator;
-import me.topchetoeu.jscript.parsing.ParseRes;
-import me.topchetoeu.jscript.parsing.Parsing;
-import me.topchetoeu.jscript.parsing.Token;
-
-public class JSON {
-    public static Object toJs(JSONElement val) {
-        if (val.isBoolean()) return val.bool();
-        if (val.isString()) return val.string();
-        if (val.isNumber()) return val.number();
-        if (val.isList()) return ArrayValue.of(null, val.list().stream().map(JSON::toJs).collect(Collectors.toList()));
-        if (val.isMap()) {
-            var res = new ObjectValue();
-            for (var el : val.map().entrySet()) {
-                res.defineProperty(null, el.getKey(), toJs(el.getValue()));
-            }
-            return res;
-        }
-        if (val.isNull()) return Values.NULL;
-        return null;
-    }
-    private static JSONElement fromJs(Context ctx, Object val, HashSet<Object> prev) {
-        if (val instanceof Boolean) return JSONElement.bool((boolean)val);
-        if (val instanceof Number) return JSONElement.number(((Number)val).doubleValue());
-        if (val instanceof String) return JSONElement.string((String)val);
-        if (val == Values.NULL) return JSONElement.NULL;
-        if (val instanceof ObjectValue) {
-            if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
-            prev.add(val);
-
-            var res = new JSONMap();
-
-            for (var el : ((ObjectValue)val).keys(false)) {
-                var jsonEl = fromJs(ctx, ((ObjectValue)val).getMember(ctx, el), prev);
-                if (jsonEl == null) continue;
-                if (el instanceof String || el instanceof Number) res.put(el.toString(), jsonEl);
-            }
-
-            prev.remove(val);
-            return JSONElement.of(res);
-        }
-        if (val instanceof ArrayValue) {
-            if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
-            prev.add(val);
-
-            var res = new JSONList();
-
-            for (var el : ((ArrayValue)val).toArray()) {
-                var jsonEl = fromJs(ctx, el, prev);
-                if (jsonEl == null) jsonEl = JSONElement.NULL;
-                res.add(jsonEl);
-            }
-
-            prev.remove(val);
-            return JSONElement.of(res);
-        }
-        if (val == null) return null;
-        return null;
-    }
-    public static JSONElement fromJs(Context ctx, Object val) {
-        return fromJs(ctx, val, new HashSet<>());
-    }
-
-    public static ParseRes<String> parseIdentifier(List<Token> tokens, int i) {
-        return Parsing.parseIdentifier(tokens, i);
-    }
-    public static ParseRes<String> parseString(Filename filename, List<Token> tokens, int i) {
-        var res = Parsing.parseString(filename, tokens, i);
-        if (res.isSuccess()) return ParseRes.res((String)res.result.value, res.n);
-        else return res.transform();
-    }
-    public static ParseRes<Double> parseNumber(Filename filename, List<Token> tokens, int i) {
-        var minus = Parsing.isOperator(tokens, i, Operator.SUBTRACT);
-        if (minus) i++;
-
-        var res = Parsing.parseNumber(filename, tokens, i);
-        if (res.isSuccess()) return ParseRes.res((minus ? -1 : 1) * (Double)res.result.value, res.n + (minus ? 1 : 0));
-        else return res.transform();
-    }
-    public static ParseRes<Boolean> parseBool(Filename filename, List<Token> tokens, int i) {
-        var id = parseIdentifier(tokens, i);
-
-        if (!id.isSuccess()) return ParseRes.failed();
-        else if (id.result.equals("true")) return ParseRes.res(true, 1);
-        else if (id.result.equals("false")) return ParseRes.res(false, 1);
-        else return ParseRes.failed();
-    }
-
-    public static ParseRes<?> parseValue(Filename filename, List<Token> tokens, int i) {
-        return ParseRes.any(
-            parseString(filename, tokens, i),
-            parseNumber(filename, tokens, i),
-            parseBool(filename, tokens, i),
-            parseMap(filename, tokens, i),
-            parseList(filename, tokens, i)
-        );
-    }
-
-    public static ParseRes<JSONMap> parseMap(Filename filename, List<Token> tokens, int i) {
-        int n = 0;
-        if (!Parsing.isOperator(tokens, i + n++, Operator.BRACE_OPEN)) return ParseRes.failed();
-
-        var values = new JSONMap();
-
-        while (true) {
-            if (Parsing.isOperator(tokens, i + n, Operator.BRACE_CLOSE)) {
-                n++;
-                break;
-            }
-
-            var name = ParseRes.any(
-                parseIdentifier(tokens, i + n),
-                parseString(filename, tokens, i + n),
-                parseNumber(filename, tokens, i + n)
-            );
-            if (!name.isSuccess()) return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected an index.", name);
-            else n += name.n;
-
-            if (!Parsing.isOperator(tokens, i + n, Operator.COLON)) {
-                return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected a colon.", name);
-            }
-            n++;
-
-            var res = parseValue(filename, tokens, i + n);
-            if (!res.isSuccess()) return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected a list element.", res);
-            else n += res.n;
-
-            values.put(name.result.toString(), JSONElement.of(res.result));
-
-            if (Parsing.isOperator(tokens, i + n, Operator.COMMA)) n++;
-            else if (Parsing.isOperator(tokens, i + n, Operator.BRACE_CLOSE)) {
-                n++;
-                break;
-            }
-        }
-
-        return ParseRes.res(values, n);
-    }
-    public static ParseRes<JSONList> parseList(Filename filename, List<Token> tokens, int i) {
-        int n = 0;
-        if (!Parsing.isOperator(tokens, i + n++, Operator.BRACKET_OPEN)) return ParseRes.failed();
-
-        var values = new JSONList();
-
-        while (true) {
-            if (Parsing.isOperator(tokens, i + n, Operator.BRACKET_CLOSE)) {
-                n++;
-                break;
-            }
-
-            var res = parseValue(filename, tokens, i + n);
-            if (!res.isSuccess()) return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected a list element.", res);
-            else n += res.n;
-
-            values.add(JSONElement.of(res.result));
-
-            if (Parsing.isOperator(tokens, i + n, Operator.COMMA)) n++;
-            else if (Parsing.isOperator(tokens, i + n, Operator.BRACKET_CLOSE)) {
-                n++;
-                break;
-            }
-        }
-
-        return ParseRes.res(values, n);
-    }
-    public static JSONElement parse(Filename filename, String raw) {
-        if (filename == null) filename = new Filename("jscript", "json");
-        var res = parseValue(filename, Parsing.tokenize(filename, raw), 0);
-        if (res.isFailed()) throw new SyntaxException(null, "Invalid JSON given.");
-        else if (res.isError()) throw new SyntaxException(null, res.error);
-        else return JSONElement.of(res.result);
-    }
-
-    public static String stringify(JSONElement el) {
-        if (el.isNumber()) return Double.toString(el.number());
-        if (el.isBoolean()) return el.bool() ? "true" : "false";
-        if (el.isNull()) return "null";
-        if (el.isString()) {
-            var res = new StringBuilder("\"");
-            var alphabet = "0123456789ABCDEF".toCharArray();
-
-            for (var c : el.string().toCharArray()) {
-                if (c < 32 || c >= 127) {
-                    res
-                        .append("\\u")
-                        .append(alphabet[(c >> 12) & 0xF])
-                        .append(alphabet[(c >> 8) & 0xF])
-                        .append(alphabet[(c >> 4) & 0xF])
-                        .append(alphabet[(c >> 0) & 0xF]);
-                }
-                else if (c == '\\')
-                    res.append("\\\\");
-                else if (c == '"')
-                    res.append("\\\"");
-                else res.append(c);
-            }
-
-            return res.append('"').toString();
-        }
-        if (el.isList()) {
-            var res = new StringBuilder().append("[");
-            for (int i = 0; i < el.list().size(); i++) {
-                if (i != 0) res.append(",");
-                res.append(stringify(el.list().get(i)));
-            }
-            res.append("]");
-            return res.toString();
-        }
-        if (el.isMap()) {
-            var res = new StringBuilder().append("{");
-            var entries = el.map().entrySet().stream().collect(Collectors.toList());
-
-            for (int i = 0; i < entries.size(); i++) {
-                if (i != 0) res.append(",");
-                res.append(stringify(JSONElement.string(entries.get(i).getKey())));
-                res.append(":");
-                res.append(stringify(entries.get(i).getValue()));
-            }
-            res.append("}");
-            return res.toString();
-        }
-        return null;
-    }
-    public static String stringify(JSONMap map) {
-        return stringify(JSONElement.of(map));
-    }
-    public static String stringify(JSONList list) {
-        return stringify(JSONElement.of(list));
-    }
-}
+package me.topchetoeu.jscript.common.json;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.topchetoeu.jscript.common.Filename;
+import me.topchetoeu.jscript.core.engine.Context;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.Values;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
+import me.topchetoeu.jscript.core.parsing.Operator;
+import me.topchetoeu.jscript.core.parsing.ParseRes;
+import me.topchetoeu.jscript.core.parsing.Parsing;
+import me.topchetoeu.jscript.core.parsing.Token;
+
+public class JSON {
+    public static Object toJs(JSONElement val) {
+        if (val.isBoolean()) return val.bool();
+        if (val.isString()) return val.string();
+        if (val.isNumber()) return val.number();
+        if (val.isList()) return ArrayValue.of(null, val.list().stream().map(JSON::toJs).collect(Collectors.toList()));
+        if (val.isMap()) {
+            var res = new ObjectValue();
+            for (var el : val.map().entrySet()) {
+                res.defineProperty(null, el.getKey(), toJs(el.getValue()));
+            }
+            return res;
+        }
+        if (val.isNull()) return Values.NULL;
+        return null;
+    }
+    private static JSONElement fromJs(Context ctx, Object val, HashSet<Object> prev) {
+        if (val instanceof Boolean) return JSONElement.bool((boolean)val);
+        if (val instanceof Number) return JSONElement.number(((Number)val).doubleValue());
+        if (val instanceof String) return JSONElement.string((String)val);
+        if (val == Values.NULL) return JSONElement.NULL;
+        if (val instanceof ArrayValue) {
+            if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
+            prev.add(val);
+
+            var res = new JSONList();
+
+            for (var el : ((ArrayValue)val).toArray()) {
+                var jsonEl = fromJs(ctx, el, prev);
+                if (jsonEl == null) jsonEl = JSONElement.NULL;
+                res.add(jsonEl);
+            }
+
+            prev.remove(val);
+            return JSONElement.of(res);
+        }
+        if (val instanceof ObjectValue) {
+            if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
+            prev.add(val);
+
+            var res = new JSONMap();
+
+            for (var el : Values.getMembers(ctx, val, false, false)) {
+                var jsonEl = fromJs(ctx, Values.getMember(ctx, val, el), prev);
+                if (jsonEl == null) continue;
+                if (el instanceof String || el instanceof Number) res.put(el.toString(), jsonEl);
+            }
+
+            prev.remove(val);
+            return JSONElement.of(res);
+        }
+        if (val == null) return null;
+        return null;
+    }
+    public static JSONElement fromJs(Context ctx, Object val) {
+        return fromJs(ctx, val, new HashSet<>());
+    }
+
+    public static ParseRes<String> parseIdentifier(List<Token> tokens, int i) {
+        return Parsing.parseIdentifier(tokens, i);
+    }
+    public static ParseRes<String> parseString(Filename filename, List<Token> tokens, int i) {
+        var res = Parsing.parseString(filename, tokens, i);
+        if (res.isSuccess()) return ParseRes.res((String)res.result.value, res.n);
+        else return res.transform();
+    }
+    public static ParseRes<Double> parseNumber(Filename filename, List<Token> tokens, int i) {
+        var minus = Parsing.isOperator(tokens, i, Operator.SUBTRACT);
+        if (minus) i++;
+
+        var res = Parsing.parseNumber(filename, tokens, i);
+        if (res.isSuccess()) return ParseRes.res((minus ? -1 : 1) * (Double)res.result.value, res.n + (minus ? 1 : 0));
+        else return res.transform();
+    }
+    public static ParseRes<Boolean> parseBool(Filename filename, List<Token> tokens, int i) {
+        var id = parseIdentifier(tokens, i);
+
+        if (!id.isSuccess()) return ParseRes.failed();
+        else if (id.result.equals("true")) return ParseRes.res(true, 1);
+        else if (id.result.equals("false")) return ParseRes.res(false, 1);
+        else return ParseRes.failed();
+    }
+
+    public static ParseRes<?> parseValue(Filename filename, List<Token> tokens, int i) {
+        return ParseRes.any(
+            parseString(filename, tokens, i),
+            parseNumber(filename, tokens, i),
+            parseBool(filename, tokens, i),
+            parseMap(filename, tokens, i),
+            parseList(filename, tokens, i)
+        );
+    }
+
+    public static ParseRes<JSONMap> parseMap(Filename filename, List<Token> tokens, int i) {
+        int n = 0;
+        if (!Parsing.isOperator(tokens, i + n++, Operator.BRACE_OPEN)) return ParseRes.failed();
+
+        var values = new JSONMap();
+
+        while (true) {
+            if (Parsing.isOperator(tokens, i + n, Operator.BRACE_CLOSE)) {
+                n++;
+                break;
+            }
+
+            var name = ParseRes.any(
+                parseIdentifier(tokens, i + n),
+                parseString(filename, tokens, i + n),
+                parseNumber(filename, tokens, i + n)
+            );
+            if (!name.isSuccess()) return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected an index.", name);
+            else n += name.n;
+
+            if (!Parsing.isOperator(tokens, i + n, Operator.COLON)) {
+                return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected a colon.", name);
+            }
+            n++;
+
+            var res = parseValue(filename, tokens, i + n);
+            if (!res.isSuccess()) return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected a list element.", res);
+            else n += res.n;
+
+            values.put(name.result.toString(), JSONElement.of(res.result));
+
+            if (Parsing.isOperator(tokens, i + n, Operator.COMMA)) n++;
+            else if (Parsing.isOperator(tokens, i + n, Operator.BRACE_CLOSE)) {
+                n++;
+                break;
+            }
+        }
+
+        return ParseRes.res(values, n);
+    }
+    public static ParseRes<JSONList> parseList(Filename filename, List<Token> tokens, int i) {
+        int n = 0;
+        if (!Parsing.isOperator(tokens, i + n++, Operator.BRACKET_OPEN)) return ParseRes.failed();
+
+        var values = new JSONList();
+
+        while (true) {
+            if (Parsing.isOperator(tokens, i + n, Operator.BRACKET_CLOSE)) {
+                n++;
+                break;
+            }
+
+            var res = parseValue(filename, tokens, i + n);
+            if (!res.isSuccess()) return ParseRes.error(Parsing.getLoc(filename, tokens, i + n), "Expected a list element.", res);
+            else n += res.n;
+
+            values.add(JSONElement.of(res.result));
+
+            if (Parsing.isOperator(tokens, i + n, Operator.COMMA)) n++;
+            else if (Parsing.isOperator(tokens, i + n, Operator.BRACKET_CLOSE)) {
+                n++;
+                break;
+            }
+        }
+
+        return ParseRes.res(values, n);
+    }
+    public static JSONElement parse(Filename filename, String raw) {
+        if (filename == null) filename = new Filename("jscript", "json");
+        var res = parseValue(filename, Parsing.tokenize(filename, raw), 0);
+        if (res.isFailed()) throw new SyntaxException(null, "Invalid JSON given.");
+        else if (res.isError()) throw new SyntaxException(null, res.error);
+        else return JSONElement.of(res.result);
+    }
+
+    public static String stringify(JSONElement el) {
+        if (el.isNumber()) return Double.toString(el.number());
+        if (el.isBoolean()) return el.bool() ? "true" : "false";
+        if (el.isNull()) return "null";
+        if (el.isString()) {
+            var res = new StringBuilder("\"");
+            var alphabet = "0123456789ABCDEF".toCharArray();
+
+            for (var c : el.string().toCharArray()) {
+                if (c < 32 || c >= 127) {
+                    res
+                        .append("\\u")
+                        .append(alphabet[(c >> 12) & 0xF])
+                        .append(alphabet[(c >> 8) & 0xF])
+                        .append(alphabet[(c >> 4) & 0xF])
+                        .append(alphabet[(c >> 0) & 0xF]);
+                }
+                else if (c == '\\')
+                    res.append("\\\\");
+                else if (c == '"')
+                    res.append("\\\"");
+                else res.append(c);
+            }
+
+            return res.append('"').toString();
+        }
+        if (el.isList()) {
+            var res = new StringBuilder().append("[");
+            for (int i = 0; i < el.list().size(); i++) {
+                if (i != 0) res.append(",");
+                res.append(stringify(el.list().get(i)));
+            }
+            res.append("]");
+            return res.toString();
+        }
+        if (el.isMap()) {
+            var res = new StringBuilder().append("{");
+            var entries = el.map().entrySet().stream().collect(Collectors.toList());
+
+            for (int i = 0; i < entries.size(); i++) {
+                if (i != 0) res.append(",");
+                res.append(stringify(JSONElement.string(entries.get(i).getKey())));
+                res.append(":");
+                res.append(stringify(entries.get(i).getValue()));
+            }
+            res.append("}");
+            return res.toString();
+        }
+        return null;
+    }
+    public static String stringify(JSONMap map) {
+        return stringify(JSONElement.of(map));
+    }
+    public static String stringify(JSONList list) {
+        return stringify(JSONElement.of(list));
+    }
+}

src/me/topchetoeu/jscript/common/json/JSONElement.java

@@ -1,88 +1,88 @@
-package me.topchetoeu.jscript.json;
-
-public class JSONElement {
-    public static enum Type {
-        STRING,
-        NUMBER,
-        BOOLEAN,
-        NULL,
-        LIST,
-        MAP,
-    }
-
-    public static final JSONElement NULL = new JSONElement(Type.NULL, null);
-
-    public static JSONElement map(JSONMap val) {
-        return new JSONElement(Type.MAP, val);
-    }
-    public static JSONElement list(JSONList val) {
-        return new JSONElement(Type.LIST, val);
-    }
-    public static JSONElement string(String val) {
-        return new JSONElement(Type.STRING, val);
-    }
-    public static JSONElement number(double val) {
-        return new JSONElement(Type.NUMBER, val);
-    }
-    public static JSONElement bool(boolean val) {
-        return new JSONElement(Type.BOOLEAN, val);
-    }
-
-    public static JSONElement of(Object val) {
-        if (val instanceof JSONMap) return map((JSONMap)val);
-        else if (val instanceof JSONList) return list((JSONList)val);
-        else if (val instanceof String) return string((String)val);
-        else if (val instanceof Boolean) return bool((Boolean)val);
-        else if (val instanceof Number) return number(((Number)val).doubleValue());
-        else if (val == null) return NULL;
-        else throw new IllegalArgumentException("val must be: String, Boolean, Number, JSONList or JSONMap.");
-    }
-
-    public final Type type;
-    private final Object value;
-
-    public boolean isMap() { return type == Type.MAP; }
-    public boolean isList() { return type == Type.LIST; }
-    public boolean isString() { return type == Type.STRING; }
-    public boolean isNumber() { return type == Type.NUMBER; }
-    public boolean isBoolean() { return type == Type.BOOLEAN; }
-    public boolean isNull() { return type == Type.NULL; }
-
-    public JSONMap map() {
-        if (!isMap()) throw new IllegalStateException("Element is not a map.");
-        return (JSONMap)value;
-    }
-    public JSONList list() {
-        if (!isList()) throw new IllegalStateException("Element is not a map.");
-        return (JSONList)value;
-    }
-    public String string() {
-        if (!isString()) throw new IllegalStateException("Element is not a string.");
-        return (String)value;
-    }
-    public double number() {
-        if (!isNumber()) throw new IllegalStateException("Element is not a number.");
-        return (double)value;
-    }
-    public boolean bool() {
-        if (!isBoolean()) throw new IllegalStateException("Element is not a boolean.");
-        return (boolean)value;
-    }
-
-    @Override
-    public String toString() {
-        if (isMap()) return "{...}";
-        if (isList()) return "[...]";
-        if (isString()) return (String)value;
-        if (isString()) return (String)value;
-        if (isNumber()) return (double)value + "";
-        if (isBoolean()) return (boolean)value + "";
-        if (isNull()) return "null";
-        return "";
-    }
-
-    private JSONElement(Type type, Object val) {
-        this.type = type;
-        this.value = val;
-    }
-}
+package me.topchetoeu.jscript.common.json;
+
+public class JSONElement {
+    public static enum Type {
+        STRING,
+        NUMBER,
+        BOOLEAN,
+        NULL,
+        LIST,
+        MAP,
+    }
+
+    public static final JSONElement NULL = new JSONElement(Type.NULL, null);
+
+    public static JSONElement map(JSONMap val) {
+        return new JSONElement(Type.MAP, val);
+    }
+    public static JSONElement list(JSONList val) {
+        return new JSONElement(Type.LIST, val);
+    }
+    public static JSONElement string(String val) {
+        return new JSONElement(Type.STRING, val);
+    }
+    public static JSONElement number(double val) {
+        return new JSONElement(Type.NUMBER, val);
+    }
+    public static JSONElement bool(boolean val) {
+        return new JSONElement(Type.BOOLEAN, val);
+    }
+
+    public static JSONElement of(Object val) {
+        if (val instanceof JSONMap) return map((JSONMap)val);
+        else if (val instanceof JSONList) return list((JSONList)val);
+        else if (val instanceof String) return string((String)val);
+        else if (val instanceof Boolean) return bool((Boolean)val);
+        else if (val instanceof Number) return number(((Number)val).doubleValue());
+        else if (val == null) return NULL;
+        else throw new IllegalArgumentException("val must be: String, Boolean, Number, JSONList or JSONMap.");
+    }
+
+    public final Type type;
+    private final Object value;
+
+    public boolean isMap() { return type == Type.MAP; }
+    public boolean isList() { return type == Type.LIST; }
+    public boolean isString() { return type == Type.STRING; }
+    public boolean isNumber() { return type == Type.NUMBER; }
+    public boolean isBoolean() { return type == Type.BOOLEAN; }
+    public boolean isNull() { return type == Type.NULL; }
+
+    public JSONMap map() {
+        if (!isMap()) throw new IllegalStateException("Element is not a map.");
+        return (JSONMap)value;
+    }
+    public JSONList list() {
+        if (!isList()) throw new IllegalStateException("Element is not a map.");
+        return (JSONList)value;
+    }
+    public String string() {
+        if (!isString()) throw new IllegalStateException("Element is not a string.");
+        return (String)value;
+    }
+    public double number() {
+        if (!isNumber()) throw new IllegalStateException("Element is not a number.");
+        return (double)value;
+    }
+    public boolean bool() {
+        if (!isBoolean()) throw new IllegalStateException("Element is not a boolean.");
+        return (boolean)value;
+    }
+
+    @Override
+    public String toString() {
+        if (isMap()) return "{...}";
+        if (isList()) return "[...]";
+        if (isString()) return (String)value;
+        if (isString()) return (String)value;
+        if (isNumber()) return (double)value + "";
+        if (isBoolean()) return (boolean)value + "";
+        if (isNull()) return "null";
+        return "";
+    }
+
+    private JSONElement(Type type, Object val) {
+        this.type = type;
+        this.value = val;
+    }
+}

src/me/topchetoeu/jscript/common/json/JSONList.java

@@ -1,26 +1,26 @@
-package me.topchetoeu.jscript.json;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public class JSONList extends ArrayList<JSONElement> {
-    public JSONList() {}
-    public JSONList(JSONElement ...els) {
-        super(List.of(els));
-    }
-    public JSONList(Collection<JSONElement> els) {
-        super(els);
-    }
-
-    public JSONList addNull() { this.add(JSONElement.NULL); return this; }
-    public JSONList add(String val) { this.add(JSONElement.of(val)); return this; }
-    public JSONList add(double val) { this.add(JSONElement.of(val)); return this; }
-    public JSONList add(boolean val) { this.add(JSONElement.of(val)); return this; }
-    public JSONList add(Map<String, JSONElement> val) { this.add(JSONElement.of(val)); return this; }
-    public JSONList add(Collection<JSONElement> val) { this.add(JSONElement.of(val)); return this; }
-    public JSONList add(JSONMap val) { this.add(JSONElement.of(val)); return this; }
-    public JSONList add(JSONList val) { this.add(JSONElement.of(val)); return this; }
-
-}
+package me.topchetoeu.jscript.common.json;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public class JSONList extends ArrayList<JSONElement> {
+    public JSONList() {}
+    public JSONList(JSONElement ...els) {
+        super(List.of(els));
+    }
+    public JSONList(Collection<JSONElement> els) {
+        super(els);
+    }
+
+    public JSONList addNull() { this.add(JSONElement.NULL); return this; }
+    public JSONList add(String val) { this.add(JSONElement.of(val)); return this; }
+    public JSONList add(double val) { this.add(JSONElement.of(val)); return this; }
+    public JSONList add(boolean val) { this.add(JSONElement.of(val)); return this; }
+    public JSONList add(Map<String, JSONElement> val) { this.add(JSONElement.of(val)); return this; }
+    public JSONList add(Collection<JSONElement> val) { this.add(JSONElement.of(val)); return this; }
+    public JSONList add(JSONMap val) { this.add(JSONElement.of(val)); return this; }
+    public JSONList add(JSONList val) { this.add(JSONElement.of(val)); return this; }
+
+}

src/me/topchetoeu/jscript/common/json/JSONMap.java

@@ -1,150 +1,150 @@
-package me.topchetoeu.jscript.json;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-public class JSONMap implements Map<String, JSONElement> {
-    private Map<String, JSONElement> elements = new HashMap<>();
-
-    public JSONElement get(String path) {
-        var curr = this;
-        var segs = path.split("\\.");
-        var i = 0;
-
-        while (true) {
-            var tmp = curr.elements.get(segs[i++]);
-            if (i == segs.length) return tmp;
-            if (!tmp.isMap()) return null;
-            curr = tmp.map();
-        }
-    }
-
-    public boolean isMap(String path) {
-        var el = get(path);
-        return el != null && el.isMap();
-    }
-    public boolean isList(String path) {
-        var el = get(path);
-        return el != null && el.isList();
-    }
-    public boolean isString(String path) {
-        var el = get(path);
-        return el != null && el.isString();
-    }
-    public boolean isNumber(String path) {
-        var el = get(path);
-        return el != null && el.isNumber();
-    }
-    public boolean isBoolean(String path) {
-        var el = get(path);
-        return el != null && el.isBoolean();
-    }
-    public boolean isNull(String path) {
-        var el = get(path);
-        return el != null && el.isNull();
-    }
-    public boolean contains(String path) {
-        return get(path) != null;
-    }
-
-    public JSONMap map(String path) {
-        var el = get(path);
-        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
-        return el.map();
-    }
-    public JSONMap map(String path, JSONMap defaultVal) {
-        var el = get(path);
-        if (el == null) return defaultVal;
-        if (el.isMap()) return el.map();
-        return defaultVal;
-    }
-
-    public JSONList list(String path) {
-        var el = get(path);
-        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
-        return el.list();
-    }
-    public JSONList list(String path, JSONList defaultVal) {
-        var el = get(path);
-        if (el == null) return defaultVal;
-        if (el.isList()) return el.list();
-        return defaultVal;
-    }
-
-    public String string(String path) {
-        var el = get(path);
-        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
-        return el.string();
-    }
-    public String string(String path, String defaultVal) {
-        var el = get(path);
-        if (el == null) return defaultVal;
-        if (el.isString()) return el.string();
-        return defaultVal;
-    }
-
-    public double number(String path) {
-        var el = get(path);
-        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
-        return el.number();
-    }
-    public double number(String path, double defaultVal) {
-        var el = get(path);
-        if (el == null) return defaultVal;
-        if (el.isNumber()) return el.number();
-        return defaultVal;
-    }
-
-    public boolean bool(String path) {
-        var el = get(path);
-        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
-        return el.bool();
-    }
-    public boolean bool(String path, boolean defaultVal) {
-        var el = get(path);
-        if (el == null) return defaultVal;
-        if (el.isBoolean()) return el.bool();
-        return defaultVal;
-    }
-
-    public JSONMap setNull(String key) { elements.put(key, JSONElement.NULL); return this; }
-    public JSONMap set(String key, String val) { elements.put(key, JSONElement.of(val)); return this; }
-    public JSONMap set(String key, double val) { elements.put(key, JSONElement.of(val)); return this; }
-    public JSONMap set(String key, boolean val) { elements.put(key, JSONElement.of(val)); return this; }
-    public JSONMap set(String key, Map<String, JSONElement> val) { elements.put(key, JSONElement.of(val)); return this; }
-    public JSONMap set(String key, Collection<JSONElement> val) { elements.put(key, JSONElement.of(val)); return this; }
-
-    @Override
-    public int size() { return elements.size(); }
-    @Override
-    public boolean isEmpty() { return elements.isEmpty(); }
-    @Override
-    public boolean containsKey(Object key) { return elements.containsKey(key); }
-    @Override
-    public boolean containsValue(Object value) { return elements.containsValue(value); }
-    @Override
-    public JSONElement get(Object key) { return elements.get(key); }
-    @Override
-    public JSONElement put(String key, JSONElement value) { return elements.put(key, value); }
-    @Override
-    public JSONElement remove(Object key) { return elements.remove(key); }
-    @Override
-    public void putAll(Map<? extends String, ? extends JSONElement> m) { elements.putAll(m); }
-
-    @Override
-    public void clear() { elements.clear(); }
-
-    @Override
-    public Set<String> keySet() { return elements.keySet(); }
-    @Override
-    public Collection<JSONElement> values() { return elements.values(); }
-    @Override
-    public Set<Entry<String, JSONElement>> entrySet() { return elements.entrySet(); }
-
-    public JSONMap() { }
-    public JSONMap(Map<String, JSONElement> els) {
-        this.elements = new HashMap<>(els);
-    }
-}
+package me.topchetoeu.jscript.common.json;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class JSONMap implements Map<String, JSONElement> {
+    private Map<String, JSONElement> elements = new HashMap<>();
+
+    public JSONElement get(String path) {
+        var curr = this;
+        var segs = path.split("\\.");
+        var i = 0;
+
+        while (true) {
+            var tmp = curr.elements.get(segs[i++]);
+            if (i == segs.length) return tmp;
+            if (!tmp.isMap()) return null;
+            curr = tmp.map();
+        }
+    }
+
+    public boolean isMap(String path) {
+        var el = get(path);
+        return el != null && el.isMap();
+    }
+    public boolean isList(String path) {
+        var el = get(path);
+        return el != null && el.isList();
+    }
+    public boolean isString(String path) {
+        var el = get(path);
+        return el != null && el.isString();
+    }
+    public boolean isNumber(String path) {
+        var el = get(path);
+        return el != null && el.isNumber();
+    }
+    public boolean isBoolean(String path) {
+        var el = get(path);
+        return el != null && el.isBoolean();
+    }
+    public boolean isNull(String path) {
+        var el = get(path);
+        return el != null && el.isNull();
+    }
+    public boolean contains(String path) {
+        return get(path) != null;
+    }
+
+    public JSONMap map(String path) {
+        var el = get(path);
+        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
+        return el.map();
+    }
+    public JSONMap map(String path, JSONMap defaultVal) {
+        var el = get(path);
+        if (el == null) return defaultVal;
+        if (el.isMap()) return el.map();
+        return defaultVal;
+    }
+
+    public JSONList list(String path) {
+        var el = get(path);
+        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
+        return el.list();
+    }
+    public JSONList list(String path, JSONList defaultVal) {
+        var el = get(path);
+        if (el == null) return defaultVal;
+        if (el.isList()) return el.list();
+        return defaultVal;
+    }
+
+    public String string(String path) {
+        var el = get(path);
+        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
+        return el.string();
+    }
+    public String string(String path, String defaultVal) {
+        var el = get(path);
+        if (el == null) return defaultVal;
+        if (el.isString()) return el.string();
+        return defaultVal;
+    }
+
+    public double number(String path) {
+        var el = get(path);
+        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
+        return el.number();
+    }
+    public double number(String path, double defaultVal) {
+        var el = get(path);
+        if (el == null) return defaultVal;
+        if (el.isNumber()) return el.number();
+        return defaultVal;
+    }
+
+    public boolean bool(String path) {
+        var el = get(path);
+        if (el == null) throw new RuntimeException(String.format("'%s' doesn't exist.", path));
+        return el.bool();
+    }
+    public boolean bool(String path, boolean defaultVal) {
+        var el = get(path);
+        if (el == null) return defaultVal;
+        if (el.isBoolean()) return el.bool();
+        return defaultVal;
+    }
+
+    public JSONMap setNull(String key) { elements.put(key, JSONElement.NULL); return this; }
+    public JSONMap set(String key, String val) { elements.put(key, JSONElement.of(val)); return this; }
+    public JSONMap set(String key, double val) { elements.put(key, JSONElement.of(val)); return this; }
+    public JSONMap set(String key, boolean val) { elements.put(key, JSONElement.of(val)); return this; }
+    public JSONMap set(String key, Map<String, JSONElement> val) { elements.put(key, JSONElement.of(val)); return this; }
+    public JSONMap set(String key, Collection<JSONElement> val) { elements.put(key, JSONElement.of(val)); return this; }
+
+    @Override
+    public int size() { return elements.size(); }
+    @Override
+    public boolean isEmpty() { return elements.isEmpty(); }
+    @Override
+    public boolean containsKey(Object key) { return elements.containsKey(key); }
+    @Override
+    public boolean containsValue(Object value) { return elements.containsValue(value); }
+    @Override
+    public JSONElement get(Object key) { return elements.get(key); }
+    @Override
+    public JSONElement put(String key, JSONElement value) { return elements.put(key, value); }
+    @Override
+    public JSONElement remove(Object key) { return elements.remove(key); }
+    @Override
+    public void putAll(Map<? extends String, ? extends JSONElement> m) { elements.putAll(m); }
+
+    @Override
+    public void clear() { elements.clear(); }
+
+    @Override
+    public Set<String> keySet() { return elements.keySet(); }
+    @Override
+    public Collection<JSONElement> values() { return elements.values(); }
+    @Override
+    public Set<Entry<String, JSONElement>> entrySet() { return elements.entrySet(); }
+
+    public JSONMap() { }
+    public JSONMap(Map<String, JSONElement> els) {
+        this.elements = new HashMap<>(els);
+    }
+}

src/me/topchetoeu/jscript/compilation/CompileTarget.java

@@ -1,38 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import me.topchetoeu.jscript.Location;
-
-public class CompileTarget {
-    public final Vector<Instruction> target = new Vector<>();
-    public final Map<Long, FunctionBody> functions;
-    public final TreeSet<Location> breakpoints;
-
-    public Instruction add(Instruction instr) {
-        target.add(instr);
-        return instr;
-    }
-    public Instruction set(int i, Instruction instr) {
-        return target.set(i, instr);
-    }
-    public void setDebug(int i) {
-        breakpoints.add(target.get(i).location);
-    }
-    public void setDebug() {
-        setDebug(target.size() - 1);
-    }
-    public Instruction get(int i) {
-        return target.get(i);
-    }
-    public int size() { return target.size(); }
-
-    public Instruction[] array() { return target.toArray(Instruction[]::new); }
-
-    public CompileTarget(Map<Long, FunctionBody> functions, TreeSet<Location> breakpoints) {
-        this.functions = functions;
-        this.breakpoints = breakpoints;
-    }
-}

src/me/topchetoeu/jscript/compilation/CompoundStatement.java

@@ -1,77 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import java.util.Vector;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.control.ContinueStatement;
-import me.topchetoeu.jscript.compilation.control.ReturnStatement;
-import me.topchetoeu.jscript.compilation.control.ThrowStatement;
-import me.topchetoeu.jscript.compilation.values.FunctionStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class CompoundStatement extends Statement {
-    public final Statement[] statements;
-    public Location end;
-
-    @Override
-    public void declare(ScopeRecord varsScope) {
-        for (var stm : statements) {
-            stm.declare(varsScope);
-        }
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        for (var stm : statements) {
-            if (stm instanceof FunctionStatement) {
-                int start = target.size();
-                ((FunctionStatement)stm).compile(target, scope, null, true);
-                target.setDebug(start);
-                target.add(Instruction.discard());
-            }
-        }
-
-        for (var i = 0; i < statements.length; i++) {
-            var stm = statements[i];
-
-            if (stm instanceof FunctionStatement) continue;
-            if (i != statements.length - 1) stm.compileWithDebug(target, scope, false);
-            else stm.compileWithDebug(target, scope, pollute);
-        }
-
-        if (end != null) {
-            target.add(Instruction.nop().locate(end));
-            target.setDebug();
-        }
-    }
-
-    @Override
-    public Statement optimize() {
-        var res = new Vector<Statement>(statements.length);
-
-        for (var i = 0; i < statements.length; i++) {
-            var stm = statements[i].optimize();
-            if (i < statements.length - 1 && stm.pure()) continue;
-            res.add(stm);
-            if (
-                stm instanceof ContinueStatement ||
-                stm instanceof ReturnStatement ||
-                stm instanceof ThrowStatement ||
-                stm instanceof ContinueStatement
-            ) break;
-        }
-
-        if (res.size() == 1) return res.get(0);
-        else return new CompoundStatement(loc(), res.toArray(Statement[]::new));
-    }
-
-    public CompoundStatement setEnd(Location loc) {
-        this.end = loc;
-        return this;
-    }
-
-    public CompoundStatement(Location loc, Statement ...statements) {
-        super(loc);
-        this.statements = statements;
-    }
-}

src/me/topchetoeu/jscript/compilation/DiscardStatement.java

@@ -1,27 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.values.ConstantStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class DiscardStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        value.compile(target, scope, false);
-        
-    }
-    @Override
-    public Statement optimize() {
-        if (value == null) return this;
-        var val = value.optimize();
-        if (val.pure()) return new ConstantStatement(loc(), null);
-        else return new DiscardStatement(loc(), val);
-    }
-
-    public DiscardStatement(Location loc, Statement val) {
-        super(loc);
-        this.value = val;
-    }
-}

src/me/topchetoeu/jscript/compilation/FunctionBody.java

@@ -1,17 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-public class FunctionBody {
-    public final Instruction[] instructions;
-    public final String[] captureNames, localNames;
-
-    public FunctionBody(Instruction[] instructions, String[] captureNames, String[] localNames) {
-        this.instructions = instructions;
-        this.captureNames = captureNames;
-        this.localNames = localNames;
-    }
-    public FunctionBody(Instruction[] instructions) {
-        this.instructions = instructions;
-        this.captureNames = new String[0];
-        this.localNames = new String[0];
-    }
-}

src/me/topchetoeu/jscript/compilation/Instruction.java

@@ -1,276 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
-
-public class Instruction {
-    public static enum Type {
-        RETURN,
-        THROW,
-        THROW_SYNTAX,
-        DELETE,
-        TRY,
-        NOP,
-
-        CALL,
-        CALL_NEW,
-        JMP_IF,
-        JMP_IFN,
-        JMP,
-
-        LOAD_VALUE,
-
-        LOAD_VAR,
-        LOAD_MEMBER,
-        LOAD_VAL_MEMBER,
-        LOAD_GLOB,
-
-        LOAD_FUNC,
-        LOAD_ARR,
-        LOAD_OBJ,
-        STORE_SELF_FUNC,
-        LOAD_REGEX,
-
-        DUP,
-        MOVE,
-
-        STORE_VAR,
-        STORE_MEMBER,
-        DISCARD,
-
-        MAKE_VAR,
-        DEF_PROP,
-        KEYS,
-
-        TYPEOF,
-        OPERATION;
-        // TYPEOF,
-        // INSTANCEOF(true),
-        // IN(true),
-
-        // MULTIPLY(true),
-        // DIVIDE(true),
-        // MODULO(true),
-        // ADD(true),
-        // SUBTRACT(true),
-
-        // USHIFT_RIGHT(true),
-        // SHIFT_RIGHT(true),
-        // SHIFT_LEFT(true),
-
-        // GREATER(true),
-        // LESS(true),
-        // GREATER_EQUALS(true),
-        // LESS_EQUALS(true),
-        // LOOSE_EQUALS(true),
-        // LOOSE_NOT_EQUALS(true),
-        // EQUALS(true),
-        // NOT_EQUALS(true),
-
-        // AND(true),
-        // OR(true),
-        // XOR(true),
-
-        // NEG(true),
-        // POS(true),
-        // NOT(true),
-        // INVERSE(true);
-
-        // final boolean isOperation;
-
-        // private Type(boolean isOperation) {
-        //     this.isOperation = isOperation;
-        // }
-        // private Type() {
-        //     this(false);
-        // }
-    }
-
-    public final Type type;
-    public final Object[] params;
-    public Location location;
-
-    public Instruction locate(Location loc) {
-        this.location = loc;
-        return this;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T get(int i) {
-        if (i >= params.length || i < 0) return null;
-        return (T)params[i];
-    }
-    @SuppressWarnings("unchecked")
-    public <T> T get(int i, T defaultVal) {
-        if (i >= params.length || i < 0) return defaultVal;
-        return (T)params[i];
-    }
-    public boolean match(Object ...args) {
-        if (args.length != params.length) return false;
-        for (int i = 0; i < args.length; i++) {
-            var a = params[i];
-            var b = args[i];
-            if (a == null || b == null) {
-                if (!(a == null && b == null)) return false;
-            }
-            if (!a.equals(b)) return false;
-        }
-        return true;
-    }
-    public boolean is(int i, Object arg) {
-        if (params.length <= i) return false;
-        return params[i].equals(arg);
-    }
-
-    private Instruction(Location location, Type type, Object ...params) {
-        this.location = location;
-        this.type = type;
-        this.params = params;
-    }
-
-    public static Instruction tryInstr(int n, int catchN, int finallyN) {
-        return new Instruction(null, Type.TRY, n, catchN, finallyN);
-    }
-    public static Instruction throwInstr() {
-        return new Instruction(null, Type.THROW);
-    }
-    public static Instruction throwSyntax(SyntaxException err) {
-        return new Instruction(null, Type.THROW_SYNTAX, err.getMessage());
-    }
-    public static Instruction delete() {
-        return new Instruction(null, Type.DELETE);
-    }
-    public static Instruction ret() {
-        return new Instruction(null, Type.RETURN);
-    }
-    public static Instruction debug() {
-        return new Instruction(null, Type.NOP, "debug");
-    }
-
-    public static Instruction nop(Object ...params) {
-        for (var param : params) {
-            if (param instanceof String) continue;
-            if (param instanceof Boolean) continue;
-            if (param instanceof Double) continue;
-            if (param instanceof Integer) continue;
-            if (param == null) continue;
-
-            throw new RuntimeException("NOP params may contain only strings, booleans, doubles, integers and nulls.");
-        }
-        return new Instruction(null, Type.NOP, params);
-    }
-
-    public static Instruction call(int argn) {
-        return new Instruction(null, Type.CALL, argn);
-    }
-    public static Instruction callNew(int argn) {
-        return new Instruction(null, Type.CALL_NEW, argn);
-    }
-    public static Instruction jmp(int offset) {
-        return new Instruction(null, Type.JMP, offset);
-    }
-    public static Instruction jmpIf(int offset) {
-        return new Instruction(null, Type.JMP_IF, offset);
-    }
-    public static Instruction jmpIfNot(int offset) {
-        return new Instruction(null, Type.JMP_IFN, offset);
-    }
-
-    public static Instruction loadValue(Object val) {
-        return new Instruction(null, Type.LOAD_VALUE, val);
-    }
-
-    public static Instruction makeVar(String name) {
-        return new Instruction(null, Type.MAKE_VAR, name);
-    }
-    public static Instruction loadVar(Object i) {
-        return new Instruction(null, Type.LOAD_VAR, i);
-    }
-    public static Instruction loadGlob() {
-        return new Instruction(null, Type.LOAD_GLOB);
-    }
-    public static Instruction loadMember() {
-        return new Instruction(null, Type.LOAD_MEMBER);
-    }
-    public static Instruction loadMember(Object key) {
-        if (key instanceof Number) key = ((Number)key).doubleValue();
-        return new Instruction(null, Type.LOAD_VAL_MEMBER, key);
-    }
-
-    public static Instruction loadRegex(String pattern, String flags) {
-        return new Instruction(null, Type.LOAD_REGEX, pattern, flags);
-    }
-    public static Instruction loadFunc(long id, int varN, int len, int[] captures) {
-        var args = new Object[3 + captures.length];
-        args[0] = id;
-        args[1] = varN;
-        args[2] = len;
-        for (var i = 0; i < captures.length; i++) args[i + 3] = captures[i];
-        return new Instruction(null, Type.LOAD_FUNC, args);
-    }
-    public static Instruction loadObj() {
-        return new Instruction(null, Type.LOAD_OBJ);
-    }
-    public static Instruction loadArr(int count) {
-        return new Instruction(null, Type.LOAD_ARR, count);
-    }
-    public static Instruction dup() {
-        return new Instruction(null, Type.DUP, 0, 1);
-    }
-    public static Instruction dup(int count, int offset) {
-        return new Instruction(null, Type.DUP, offset, count);
-    }
-    public static Instruction move(int count, int offset) {
-        return new Instruction(null, Type.MOVE, offset, count);
-    }
-
-    public static Instruction storeSelfFunc(int i) {
-        return new Instruction(null, Type.STORE_SELF_FUNC, i);
-    }
-    public static Instruction storeVar(Object i) {
-        return new Instruction(null, Type.STORE_VAR, i, false);
-    }
-    public static Instruction storeVar(Object i, boolean keep) {
-        return new Instruction(null, Type.STORE_VAR, i, keep);
-    }
-    public static Instruction storeMember() {
-        return new Instruction(null, Type.STORE_MEMBER, false);
-    }
-    public static Instruction storeMember(boolean keep) {
-        return new Instruction(null, Type.STORE_MEMBER, keep);
-    }
-    public static Instruction discard() {
-        return new Instruction(null, Type.DISCARD);
-    }
-
-    public static Instruction typeof() {
-        return new Instruction(null, Type.TYPEOF);
-    }
-    public static Instruction typeof(Object varName) {
-        return new Instruction(null, Type.TYPEOF, varName);
-    }
-
-    public static Instruction keys(boolean forInFormat) {
-        return new Instruction(null, Type.KEYS, forInFormat);
-    }
-
-    public static Instruction defProp() {
-        return new Instruction(null, Type.DEF_PROP);
-    }
-
-    public static Instruction operation(Operation op) {
-        return new Instruction(null, Type.OPERATION, op);
-    }
-
-    @Override
-    public String toString() {
-        var res = type.toString();
-
-        for (int i = 0; i < params.length; i++) {
-            res += " " + params[i];
-        }
-
-        return res;
-    }
-}

src/me/topchetoeu/jscript/compilation/Statement.java

@@ -1,26 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public abstract class Statement {
-    private Location _loc;
-
-    public boolean pure() { return false; }
-    public abstract void compile(CompileTarget target, ScopeRecord scope, boolean pollute);
-    public void declare(ScopeRecord varsScope) { }
-    public Statement optimize() { return this; }
-
-    public void compileWithDebug(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        int start = target.size();
-        compile(target, scope, pollute);
-        if (target.size() != start) target.setDebug(start);
-    }
-
-    public Location loc() { return _loc; }
-    public void setLoc(Location loc) { _loc = loc; }
-
-    protected Statement(Location loc) {
-        this._loc = loc;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/ArrayStatement.java

@@ -1,35 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ArrayStatement extends Statement {
-    public final Statement[] statements;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.loadArr(statements.length).locate(loc()));
-        var i = 0;
-        for (var el : statements) {
-            if (el != null) {
-                target.add(Instruction.dup().locate(loc()));
-                target.add(Instruction.loadValue(i).locate(loc()));
-                el.compile(target, scope, true);
-                target.add(Instruction.storeMember().locate(loc()));
-            }
-            i++;
-        }
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public ArrayStatement(Location loc, Statement[] statements) {
-        super(loc);
-        this.statements = statements;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/BreakStatement.java

@@ -1,22 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class BreakStatement extends Statement {
-    public final String label;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.nop("break", label).locate(loc()));
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-
-    public BreakStatement(Location loc, String label) {
-        super(loc);
-        this.label = label;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/ContinueStatement.java

@@ -1,22 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ContinueStatement extends Statement {
-    public final String label;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.nop("cont", label).locate(loc()));
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-
-    public ContinueStatement(Location loc, String label) {
-        super(loc);
-        this.label = label;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/DebugStatement.java

@@ -1,19 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class DebugStatement extends Statement {
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.debug().locate(loc()));
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-
-    public DebugStatement(Location loc) {
-        super(loc);
-    }
-}

src/me/topchetoeu/jscript/compilation/control/DoWhileStatement.java

@@ -1,79 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.values.ConstantStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class DoWhileStatement extends Statement {
-    public final Statement condition, body;
-    public final String label;
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (condition instanceof ConstantStatement) {
-            int start = target.size();
-            body.compile(target, scope, false);
-            int end = target.size();
-            if (Values.toBoolean(((ConstantStatement)condition).value)) {
-                WhileStatement.replaceBreaks(target, label, start, end, end + 1, end + 1);
-            }
-            else {
-                target.add(Instruction.jmp(start - end).locate(loc()));
-                WhileStatement.replaceBreaks(target, label, start, end, start, end + 1);
-            }
-            if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-            return;
-        }
-
-        int start = target.size();
-        body.compileWithDebug(target, scope, false);
-        int mid = target.size();
-        condition.compile(target, scope, true);
-        int end = target.size();
-
-        WhileStatement.replaceBreaks(target, label, start, mid - 1, mid, end + 1);
-        target.add(Instruction.jmpIf(start - end).locate(loc()));
-    }
-
-    @Override
-    public Statement optimize() {
-        var cond = condition.optimize();
-        var b = body.optimize();
-
-        if (b instanceof CompoundStatement) {
-            var comp = (CompoundStatement)b;
-            if (comp.statements.length > 0) {
-                var last = comp.statements[comp.statements.length - 1];
-                if (last instanceof ContinueStatement) comp.statements[comp.statements.length - 1] = new CompoundStatement(loc());
-                if (last instanceof BreakStatement) {
-                    comp.statements[comp.statements.length - 1] = new CompoundStatement(loc());
-                    return new CompoundStatement(loc());
-                }
-            }
-        }
-        else if (b instanceof ContinueStatement) {
-            b = new CompoundStatement(loc());
-        }
-        else if (b instanceof BreakStatement) return new CompoundStatement(loc());
-
-        if (b.pure()) return new DoWhileStatement(loc(), label, cond, new CompoundStatement(loc()));
-        else return new DoWhileStatement(loc(), label, cond, b);
-    }
-
-    public DoWhileStatement(Location loc, String label, Statement condition, Statement body) {
-        super(loc);
-        this.label = label;
-        this.condition = condition;
-        this.body = body;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/ForStatement.java

@@ -1,95 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.values.ConstantStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class ForStatement extends Statement {
-    public final Statement declaration, assignment, condition, body;
-    public final String label;
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        declaration.declare(globScope);
-        body.declare(globScope);
-    }
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        declaration.compile(target, scope, false);
-
-        if (condition instanceof ConstantStatement) {
-            if (Values.toBoolean(((ConstantStatement)condition).value)) {
-                int start = target.size();
-                body.compile(target, scope, false);
-                int mid = target.size();
-                assignment.compileWithDebug(target, scope, false);
-                int end = target.size();
-                WhileStatement.replaceBreaks(target, label, start, mid, mid, end + 1);
-                target.add(Instruction.jmp(start - target.size()).locate(loc()));
-                if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-            }
-            return;
-        }
-
-        int start = target.size();
-        condition.compile(target, scope, true);
-        int mid = target.size();
-        target.add(Instruction.nop());
-        body.compile(target, scope, false);
-        int beforeAssign = target.size();
-        assignment.compileWithDebug(target, scope, false);
-        int end = target.size();
-
-        WhileStatement.replaceBreaks(target, label, mid + 1, end, beforeAssign, end + 1);
-
-        target.add(Instruction.jmp(start - end).locate(loc()));
-        target.set(mid, Instruction.jmpIfNot(end - mid + 1).locate(loc()));
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-    @Override
-    public Statement optimize() {
-        var decl = declaration.optimize();
-        var asgn = assignment.optimize();
-        var cond = condition.optimize();
-        var b = body.optimize();
-
-        if (asgn.pure()) {
-            if (decl.pure()) return new WhileStatement(loc(), label, cond, b).optimize();
-            else return new CompoundStatement(loc(),
-                decl, new WhileStatement(loc(), label, cond, b)
-            ).optimize();
-        }
-
-        else if (b instanceof ContinueStatement) return new CompoundStatement(loc(),
-            decl, new WhileStatement(loc(), label, cond, new CompoundStatement(loc(), b, asgn))
-        );
-        else if (b instanceof BreakStatement) return decl;
-
-        if (b.pure()) return new ForStatement(loc(), label, decl, cond, asgn, new CompoundStatement(null));
-        else return new ForStatement(loc(), label, decl, cond, asgn, b);
-    }
-
-    public ForStatement(Location loc, String label, Statement declaration, Statement condition, Statement assignment, Statement body) {
-        super(loc);
-        this.label = label;
-        this.declaration = declaration;
-        this.condition = condition;
-        this.assignment = assignment;
-        this.body = body;
-    }
-
-    public static CompoundStatement ofFor(Location loc, String label, Statement declaration, Statement condition, Statement increment, Statement body) {
-        return new CompoundStatement(loc,
-            declaration,
-            new WhileStatement(loc, label, condition, new CompoundStatement(loc,
-                body,
-                increment
-            ))
-        );
-    }
-}

src/me/topchetoeu/jscript/compilation/control/IfStatement.java

@@ -1,77 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
-import me.topchetoeu.jscript.compilation.DiscardStatement;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.values.ConstantStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class IfStatement extends Statement {
-    public final Statement condition, body, elseBody;
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-        if (elseBody != null) elseBody.declare(globScope);
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (condition instanceof ConstantStatement) {
-            if (Values.not(((ConstantStatement)condition).value)) {
-                if (elseBody != null) elseBody.compileWithDebug(target, scope, pollute);
-            }
-            else {
-                body.compileWithDebug(target, scope, pollute);
-            }
-
-            return;
-        }
-
-        condition.compile(target, scope, true);
-
-        if (elseBody == null) {
-            int i = target.size();
-            target.add(Instruction.nop());
-            body.compileWithDebug(target, scope, pollute);
-            int endI = target.size();
-            target.set(i, Instruction.jmpIfNot(endI - i).locate(loc()));
-        }
-        else {
-            int start = target.size();
-            target.add(Instruction.nop());
-            body.compileWithDebug(target, scope, pollute);
-            target.add(Instruction.nop());
-            int mid = target.size();
-            elseBody.compileWithDebug(target, scope, pollute);
-            int end = target.size();
-
-            target.set(start, Instruction.jmpIfNot(mid - start).locate(loc()));
-            target.set(mid - 1, Instruction.jmp(end - mid + 1).locate(loc()));
-        }
-    }
-    
-    @Override
-    public Statement optimize() {
-        var cond = condition.optimize();
-        var b = body.optimize();
-        var e = elseBody == null ? null : elseBody.optimize();
-
-        if (b.pure()) b = new CompoundStatement(null);
-        if (e != null && e.pure()) e = null;
-
-        if (b.pure() && e == null) return new DiscardStatement(loc(), cond).optimize();
-        else return new IfStatement(loc(), cond, b, e);
-    }
-
-    public IfStatement(Location loc, Statement condition, Statement body, Statement elseBody) {
-        super(loc);
-        this.condition = condition;
-        this.body = body;
-        this.elseBody = elseBody;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/ReturnStatement.java

@@ -1,23 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ReturnStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (value == null) target.add(Instruction.loadValue(null).locate(loc()));
-        else value.compile(target, scope, true);
-        target.add(Instruction.ret().locate(loc()));
-    }
-
-    public ReturnStatement(Location loc, Statement value) {
-        super(loc);
-        this.value = value;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/SwitchStatement.java

@@ -1,85 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.HashMap;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class SwitchStatement extends Statement {
-    public static class SwitchCase {
-        public final Statement value;
-        public final int statementI;
-
-        public SwitchCase(Statement value, int statementI) {
-            this.value = value;
-            this.statementI = statementI;
-        }
-    }
-
-    public final Statement value;
-    public final SwitchCase[] cases;
-    public final Statement[] body;
-    public final int defaultI;
-
-    @Override
-    public void declare(ScopeRecord varsScope) {
-        for (var stm : body) stm.declare(varsScope);
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        var caseMap = new HashMap<Integer, Integer>();
-        var stmIndexMap = new HashMap<Integer, Integer>();
-
-        value.compile(target, scope, true);
-
-        for (var ccase : cases) {
-            target.add(Instruction.dup().locate(loc()));
-            ccase.value.compile(target, scope, true);
-            target.add(Instruction.operation(Operation.EQUALS).locate(loc()));
-            caseMap.put(target.size(), ccase.statementI);
-            target.add(Instruction.nop().locate(ccase.value.loc()));
-        }
-
-        int start = target.size();
-
-        target.add(Instruction.nop());
-
-        for (var stm : body) {
-            stmIndexMap.put(stmIndexMap.size(), target.size());
-            stm.compileWithDebug(target, scope, false);
-        }
-
-        if (defaultI < 0 || defaultI >= body.length) target.set(start, Instruction.jmp(target.size() - start).locate(loc()));
-        else target.set(start, Instruction.jmp(stmIndexMap.get(defaultI) - start)).locate(loc());
-
-        for (int i = start; i < target.size(); i++) {
-            var instr = target.get(i);
-            if (instr.type == Type.NOP && instr.is(0, "break") && instr.get(1) == null) {
-                target.set(i, Instruction.jmp(target.size() - i).locate(instr.location));
-            }
-        }
-        for (var el : caseMap.entrySet()) {
-            var loc = target.get(el.getKey()).location;
-            var i = stmIndexMap.get(el.getValue());
-            if (i == null) i = target.size();
-            target.set(el.getKey(), Instruction.jmpIf(i - el.getKey()).locate(loc));
-            target.setDebug(el.getKey());
-        }
-
-        target.add(Instruction.discard().locate(loc()));
-    }
-
-    public SwitchStatement(Location loc, Statement value, int defaultI, SwitchCase[] cases, Statement[] body) {
-        super(loc);
-        this.value = value;
-        this.defaultI = defaultI;
-        this.cases = cases;
-        this.body = body;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/ThrowStatement.java

@@ -1,22 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ThrowStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        value.compile(target, scope, true);
-        target.add(Instruction.throwInstr().locate(loc()));
-    }
-
-    public ThrowStatement(Location loc, Statement value) {
-        super(loc);
-        this.value = value;
-    }
-}

src/me/topchetoeu/jscript/compilation/control/WhileStatement.java

@@ -1,93 +0,0 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
-import me.topchetoeu.jscript.compilation.DiscardStatement;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
-import me.topchetoeu.jscript.compilation.values.ConstantStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class WhileStatement extends Statement {
-    public final Statement condition, body;
-    public final String label;
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-    }
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (condition instanceof ConstantStatement) {
-            if (Values.toBoolean(((ConstantStatement)condition).value)) {
-                int start = target.size();
-                body.compile(target, scope, false);
-                int end = target.size();
-                replaceBreaks(target, label, start, end, start, end + 1);
-                target.add(Instruction.jmp(start - target.size()).locate(loc()));
-                return;
-            }
-        }
-
-        int start = target.size();
-        condition.compile(target, scope, true);
-        int mid = target.size();
-        target.add(Instruction.nop());
-        body.compile(target, scope, false);
-
-        int end = target.size();
-
-        replaceBreaks(target, label, mid + 1, end, start, end + 1);
-
-        target.add(Instruction.jmp(start - end).locate(loc()));
-        target.set(mid, Instruction.jmpIfNot(end - mid + 1).locate(loc()));
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-    @Override
-    public Statement optimize() {
-        var cond = condition.optimize();
-        var b = body.optimize();
-
-        if (b instanceof ContinueStatement) {
-            b = new CompoundStatement(loc());
-        }
-        else if (b instanceof BreakStatement) return new DiscardStatement(loc(), cond).optimize();
-
-        if (b.pure()) return new WhileStatement(loc(), label, cond, new CompoundStatement(null));
-        else return new WhileStatement(loc(), label, cond, b);
-    }
-
-    public WhileStatement(Location loc, String label, Statement condition, Statement body) {
-        super(loc);
-        this.label = label;
-        this.condition = condition;
-        this.body = body;
-    }
-
-    public static void replaceBreaks(CompileTarget target, String label, int start, int end, int continuePoint, int breakPoint) {
-        for (int i = start; i < end; i++) {
-            var instr = target.get(i);
-            if (instr.type == Type.NOP && instr.is(0, "cont") && (instr.get(1) == null || instr.is(1, label))) {
-                target.set(i, Instruction.jmp(continuePoint - i));
-                target.get(i).location = instr.location;
-            }
-            if (instr.type == Type.NOP && instr.is(0, "break") && (instr.get(1) == null || instr.is(1, label))) {
-                target.set(i, Instruction.jmp(breakPoint - i));
-                target.get(i).location = instr.location;
-            }
-        }
-    }
-
-    // public static CompoundStatement ofFor(Location loc, String label, Statement declaration, Statement condition, Statement increment, Statement body) {
-    //     return new CompoundStatement(loc,
-    //         declaration,
-    //         new WhileStatement(loc, label, condition, new CompoundStatement(loc,
-    //             body,
-    //             increment
-    //         ))
-    //     );
-    // }
-}

src/me/topchetoeu/jscript/compilation/values/CallStatement.java

@@ -1,40 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class CallStatement extends Statement {
-    public final Statement func;
-    public final Statement[] args;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (func instanceof IndexStatement) {
-            ((IndexStatement)func).compile(target, scope, true, true);
-        }
-        else {
-            target.add(Instruction.loadValue(null).locate(loc()));
-            func.compile(target, scope, true);
-        }
-
-        for (var arg : args) arg.compile(target, scope, true);
-
-        target.add(Instruction.call(args.length).locate(loc()));
-        target.setDebug();
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public CallStatement(Location loc, Statement func, Statement ...args) {
-        super(loc);
-        this.func = func;
-        this.args = args;
-    }
-    public CallStatement(Location loc, Statement obj, Object key, Statement ...args) {
-        super(loc);
-        this.func = new IndexStatement(loc, obj, new ConstantStatement(loc, key));
-        this.args = args;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/ChangeStatement.java

@@ -1,32 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ChangeStatement extends Statement {
-    public final AssignableStatement value;
-    public final double addAmount;
-    public final boolean postfix;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        value.toAssign(new ConstantStatement(loc(), -addAmount), Operation.SUBTRACT).compile(target, scope, true);
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-        else if (postfix) {
-            target.add(Instruction.loadValue(addAmount));
-            target.add(Instruction.operation(Operation.SUBTRACT));
-        }
-    }
-
-    public ChangeStatement(Location loc, AssignableStatement value, double addAmount, boolean postfix) {
-        super(loc);
-        this.value = value;
-        this.addAmount = addAmount;
-        this.postfix = postfix;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/CommaStatement.java

@@ -1,38 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.Vector;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class CommaStatement extends Statement {
-    public final Statement[] values;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        for (var i = 0; i < values.length; i++) {
-            values[i].compile(target, scope, i == values.length - 1 && pollute);
-        }
-    }
-    
-    @Override
-    public Statement optimize() {
-        var res = new Vector<Statement>(values.length);
-
-        for (var i = 0; i < values.length; i++) {
-            var stm = values[i].optimize();
-            if (i < values.length - 1 && stm.pure()) continue;
-            res.add(stm);
-        }
-
-        if (res.size() == 1) return res.get(0);
-        else return new CommaStatement(loc(), res.toArray(Statement[]::new));
-    }
-
-    public CommaStatement(Location loc, Statement ...args) {
-        super(loc);
-        this.values = args;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/ConstantStatement.java

@@ -1,24 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ConstantStatement extends Statement {
-    public final Object value;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (pollute) target.add(Instruction.loadValue(value).locate(loc()));
-    }
-
-    public ConstantStatement(Location loc, Object val) {
-        super(loc);
-        this.value = val;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/FunctionStatement.java

@@ -1,112 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.Random;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
-import me.topchetoeu.jscript.compilation.FunctionBody;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
-
-public class FunctionStatement extends Statement {
-    public final CompoundStatement body;
-    public final String name;
-    public final String[] args;
-
-    private static Random rand = new Random();
-
-    @Override
-    public boolean pure() { return name == null; }
-
-    @Override
-    public void declare(ScopeRecord scope) {
-        if (name != null) scope.define(name);
-    }
-
-    public static void checkBreakAndCont(CompileTarget target, int start) {
-        for (int i = start; i < target.size(); i++) {
-            if (target.get(i).type == Type.NOP) {
-                if (target.get(i).is(0, "break") ) {
-                    throw new SyntaxException(target.get(i).location, "Break was placed outside a loop.");
-                }
-                if (target.get(i).is(0, "cont")) {
-                    throw new SyntaxException(target.get(i).location, "Continue was placed outside a loop.");
-                }
-            }
-        }
-    }
-
-    public void compile(CompileTarget target, ScopeRecord scope, String name, boolean isStatement) {
-        for (var i = 0; i < args.length; i++) {
-            for (var j = 0; j < i; j++) {
-                if (args[i].equals(args[j])){
-                    target.add(Instruction.throwSyntax(new SyntaxException(loc(), "Duplicate parameter '" + args[i] + "'.")));
-                    return;
-                }
-            }
-        }
-        var subscope = scope.child();
-
-        int start = target.size();
-        var funcTarget = new CompileTarget(target.functions, target.breakpoints);
-
-        subscope.define("this");
-        var argsVar = subscope.define("arguments");
-
-        if (args.length > 0) {
-            for (var i = 0; i < args.length; i++) {
-                funcTarget.add(Instruction.loadVar(argsVar).locate(loc()));
-                funcTarget.add(Instruction.loadMember(i).locate(loc()));
-                funcTarget.add(Instruction.storeVar(subscope.define(args[i])).locate(loc()));
-            }
-        }
-
-        if (!isStatement && this.name != null) {
-            funcTarget.add(Instruction.storeSelfFunc((int)subscope.define(this.name)));
-        }
-
-        body.declare(subscope);
-        body.compile(funcTarget, subscope, false);
-        funcTarget.add(Instruction.ret().locate(loc()));
-        checkBreakAndCont(funcTarget, start);
-
-        var id = rand.nextLong();
-
-        target.add(Instruction.loadFunc(id, subscope.localsCount(), args.length, subscope.getCaptures()).locate(loc()));
-        target.functions.put(id, new FunctionBody(funcTarget.array(), subscope.captures(), subscope.locals()));
-
-        if (name == null) name = this.name;
-
-        if (name != null) {
-            target.add(Instruction.dup().locate(loc()));
-            target.add(Instruction.loadValue("name").locate(loc()));
-            target.add(Instruction.loadValue(name).locate(loc()));
-            target.add(Instruction.storeMember().locate(loc()));
-        }
-
-        if (this.name != null && isStatement) {
-            var key = scope.getKey(this.name);
-
-            if (key instanceof String) target.add(Instruction.makeVar((String)key).locate(loc()));
-            target.add(Instruction.storeVar(scope.getKey(this.name), false).locate(loc()));
-        }
-
-    }
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        compile(target, scope, null, false);
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public FunctionStatement(Location loc, String name, String[] args, CompoundStatement body) {
-        super(loc);
-        this.name = name;
-
-        this.args = args;
-        this.body = body;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/GlobalThisStatement.java

@@ -1,21 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class GlobalThisStatement extends Statement {
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (pollute) target.add(Instruction.loadGlob().locate(loc()));
-    }
-
-    public GlobalThisStatement(Location loc) {
-        super(loc);
-    }
-}

src/me/topchetoeu/jscript/compilation/values/NewStatement.java

@@ -1,28 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class NewStatement extends Statement {
-    public final Statement func;
-    public final Statement[] args;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        func.compile(target, scope, true);
-
-        for (var arg : args) arg.compile(target, scope, true);
-
-        target.add(Instruction.callNew(args.length).locate(loc()));
-        target.setDebug();
-    }
-
-    public NewStatement(Location loc, Statement func, Statement ...args) {
-        super(loc);
-        this.func = func;
-        this.args = args;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/ObjectStatement.java

@@ -1,56 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ObjectStatement extends Statement {
-    public final Map<Object, Statement> map;
-    public final Map<Object, FunctionStatement> getters;
-    public final Map<Object, FunctionStatement> setters;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.loadObj().locate(loc()));
-
-        for (var el : map.entrySet()) {
-            target.add(Instruction.dup().locate(loc()));
-            target.add(Instruction.loadValue(el.getKey()).locate(loc()));
-            var val = el.getValue();
-            if (val instanceof FunctionStatement) ((FunctionStatement)val).compile(target, scope, el.getKey().toString(), false);
-            else val.compile(target, scope, true);
-            target.add(Instruction.storeMember().locate(loc()));
-        }
-
-        var keys = new ArrayList<Object>();
-        keys.addAll(getters.keySet());
-        keys.addAll(setters.keySet());
-
-        for (var key : keys) {
-            if (key instanceof String) target.add(Instruction.loadValue((String)key).locate(loc()));
-            else target.add(Instruction.loadValue((Double)key).locate(loc()));
-
-            if (getters.containsKey(key)) getters.get(key).compile(target, scope, true);
-            else target.add(Instruction.loadValue(null).locate(loc()));
-
-            if (setters.containsKey(key)) setters.get(key).compile(target, scope, true);
-            else target.add(Instruction.loadValue(null).locate(loc()));
-
-            target.add(Instruction.defProp().locate(loc()));
-        }
-
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public ObjectStatement(Location loc, Map<Object, Statement> map, Map<Object, FunctionStatement> getters, Map<Object, FunctionStatement> setters) {
-        super(loc);
-        this.map = map;
-        this.getters = getters;
-        this.setters = setters;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/OperationStatement.java

@@ -1,65 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.control.ThrowStatement;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
-
-public class OperationStatement extends Statement {
-    public final Statement[] args;
-    public final Operation operation;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        for (var arg : args) {
-            arg.compile(target, scope, true);
-        }
-
-        if (pollute) target.add(Instruction.operation(operation).locate(loc()));
-        else target.add(Instruction.discard().locate(loc()));
-    }
-
-    @Override
-    public boolean pure() {
-        for (var arg : args) {
-            if (!arg.pure()) return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Statement optimize() {
-        var args = new Statement[this.args.length];
-        var allConst = true;
-
-        for (var i = 0; i < this.args.length; i++) {
-            args[i] = this.args[i].optimize();
-            if (!(args[i] instanceof ConstantStatement)) allConst = false;
-        }
-
-        if (allConst) {
-            var vals = new Object[this.args.length];
-
-            for (var i = 0; i < args.length; i++) {
-                vals[i] = ((ConstantStatement)args[i]).value;
-            }
-
-            try { return new ConstantStatement(loc(), Values.operation(null, operation, vals)); }
-            catch (EngineException e) { return new ThrowStatement(loc(), new ConstantStatement(loc(), e.value)); }
-        }
-
-        return new OperationStatement(loc(), operation, args);
-
-    }
-
-    public OperationStatement(Location loc, Operation operation, Statement ...args) {
-        super(loc);
-        this.operation = operation;
-        this.args = args;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/RegexStatement.java

@@ -1,26 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class RegexStatement extends Statement {
-    public final String pattern, flags;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.loadRegex(pattern, flags).locate(loc()));
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public RegexStatement(Location loc, String pattern, String flags) {
-        super(loc);
-        this.pattern = pattern;
-        this.flags = flags;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/TypeofStatement.java

@@ -1,51 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.control.ArrayStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class TypeofStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (value instanceof VariableStatement) {
-            var i = scope.getKey(((VariableStatement)value).name);
-            if (i instanceof String) {
-                target.add(Instruction.typeof((String)i).locate(loc()));
-                return;
-            }
-        }
-        value.compile(target, scope, pollute);
-        target.add(Instruction.typeof().locate(loc()));
-    }
-
-    @Override
-    public Statement optimize() {
-        var val = value.optimize();
-
-        if (val instanceof ConstantStatement) {
-            return new ConstantStatement(loc(), Values.type(((ConstantStatement)val).value));
-        }
-        else if (
-            val instanceof ObjectStatement ||
-            val instanceof ArrayStatement ||
-            val instanceof GlobalThisStatement
-        ) return new ConstantStatement(loc(), "object");
-        else if(val instanceof FunctionStatement) return new ConstantStatement(loc(), "function");
-
-        return new TypeofStatement(loc(), val);
-    }
-
-    public TypeofStatement(Location loc, Statement value) {
-        super(loc);
-        this.value = value;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/VariableAssignStatement.java

@@ -1,38 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class VariableAssignStatement extends Statement {
-    public final String name;
-    public final Statement value;
-    public final Operation operation;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        var i = scope.getKey(name);
-        if (operation != null) {
-            target.add(Instruction.loadVar(i).locate(loc()));
-            if (value instanceof FunctionStatement) ((FunctionStatement)value).compile(target, scope, name, false);
-            else value.compile(target, scope, true);
-            target.add(Instruction.operation(operation).locate(loc()));
-            target.add(Instruction.storeVar(i, pollute).locate(loc()));
-        }
-        else {
-            if (value instanceof FunctionStatement) ((FunctionStatement)value).compile(target, scope, name, false);
-            else value.compile(target, scope, true);
-            target.add(Instruction.storeVar(i, pollute).locate(loc()));
-        }
-    }
-
-    public VariableAssignStatement(Location loc, String name, Statement val, Operation operation) {
-        super(loc);
-        this.name = name;
-        this.value = val;
-        this.operation = operation;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/VariableIndexStatement.java

@@ -1,24 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class VariableIndexStatement extends Statement {
-    public final int index;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (pollute) target.add(Instruction.loadVar(index).locate(loc()));
-    }
-
-    public VariableIndexStatement(Location loc, int i) {
-        super(loc);
-        this.index = i;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/VariableStatement.java

@@ -1,33 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class VariableStatement extends AssignableStatement {
-    public final String name;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public Statement toAssign(Statement val, Operation operation) {
-        return new VariableAssignStatement(loc(), name, val, operation);
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        var i = scope.getKey(name);
-        target.add(Instruction.loadVar(i).locate(loc()));
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public VariableStatement(Location loc, String name) {
-        super(loc);
-        this.name = name;
-    }
-}

src/me/topchetoeu/jscript/compilation/values/VoidStatement.java

@@ -1,30 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-
-public class VoidStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (value != null) value.compile(target, scope, false);
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-
-    @Override
-    public Statement optimize() {
-        if (value == null) return this;
-        var val = value.optimize();
-        if (val.pure()) return new ConstantStatement(loc(), null);
-        else return new VoidStatement(loc(), val);
-    }
-
-    public VoidStatement(Location loc, Statement value) {
-        super(loc);
-        this.value = value;
-    }
-}

src/me/topchetoeu/jscript/core/compilation/AssignableStatement.java

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.engine.Operation;
 
 public abstract class AssignableStatement extends Statement {
     public abstract Statement toAssign(Statement val, Operation operation);

src/me/topchetoeu/jscript/core/compilation/CalculateResult.java

@@ -0,0 +1,21 @@
+package me.topchetoeu.jscript.core.compilation;
+
+import me.topchetoeu.jscript.core.engine.values.Values;
+
+public final class CalculateResult {
+    public final boolean exists;
+    public final Object value;
+
+    public final boolean isTruthy() {
+        return exists && Values.toBoolean(value);
+    }
+
+    public CalculateResult(Object value) {
+        this.exists = true;
+        this.value = value;
+    }
+    public CalculateResult() {
+        this.exists = false;
+        this.value = null;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/CompileTarget.java

@@ -0,0 +1,66 @@
+package me.topchetoeu.jscript.core.compilation;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.Vector;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.Environment;
+import me.topchetoeu.jscript.core.engine.values.CodeFunction;
+
+public class CompileTarget {
+    public final Vector<Instruction> target = new Vector<>();
+    public final Map<Long, FunctionBody> functions;
+    public final TreeSet<Location> breakpoints;
+    private final HashMap<Location, Instruction> bpToInstr = new HashMap<>();
+
+    public Instruction add(Instruction instr) {
+        target.add(instr);
+        return instr;
+    }
+    public Instruction set(int i, Instruction instr) {
+        return target.set(i, instr);
+    }
+    public void setDebug(int i, BreakpointType type) {
+        var instr = target.get(i);
+        instr.breakpoint = type;
+
+        if (type == BreakpointType.NONE) {
+            breakpoints.remove(target.get(i).location);
+            bpToInstr.remove(instr.location, instr);
+        }
+        else {
+            breakpoints.add(target.get(i).location);
+
+            var old = bpToInstr.put(instr.location, instr);
+            if (old != null) old.breakpoint = BreakpointType.NONE;
+        }
+    }
+    public void setDebug(BreakpointType type) {
+        setDebug(target.size() - 1, type);
+    }
+    public Instruction get(int i) {
+        return target.get(i);
+    }
+    public int size() { return target.size(); }
+    public Location lastLoc(Location fallback) {
+        if (target.size() == 0) return fallback;
+        else return target.get(target.size() - 1).location;
+    }
+
+    public Instruction[] array() { return target.toArray(Instruction[]::new); }
+
+    public FunctionBody body() {
+        return functions.get(0l);
+    }
+    public CodeFunction func(Environment env) {
+        return new CodeFunction(env, "", body());
+    }
+
+    public CompileTarget(Map<Long, FunctionBody> functions, TreeSet<Location> breakpoints) {
+        this.functions = functions;
+        this.breakpoints = breakpoints;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/CompoundStatement.java

@@ -0,0 +1,64 @@
+package me.topchetoeu.jscript.core.compilation;
+
+import java.util.List;
+import java.util.Vector;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.values.FunctionStatement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class CompoundStatement extends Statement {
+    public final Statement[] statements;
+    public final boolean separateFuncs;
+    public Location end;
+
+    @Override public boolean pure() {
+        for (var stm : statements) {
+            if (!stm.pure()) return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void declare(ScopeRecord varsScope) {
+        for (var stm : statements) stm.declare(varsScope);
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType type) {
+        List<Statement> statements = new Vector<Statement>();
+        if (separateFuncs) for (var stm : this.statements) {
+            if (stm instanceof FunctionStatement && ((FunctionStatement)stm).statement) {
+                stm.compile(target, scope, false);
+            }
+            else statements.add(stm);
+        }
+        else statements = List.of(this.statements);
+
+        var polluted = false;
+
+        for (var i = 0; i < statements.size(); i++) {
+            var stm = statements.get(i);
+
+            if (i != statements.size() - 1) stm.compile(target, scope, false, BreakpointType.STEP_OVER);
+            else stm.compile(target, scope, polluted = pollute, BreakpointType.STEP_OVER);
+        }
+
+        if (!polluted && pollute) {
+            target.add(Instruction.loadValue(loc(), null));
+        }
+    }
+
+    public CompoundStatement setEnd(Location loc) {
+        this.end = loc;
+        return this;
+    }
+
+    public CompoundStatement(Location loc, boolean separateFuncs, Statement ...statements) {
+        super(loc);
+        this.separateFuncs = separateFuncs;
+        this.statements = statements;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/FunctionBody.java

@@ -0,0 +1,29 @@
+package me.topchetoeu.jscript.core.compilation;
+
+public class FunctionBody {
+    public final Instruction[] instructions;
+    public final String[] captureNames, localNames;
+    public final int localsN, argsN;
+
+    public FunctionBody(int localsN, int argsN, Instruction[] instructions, String[] captureNames, String[] localNames) {
+        this.argsN = argsN;
+        this.localsN = localsN;
+        this.instructions = instructions;
+        this.captureNames = captureNames;
+        this.localNames = localNames;
+    }
+    public FunctionBody(int localsN, int argsN, Instruction[] instructions) {
+        this.argsN = argsN;
+        this.localsN = localsN;
+        this.instructions = instructions;
+        this.captureNames = new String[0];
+        this.localNames = new String[0];
+    }
+    public FunctionBody(Instruction... instructions) {
+        this.argsN = 0;
+        this.localsN = 2;
+        this.instructions = instructions;
+        this.captureNames = new String[0];
+        this.localNames = new String[0];
+    }
+}

src/me/topchetoeu/jscript/core/compilation/Instruction.java

@@ -0,0 +1,256 @@
+package me.topchetoeu.jscript.core.compilation;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
+
+public class Instruction {
+    public static enum Type {
+        RETURN,
+        THROW,
+        THROW_SYNTAX,
+        DELETE,
+        TRY_START,
+        TRY_END,
+        NOP,
+
+        CALL,
+        CALL_NEW,
+        JMP_IF,
+        JMP_IFN,
+        JMP,
+
+        LOAD_VALUE,
+
+        LOAD_VAR,
+        LOAD_MEMBER,
+        LOAD_VAL_MEMBER,
+        LOAD_GLOB,
+
+        LOAD_FUNC,
+        LOAD_ARR,
+        LOAD_OBJ,
+        STORE_SELF_FUNC,
+        LOAD_REGEX,
+
+        DUP,
+
+        STORE_VAR,
+        STORE_MEMBER,
+        DISCARD,
+
+        MAKE_VAR,
+        DEF_PROP,
+        KEYS,
+
+        TYPEOF,
+        OPERATION;
+    }
+    public static enum BreakpointType {
+        NONE,
+        STEP_OVER,
+        STEP_IN;
+
+        public boolean shouldStepIn() {
+            return this != NONE;
+        }
+        public boolean shouldStepOver() {
+            return this == STEP_OVER;
+        }
+    }
+
+    public final Type type;
+    public final Object[] params;
+    public Location location;
+    public BreakpointType breakpoint = BreakpointType.NONE;
+
+    public Instruction setDbgData(Instruction other) {
+        this.location = other.location;
+        this.breakpoint = other.breakpoint;
+        return this;
+    }
+
+    public Instruction locate(Location loc) {
+        this.location = loc;
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T get(int i) {
+        if (i >= params.length || i < 0) return null;
+        return (T)params[i];
+    }
+    @SuppressWarnings("unchecked")
+    public <T> T get(int i, T defaultVal) {
+        if (i >= params.length || i < 0) return defaultVal;
+        return (T)params[i];
+    }
+    public boolean match(Object ...args) {
+        if (args.length != params.length) return false;
+        for (int i = 0; i < args.length; i++) {
+            var a = params[i];
+            var b = args[i];
+            if (a == null || b == null) {
+                if (!(a == null && b == null)) return false;
+            }
+            if (!a.equals(b)) return false;
+        }
+        return true;
+    }
+    public boolean is(int i, Object arg) {
+        if (params.length <= i) return false;
+        return params[i].equals(arg);
+    }
+
+    private Instruction(Location location, Type type, Object ...params) {
+        this.location = location;
+        this.type = type;
+        this.params = params;
+    }
+
+    public static Instruction tryStart(Location loc, int catchStart, int finallyStart, int end) {
+        return new Instruction(loc, Type.TRY_START, catchStart, finallyStart, end);
+    }
+    public static Instruction tryEnd(Location loc) {
+        return new Instruction(loc, Type.TRY_END);
+    }
+    public static Instruction throwInstr(Location loc) {
+        return new Instruction(loc, Type.THROW);
+    }
+    public static Instruction throwSyntax(Location loc, SyntaxException err) {
+        return new Instruction(loc, Type.THROW_SYNTAX, err.getMessage());
+    }
+    public static Instruction throwSyntax(Location loc, String err) {
+        return new Instruction(loc, Type.THROW_SYNTAX, err);
+    }
+    public static Instruction delete(Location loc) {
+        return new Instruction(loc, Type.DELETE);
+    }
+    public static Instruction ret(Location loc) {
+        return new Instruction(loc, Type.RETURN);
+    }
+    public static Instruction debug(Location loc) {
+        return new Instruction(loc, Type.NOP, "debug");
+    }
+
+    public static Instruction nop(Location loc, Object ...params) {
+        for (var param : params) {
+            if (param instanceof String) continue;
+            if (param instanceof Boolean) continue;
+            if (param instanceof Double) continue;
+            if (param instanceof Integer) continue;
+            if (param == null) continue;
+
+            throw new RuntimeException("NOP params may contain only strings, booleans, doubles, integers and nulls.");
+        }
+        return new Instruction(loc, Type.NOP, params);
+    }
+
+    public static Instruction call(Location loc, int argn) {
+        return new Instruction(loc, Type.CALL, argn);
+    }
+    public static Instruction callNew(Location loc, int argn) {
+        return new Instruction(loc, Type.CALL_NEW, argn);
+    }
+    public static Instruction jmp(Location loc, int offset) {
+        return new Instruction(loc, Type.JMP, offset);
+    }
+    public static Instruction jmpIf(Location loc, int offset) {
+        return new Instruction(loc, Type.JMP_IF, offset);
+    }
+    public static Instruction jmpIfNot(Location loc, int offset) {
+        return new Instruction(loc, Type.JMP_IFN, offset);
+    }
+
+    public static Instruction loadValue(Location loc, Object val) {
+        return new Instruction(loc, Type.LOAD_VALUE, val);
+    }
+
+    public static Instruction makeVar(Location loc, String name) {
+        return new Instruction(loc, Type.MAKE_VAR, name);
+    }
+    public static Instruction loadVar(Location loc, Object i) {
+        return new Instruction(loc, Type.LOAD_VAR, i);
+    }
+    public static Instruction loadGlob(Location loc) {
+        return new Instruction(loc, Type.LOAD_GLOB);
+    }
+    public static Instruction loadMember(Location loc) {
+        return new Instruction(loc, Type.LOAD_MEMBER);
+    }
+    public static Instruction loadMember(Location loc, Object key) {
+        if (key instanceof Number) key = ((Number)key).doubleValue();
+        return new Instruction(loc, Type.LOAD_VAL_MEMBER, key);
+    }
+
+    public static Instruction loadRegex(Location loc, String pattern, String flags) {
+        return new Instruction(loc, Type.LOAD_REGEX, pattern, flags);
+    }
+    public static Instruction loadFunc(Location loc, long id, int[] captures) {
+        var args = new Object[1 + captures.length];
+        args[0] = id;
+        for (var i = 0; i < captures.length; i++) args[i + 1] = captures[i];
+        return new Instruction(loc, Type.LOAD_FUNC, args);
+    }
+    public static Instruction loadObj(Location loc) {
+        return new Instruction(loc, Type.LOAD_OBJ);
+    }
+    public static Instruction loadArr(Location loc, int count) {
+        return new Instruction(loc, Type.LOAD_ARR, count);
+    }
+    public static Instruction dup(Location loc) {
+        return new Instruction(loc, Type.DUP, 1);
+    }
+    public static Instruction dup(Location loc, int count) {
+        return new Instruction(loc, Type.DUP, count);
+    }
+
+    public static Instruction storeSelfFunc(Location loc, int i) {
+        return new Instruction(loc, Type.STORE_SELF_FUNC, i);
+    }
+    public static Instruction storeVar(Location loc, Object i) {
+        return new Instruction(loc, Type.STORE_VAR, i, false);
+    }
+    public static Instruction storeVar(Location loc, Object i, boolean keep) {
+        return new Instruction(loc, Type.STORE_VAR, i, keep);
+    }
+    public static Instruction storeMember(Location loc) {
+        return new Instruction(loc, Type.STORE_MEMBER, false);
+    }
+    public static Instruction storeMember(Location loc, boolean keep) {
+        return new Instruction(loc, Type.STORE_MEMBER, keep);
+    }
+    public static Instruction discard(Location loc) {
+        return new Instruction(loc, Type.DISCARD);
+    }
+
+    public static Instruction typeof(Location loc) {
+        return new Instruction(loc, Type.TYPEOF);
+    }
+    public static Instruction typeof(Location loc, Object varName) {
+        return new Instruction(loc, Type.TYPEOF, varName);
+    }
+
+    public static Instruction keys(Location loc, boolean forInFormat) {
+        return new Instruction(loc, Type.KEYS, forInFormat);
+    }
+
+    public static Instruction defProp(Location loc) {
+        return new Instruction(loc, Type.DEF_PROP);
+    }
+
+    public static Instruction operation(Location loc, Operation op) {
+        return new Instruction(loc, Type.OPERATION, op);
+    }
+
+    @Override
+    public String toString() {
+        var res = type.toString();
+
+        for (int i = 0; i < params.length; i++) {
+            res += " " + params[i];
+        }
+
+        return res;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/Statement.java

@@ -0,0 +1,32 @@
+package me.topchetoeu.jscript.core.compilation;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public abstract class Statement {
+    private Location _loc;
+
+    public boolean pure() { return false; }
+    public void declare(ScopeRecord varsScope) { }
+
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType type) {
+        int start = target.size();
+        compile(target, scope, pollute);
+
+        if (target.size() != start) {
+            target.get(start).locate(loc());
+            target.setDebug(start, type);
+        }
+    }
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, pollute, BreakpointType.NONE);
+    }
+
+    public Location loc() { return _loc; }
+    public void setLoc(Location loc) { _loc = loc; }
+
+    protected Statement(Location loc) {
+        this._loc = loc;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/ThrowSyntaxStatement.java

@@ -0,0 +1,18 @@
+package me.topchetoeu.jscript.core.compilation;
+
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
+
+public class ThrowSyntaxStatement extends Statement {
+    public final String name;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.throwSyntax(loc(), name));
+    }
+
+    public ThrowSyntaxStatement(SyntaxException e) {
+        super(e.loc);
+        this.name = e.msg;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/VariableDeclareStatement.java

@@ -1,58 +1,52 @@
-package me.topchetoeu.jscript.compilation;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.values.FunctionStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class VariableDeclareStatement extends Statement {
-    public static class Pair {
-        public final String name;
-        public final Statement value;
-        public final Location location;
-
-        public Pair(String name, Statement value, Location location) {
-            this.name = name;
-            this.value = value;
-            this.location = location;
-        }
-    }
-
-    public final List<Pair> values;
-
-    @Override
-    public void declare(ScopeRecord varsScope) {
-        for (var key : values) {
-            varsScope.define(key.name);
-        }
-    }
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        for (var entry : values) {
-            if (entry.name == null) continue;
-            var key = scope.getKey(entry.name);
-            int start = target.size();
-
-            if (key instanceof String) target.add(Instruction.makeVar((String)key).locate(entry.location));
-
-            if (entry.value instanceof FunctionStatement) {
-                ((FunctionStatement)entry.value).compile(target, scope, entry.name, false);
-                target.add(Instruction.storeVar(key).locate(entry.location));
-            }
-            else if (entry.value != null) {
-                entry.value.compile(target, scope, true);
-                target.add(Instruction.storeVar(key).locate(entry.location));
-            }
-
-            if (target.size() != start) target.setDebug(start);
-        }
-
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-
-    public VariableDeclareStatement(Location loc, List<Pair> values) {
-        super(loc);
-        this.values = values;
-    }
-}
+package me.topchetoeu.jscript.core.compilation;
+
+import java.util.List;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.values.FunctionStatement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class VariableDeclareStatement extends Statement {
+    public static class Pair {
+        public final String name;
+        public final Statement value;
+        public final Location location;
+
+        public Pair(String name, Statement value, Location location) {
+            this.name = name;
+            this.value = value;
+            this.location = location;
+        }
+    }
+
+    public final List<Pair> values;
+
+    @Override
+    public void declare(ScopeRecord varsScope) {
+        for (var key : values) {
+            varsScope.define(key.name);
+        }
+    }
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        for (var entry : values) {
+            if (entry.name == null) continue;
+            var key = scope.getKey(entry.name);
+
+            if (key instanceof String) target.add(Instruction.makeVar(entry.location, (String)key));
+
+            if (entry.value != null) {
+                FunctionStatement.compileWithName(entry.value, target, scope, true, entry.name, BreakpointType.STEP_OVER);
+                target.add(Instruction.storeVar(entry.location, key));
+            }
+        }
+
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public VariableDeclareStatement(Location loc, List<Pair> values) {
+        super(loc);
+        this.values = values;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/BreakStatement.java

@@ -0,0 +1,22 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class BreakStatement extends Statement {
+    public final String label;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.nop(loc(), "break", label));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public BreakStatement(Location loc, String label) {
+        super(loc);
+        this.label = label;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/ContinueStatement.java

@@ -0,0 +1,22 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ContinueStatement extends Statement {
+    public final String label;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.nop(loc(), "cont", label));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public ContinueStatement(Location loc, String label) {
+        super(loc);
+        this.label = label;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/DebugStatement.java

@@ -0,0 +1,19 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class DebugStatement extends Statement {
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.debug(loc()));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public DebugStatement(Location loc) {
+        super(loc);
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/DeleteStatement.java

@@ -1,27 +1,27 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class DeleteStatement extends Statement {
-    public final Statement key;
-    public final Statement value;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        value.compile(target, scope, true);
-        key.compile(target, scope, true);
-
-        target.add(Instruction.delete().locate(loc()));
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-
-    public DeleteStatement(Location loc, Statement key, Statement value) {
-        super(loc);
-        this.key = key;
-        this.value = value;
-    }
-}
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class DeleteStatement extends Statement {
+    public final Statement key;
+    public final Statement value;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.compile(target, scope, true);
+        key.compile(target, scope, true);
+
+        target.add(Instruction.delete(loc()));
+        if (pollute) target.add(Instruction.loadValue(loc(), true));
+    }
+
+    public DeleteStatement(Location loc, Statement key, Statement value) {
+        super(loc);
+        this.key = key;
+        this.value = value;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/DoWhileStatement.java

@@ -0,0 +1,37 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class DoWhileStatement extends Statement {
+    public final Statement condition, body;
+    public final String label;
+
+    @Override
+    public void declare(ScopeRecord globScope) {
+        body.declare(globScope);
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        int start = target.size();
+        body.compile(target, scope, false, BreakpointType.STEP_OVER);
+        int mid = target.size();
+        condition.compile(target, scope, true, BreakpointType.STEP_OVER);
+        int end = target.size();
+
+        WhileStatement.replaceBreaks(target, label, start, mid - 1, mid, end + 1);
+        target.add(Instruction.jmpIf(loc(), start - end));
+    }
+
+    public DoWhileStatement(Location loc, String label, Statement condition, Statement body) {
+        super(loc);
+        this.label = label;
+        this.condition = condition;
+        this.body = body;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/ForInStatement.java

@@ -1,73 +1,73 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class ForInStatement extends Statement {
-    public final String varName;
-    public final boolean isDeclaration;
-    public final Statement varValue, object, body;
-    public final String label;
-    public final Location varLocation;
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-        if (isDeclaration) globScope.define(varName);
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        var key = scope.getKey(varName);
-
-        int first = target.size();
-        if (key instanceof String) target.add(Instruction.makeVar((String)key));
-
-        if (varValue != null) {
-            varValue.compile(target, scope, true);
-            target.add(Instruction.storeVar(scope.getKey(varName)));
-        }
-
-        object.compileWithDebug(target, scope, true);
-        target.add(Instruction.keys(true));
-
-        int start = target.size();
-        target.add(Instruction.dup());
-        target.add(Instruction.loadValue(null));
-        target.add(Instruction.operation(Operation.EQUALS));
-        int mid = target.size();
-        target.add(Instruction.nop());
-
-        target.add(Instruction.loadMember("value").locate(varLocation));
-        target.setDebug();
-        target.add(Instruction.storeVar(key));
-
-        body.compileWithDebug(target, scope, false);
-
-        int end = target.size();
-
-        WhileStatement.replaceBreaks(target, label, mid + 1, end, start, end + 1);
-
-        target.add(Instruction.jmp(start - end));
-        target.add(Instruction.discard());
-        target.set(mid, Instruction.jmpIf(end - mid + 1));
-        if (pollute) target.add(Instruction.loadValue(null));
-        target.get(first).locate(loc());
-        target.setDebug(first);
-    }
-
-    public ForInStatement(Location loc, Location varLocation, String label, boolean isDecl, String varName, Statement varValue, Statement object, Statement body) {
-        super(loc);
-        this.varLocation = varLocation;
-        this.label = label;
-        this.isDeclaration = isDecl;
-        this.varName = varName;
-        this.varValue = varValue;
-        this.object = object;
-        this.body = body;
-    }
-}
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ForInStatement extends Statement {
+    public final String varName;
+    public final boolean isDeclaration;
+    public final Statement varValue, object, body;
+    public final String label;
+    public final Location varLocation;
+
+    @Override
+    public void declare(ScopeRecord globScope) {
+        body.declare(globScope);
+        if (isDeclaration) globScope.define(varName);
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        var key = scope.getKey(varName);
+
+        int first = target.size();
+        if (key instanceof String) target.add(Instruction.makeVar(loc(), (String)key));
+
+        if (varValue != null) {
+            varValue.compile(target, scope, true);
+            target.add(Instruction.storeVar(loc(), scope.getKey(varName)));
+        }
+
+        object.compile(target, scope, true, BreakpointType.STEP_OVER);
+        target.add(Instruction.keys(loc(), true));
+
+        int start = target.size();
+        target.add(Instruction.dup(loc()));
+        target.add(Instruction.loadValue(loc(), null));
+        target.add(Instruction.operation(loc(), Operation.EQUALS));
+        int mid = target.size();
+        target.add(Instruction.nop(loc()));
+
+        target.add(Instruction.loadMember(varLocation, "value"));
+        target.add(Instruction.storeVar(object.loc(), key));
+        target.setDebug(BreakpointType.STEP_OVER);
+
+        body.compile(target, scope, false, BreakpointType.STEP_OVER);
+
+        int end = target.size();
+
+        WhileStatement.replaceBreaks(target, label, mid + 1, end, start, end + 1);
+
+        target.add(Instruction.jmp(loc(), start - end));
+        target.add(Instruction.discard(loc()));
+        target.set(mid, Instruction.jmpIf(loc(), end - mid + 1));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+        target.get(first).locate(loc());
+    }
+
+    public ForInStatement(Location loc, Location varLocation, String label, boolean isDecl, String varName, Statement varValue, Statement object, Statement body) {
+        super(loc);
+        this.varLocation = varLocation;
+        this.label = label;
+        this.isDeclaration = isDecl;
+        this.varName = varName;
+        this.varValue = varValue;
+        this.object = object;
+        this.body = body;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/ForStatement.java

@@ -0,0 +1,47 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ForStatement extends Statement {
+    public final Statement declaration, assignment, condition, body;
+    public final String label;
+
+    @Override
+    public void declare(ScopeRecord globScope) {
+        declaration.declare(globScope);
+        body.declare(globScope);
+    }
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        declaration.compile(target, scope, false, BreakpointType.STEP_OVER);
+
+        int start = target.size();
+        condition.compile(target, scope, true, BreakpointType.STEP_OVER);
+        int mid = target.size();
+        target.add(Instruction.nop(null));
+        body.compile(target, scope, false, BreakpointType.STEP_OVER);
+        int beforeAssign = target.size();
+        assignment.compile(target, scope, false, BreakpointType.STEP_OVER);
+        int end = target.size();
+
+        WhileStatement.replaceBreaks(target, label, mid + 1, end, beforeAssign, end + 1);
+
+        target.add(Instruction.jmp(loc(), start - end));
+        target.set(mid, Instruction.jmpIfNot(loc(), end - mid + 1));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public ForStatement(Location loc, String label, Statement declaration, Statement condition, Statement assignment, Statement body) {
+        super(loc);
+        this.label = label;
+        this.declaration = declaration;
+        this.condition = condition;
+        this.assignment = assignment;
+        this.body = body;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/IfStatement.java

@@ -0,0 +1,52 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class IfStatement extends Statement {
+    public final Statement condition, body, elseBody;
+
+    @Override
+    public void declare(ScopeRecord globScope) {
+        body.declare(globScope);
+        if (elseBody != null) elseBody.declare(globScope);
+    }
+
+    @Override public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType breakpoint) {
+        condition.compile(target, scope, true, breakpoint);
+
+        if (elseBody == null) {
+            int i = target.size();
+            target.add(Instruction.nop(null));
+            body.compile(target, scope, pollute, breakpoint);
+            int endI = target.size();
+            target.set(i, Instruction.jmpIfNot(loc(), endI - i));
+        }
+        else {
+            int start = target.size();
+            target.add(Instruction.nop(null));
+            body.compile(target, scope, pollute, breakpoint);
+            target.add(Instruction.nop(null));
+            int mid = target.size();
+            elseBody.compile(target, scope, pollute, breakpoint);
+            int end = target.size();
+
+            target.set(start, Instruction.jmpIfNot(loc(), mid - start));
+            target.set(mid - 1, Instruction.jmp(loc(), end - mid + 1));
+        }
+    }
+    @Override public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, pollute, BreakpointType.STEP_IN);
+    }
+
+    public IfStatement(Location loc, Statement condition, Statement body, Statement elseBody) {
+        super(loc);
+        this.condition = condition;
+        this.body = body;
+        this.elseBody = elseBody;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/ReturnStatement.java

@@ -0,0 +1,23 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ReturnStatement extends Statement {
+    public final Statement value;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (value == null) target.add(Instruction.loadValue(loc(), null));
+        else value.compile(target, scope, true);
+        target.add(Instruction.ret(loc()));
+    }
+
+    public ReturnStatement(Location loc, Statement value) {
+        super(loc);
+        this.value = value;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/SwitchStatement.java

@@ -0,0 +1,87 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import java.util.HashMap;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class SwitchStatement extends Statement {
+    public static class SwitchCase {
+        public final Statement value;
+        public final int statementI;
+
+        public SwitchCase(Statement value, int statementI) {
+            this.value = value;
+            this.statementI = statementI;
+        }
+    }
+
+    public final Statement value;
+    public final SwitchCase[] cases;
+    public final Statement[] body;
+    public final int defaultI;
+
+    @Override
+    public void declare(ScopeRecord varsScope) {
+        for (var stm : body) stm.declare(varsScope);
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        var caseToStatement = new HashMap<Integer, Integer>();
+        var statementToIndex = new HashMap<Integer, Integer>();
+
+        value.compile(target, scope, true, BreakpointType.STEP_OVER);
+
+        for (var ccase : cases) {
+            target.add(Instruction.dup(loc()));
+            ccase.value.compile(target, scope, true);
+            target.add(Instruction.operation(loc(), Operation.EQUALS));
+            caseToStatement.put(target.size(), ccase.statementI);
+            target.add(Instruction.nop(null));
+        }
+
+        int start = target.size();
+
+        target.add(Instruction.nop(null));
+
+        for (var stm : body) {
+            statementToIndex.put(statementToIndex.size(), target.size());
+            stm.compile(target, scope, false, BreakpointType.STEP_OVER);
+        }
+
+        int end = target.size();
+        target.add(Instruction.discard(loc()));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+
+        if (defaultI < 0 || defaultI >= body.length) target.set(start, Instruction.jmp(loc(), end - start));
+        else target.set(start, Instruction.jmp(loc(), statementToIndex.get(defaultI) - start));
+
+        for (int i = start; i < end; i++) {
+            var instr = target.get(i);
+            if (instr.type == Type.NOP && instr.is(0, "break") && instr.get(1) == null) {
+                target.set(i, Instruction.jmp(loc(), end - i).locate(instr.location));
+            }
+        }
+        for (var el : caseToStatement.entrySet()) {
+            var i = statementToIndex.get(el.getValue());
+            if (i == null) i = end;
+            target.set(el.getKey(), Instruction.jmpIf(loc(), i - el.getKey()));
+        }
+
+    }
+
+    public SwitchStatement(Location loc, Statement value, int defaultI, SwitchCase[] cases, Statement[] body) {
+        super(loc);
+        this.value = value;
+        this.defaultI = defaultI;
+        this.cases = cases;
+        this.body = body;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/ThrowStatement.java

@@ -0,0 +1,22 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ThrowStatement extends Statement {
+    public final Statement value;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.compile(target, scope, true);
+        target.add(Instruction.throwInstr(loc()));
+    }
+
+    public ThrowStatement(Location loc, Statement value) {
+        super(loc);
+        this.value = value;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/TryStatement.java

@@ -1,59 +1,61 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.GlobalScope;
-import me.topchetoeu.jscript.engine.scope.LocalScopeRecord;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class TryStatement extends Statement {
-    public final Statement tryBody;
-    public final Statement catchBody;
-    public final Statement finallyBody;
-    public final String name;
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        tryBody.declare(globScope);
-        if (catchBody != null) catchBody.declare(globScope);
-        if (finallyBody != null) finallyBody.declare(globScope);
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        target.add(Instruction.nop());
-
-        int start = target.size(), tryN, catchN = -1, finN = -1;
-
-        tryBody.compile(target, scope, false);
-        tryN = target.size() - start;
-
-        if (catchBody != null) {
-            int tmp = target.size();
-            var local = scope instanceof GlobalScope ? scope.child() : (LocalScopeRecord)scope;
-            local.define(name, true);
-            catchBody.compile(target, scope, false);
-            local.undefine();
-            catchN = target.size() - tmp;
-        }
-
-        if (finallyBody != null) {
-            int tmp = target.size();
-            finallyBody.compile(target, scope, false);
-            finN = target.size() - tmp;
-        }
-
-        target.set(start - 1, Instruction.tryInstr(tryN, catchN, finN).locate(loc()));
-        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-
-    public TryStatement(Location loc, Statement tryBody, Statement catchBody, Statement finallyBody, String name) {
-        super(loc);
-        this.tryBody = tryBody;
-        this.catchBody = catchBody;
-        this.finallyBody = finallyBody;
-        this.name = name;
-    }
-}
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.core.engine.scope.LocalScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class TryStatement extends Statement {
+    public final Statement tryBody;
+    public final Statement catchBody;
+    public final Statement finallyBody;
+    public final String name;
+
+    @Override
+    public void declare(ScopeRecord globScope) {
+        tryBody.declare(globScope);
+        if (catchBody != null) catchBody.declare(globScope);
+        if (finallyBody != null) finallyBody.declare(globScope);
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType bpt) {
+        target.add(Instruction.nop(null));
+
+        int start = target.size(), catchStart = -1, finallyStart = -1;
+
+        tryBody.compile(target, scope, false);
+        target.add(Instruction.tryEnd(loc()));
+
+        if (catchBody != null) {
+            catchStart = target.size() - start;
+            var local = scope instanceof GlobalScope ? scope.child() : (LocalScopeRecord)scope;
+            local.define(name, true);
+            catchBody.compile(target, scope, false);
+            local.undefine();
+            target.add(Instruction.tryEnd(loc()));
+        }
+
+        if (finallyBody != null) {
+            finallyStart = target.size() - start;
+            finallyBody.compile(target, scope, false);
+            target.add(Instruction.tryEnd(loc()));
+        }
+
+        target.set(start - 1, Instruction.tryStart(loc(), catchStart, finallyStart, target.size() - start));
+        target.setDebug(start - 1, BreakpointType.STEP_OVER);
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public TryStatement(Location loc, Statement tryBody, Statement catchBody, Statement finallyBody, String name) {
+        super(loc);
+        this.tryBody = tryBody;
+        this.catchBody = catchBody;
+        this.finallyBody = finallyBody;
+        this.name = name;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/control/WhileStatement.java

@@ -0,0 +1,54 @@
+package me.topchetoeu.jscript.core.compilation.control;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class WhileStatement extends Statement {
+    public final Statement condition, body;
+    public final String label;
+
+    @Override
+    public void declare(ScopeRecord globScope) {
+        body.declare(globScope);
+    }
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        int start = target.size();
+        condition.compile(target, scope, true);
+        int mid = target.size();
+        target.add(Instruction.nop(null));
+        body.compile(target, scope, false, BreakpointType.STEP_OVER);
+
+        int end = target.size();
+
+        replaceBreaks(target, label, mid + 1, end, start, end + 1);
+
+        target.add(Instruction.jmp(loc(), start - end));
+        target.set(mid, Instruction.jmpIfNot(loc(), end - mid + 1));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public WhileStatement(Location loc, String label, Statement condition, Statement body) {
+        super(loc);
+        this.label = label;
+        this.condition = condition;
+        this.body = body;
+    }
+
+    public static void replaceBreaks(CompileTarget target, String label, int start, int end, int continuePoint, int breakPoint) {
+        for (int i = start; i < end; i++) {
+            var instr = target.get(i);
+            if (instr.type == Type.NOP && instr.is(0, "cont") && (instr.get(1) == null || instr.is(1, label))) {
+                target.set(i, Instruction.jmp(instr.location, continuePoint - i).setDbgData(target.get(i)));
+            }
+            if (instr.type == Type.NOP && instr.is(0, "break") && (instr.get(1) == null || instr.is(1, label))) {
+                target.set(i, Instruction.jmp(instr.location, breakPoint - i).setDbgData(target.get(i)));
+            }
+        }
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/ArrayStatement.java

@@ -0,0 +1,41 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ArrayStatement extends Statement {
+    public final Statement[] statements;
+
+    @Override public boolean pure() {
+        for (var stm : statements) {
+            if (!stm.pure()) return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.loadArr(loc(), statements.length));
+
+        for (var i = 0; i < statements.length; i++) {
+            var el = statements[i];
+            if (el != null) {
+                target.add(Instruction.dup(loc()));
+                target.add(Instruction.loadValue(loc(), i));
+                el.compile(target, scope, true);
+                target.add(Instruction.storeMember(loc()));
+            }
+        }
+
+        if (!pollute) target.add(Instruction.discard(loc()));
+    }
+
+    public ArrayStatement(Location loc, Statement[] statements) {
+        super(loc);
+        this.statements = statements;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/CallStatement.java

@@ -0,0 +1,51 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class CallStatement extends Statement {
+    public final Statement func;
+    public final Statement[] args;
+    public final boolean isNew;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType type) {
+        if (isNew) func.compile(target, scope, true);
+        else if (func instanceof IndexStatement) {
+            ((IndexStatement)func).compile(target, scope, true, true);
+        }
+        else {
+            target.add(Instruction.loadValue(loc(), null));
+            func.compile(target, scope, true);
+        }
+
+        for (var arg : args) arg.compile(target, scope, true);
+
+        if (isNew) target.add(Instruction.callNew(loc(), args.length));
+        else target.add(Instruction.call(loc(), args.length));
+        target.setDebug(type);
+
+        if (!pollute) target.add(Instruction.discard(loc()));
+    }
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, pollute, BreakpointType.STEP_IN);
+    }
+
+    public CallStatement(Location loc, boolean isNew, Statement func, Statement ...args) {
+        super(loc);
+        this.isNew = isNew;
+        this.func = func;
+        this.args = args;
+    }
+    public CallStatement(Location loc, boolean isNew, Statement obj, Object key, Statement ...args) {
+        super(loc);
+        this.isNew = isNew;
+        this.func = new IndexStatement(loc, obj, new ConstantStatement(loc, key));
+        this.args = args;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/ChangeStatement.java

@@ -0,0 +1,32 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.AssignableStatement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ChangeStatement extends Statement {
+    public final AssignableStatement value;
+    public final double addAmount;
+    public final boolean postfix;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.toAssign(new ConstantStatement(loc(), -addAmount), Operation.SUBTRACT).compile(target, scope, true);
+        if (!pollute) target.add(Instruction.discard(loc()));
+        else if (postfix) {
+            target.add(Instruction.loadValue(loc(), addAmount));
+            target.add(Instruction.operation(loc(), Operation.SUBTRACT));
+        }
+    }
+
+    public ChangeStatement(Location loc, AssignableStatement value, double addAmount, boolean postfix) {
+        super(loc);
+        this.value = value;
+        this.addAmount = addAmount;
+        this.postfix = postfix;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/ConstantStatement.java

@@ -0,0 +1,23 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ConstantStatement extends Statement {
+    public final Object value;
+
+    @Override public boolean pure() { return true; }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (pollute) target.add(Instruction.loadValue(loc(), value));
+    }
+
+    public ConstantStatement(Location loc, Object val) {
+        super(loc);
+        this.value = val;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/DiscardStatement.java

@@ -0,0 +1,24 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class DiscardStatement extends Statement {
+    public final Statement value;
+
+    @Override public boolean pure() { return value.pure(); }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.compile(target, scope, false);
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public DiscardStatement(Location loc, Statement val) {
+        super(loc);
+        this.value = val;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/FunctionStatement.java

@@ -0,0 +1,139 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import java.util.Random;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompoundStatement;
+import me.topchetoeu.jscript.core.compilation.FunctionBody;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
+
+public class FunctionStatement extends Statement {
+    public final CompoundStatement body;
+    public final String varName;
+    public final String[] args;
+    public final boolean statement;
+    public final Location end;
+
+    private static Random rand = new Random();
+
+    @Override public boolean pure() { return varName == null && statement; }
+
+    @Override
+    public void declare(ScopeRecord scope) {
+        if (varName != null && statement) scope.define(varName);
+    }
+
+    public static void checkBreakAndCont(CompileTarget target, int start) {
+        for (int i = start; i < target.size(); i++) {
+            if (target.get(i).type == Type.NOP) {
+                if (target.get(i).is(0, "break") ) {
+                    throw new SyntaxException(target.get(i).location, "Break was placed outside a loop.");
+                }
+                if (target.get(i).is(0, "cont")) {
+                    throw new SyntaxException(target.get(i).location, "Continue was placed outside a loop.");
+                }
+            }
+        }
+    }
+
+    private long compileBody(CompileTarget target, ScopeRecord scope, boolean polute, BreakpointType bp) {
+        for (var i = 0; i < args.length; i++) {
+            for (var j = 0; j < i; j++) {
+                if (args[i].equals(args[j])) {
+                    throw new SyntaxException(loc(), "Duplicate parameter '" + args[i] + "'.");
+                }
+            }
+        }
+
+        var id = rand.nextLong();
+        var subscope = scope.child();
+        var subtarget = new CompileTarget(target.functions, target.breakpoints);
+
+        subscope.define("this");
+        var argsVar = subscope.define("arguments");
+
+        if (args.length > 0) {
+            for (var i = 0; i < args.length; i++) {
+                subtarget.add(Instruction.loadVar(loc(), argsVar));
+                subtarget.add(Instruction.loadMember(loc(), i));
+                subtarget.add(Instruction.storeVar(loc(), subscope.define(args[i])));
+            }
+        }
+
+        if (!statement && this.varName != null) {
+            subtarget.add(Instruction.storeSelfFunc(loc(), (int)subscope.define(this.varName)));
+            subtarget.setDebug(bp);
+        }
+
+        body.declare(subscope);
+        body.compile(subtarget, subscope, false);
+        subtarget.add(Instruction.ret(end));
+        checkBreakAndCont(subtarget, 0);
+
+        if (polute) target.add(Instruction.loadFunc(loc(), id, subscope.getCaptures()));
+        target.functions.put(id, new FunctionBody(
+            subscope.localsCount(), args.length,
+            subtarget.array(), subscope.captures(), subscope.locals()
+        ));
+
+        return id;
+    }
+
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, String name, BreakpointType bp) {
+        if (this.varName != null) name = this.varName;
+
+        var hasVar = this.varName != null && statement;
+        var hasName = name != null;
+
+        compileBody(target, scope, pollute || hasVar || hasName, bp);
+
+        if (hasName) {
+            if (pollute || hasVar) target.add(Instruction.dup(loc()));
+            target.add(Instruction.loadValue(loc(), "name"));
+            target.add(Instruction.loadValue(loc(), name));
+            target.add(Instruction.storeMember(loc()));
+        }
+
+        if (hasVar) {
+            var key = scope.getKey(this.varName);
+
+            if (key instanceof String) target.add(Instruction.makeVar(loc(), (String)key));
+            target.add(Instruction.storeVar(loc(), scope.getKey(this.varName), false));
+        }
+    }
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, String name) {
+        compile(target, scope, pollute, name, BreakpointType.NONE);
+    }
+    @Override public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType bp) {
+        compile(target, scope, pollute, (String)null, bp);
+    }
+    @Override public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, pollute, (String)null, BreakpointType.NONE);
+    }
+
+    public FunctionStatement(Location loc, Location end, String varName, String[] args, boolean statement, CompoundStatement body) {
+        super(loc);
+
+        this.end = end;
+        this.varName = varName;
+        this.statement = statement;
+
+        this.args = args;
+        this.body = body;
+    }
+
+    public static void compileWithName(Statement stm, CompileTarget target, ScopeRecord scope, boolean pollute, String name) {
+        if (stm instanceof FunctionStatement) ((FunctionStatement)stm).compile(target, scope, pollute, name);
+        else stm.compile(target, scope, pollute);
+    }
+    public static void compileWithName(Statement stm, CompileTarget target, ScopeRecord scope, boolean pollute, String name, BreakpointType bp) {
+        if (stm instanceof FunctionStatement) ((FunctionStatement)stm).compile(target, scope, pollute, name, bp);
+        else stm.compile(target, scope, pollute, bp);
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/GlobalThisStatement.java

@@ -0,0 +1,20 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class GlobalThisStatement extends Statement {
+    @Override public boolean pure() { return true; }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (pollute) target.add(Instruction.loadGlob(loc()));
+    }
+
+    public GlobalThisStatement(Location loc) {
+        super(loc);
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/IndexAssignStatement.java

@@ -1,47 +1,48 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class IndexAssignStatement extends Statement {
-    public final Statement object;
-    public final Statement index;
-    public final Statement value;
-    public final Operation operation;
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (operation != null) {
-            object.compile(target, scope, true);
-            index.compile(target, scope, true);
-            target.add(Instruction.dup(2, 0).locate(loc()));
-
-            target.add(Instruction.loadMember().locate(loc()));
-            value.compile(target, scope, true);
-            target.add(Instruction.operation(operation).locate(loc()));
-
-            target.add(Instruction.storeMember(pollute).locate(loc()));
-            target.setDebug();
-        }
-        else {
-            object.compile(target, scope, true);
-            index.compile(target, scope, true);
-            value.compile(target, scope, true);
-
-            target.add(Instruction.storeMember(pollute).locate(loc()));
-            target.setDebug();
-        }
-    }
-
-    public IndexAssignStatement(Location loc, Statement object, Statement index, Statement value, Operation operation) {
-        super(loc);
-        this.object = object;
-        this.index = index;
-        this.value = value;
-        this.operation = operation;
-    }
-}
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class IndexAssignStatement extends Statement {
+    public final Statement object;
+    public final Statement index;
+    public final Statement value;
+    public final Operation operation;
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (operation != null) {
+            object.compile(target, scope, true);
+            index.compile(target, scope, true);
+            target.add(Instruction.dup(loc(), 2));
+
+            target.add(Instruction.loadMember(loc()));
+            value.compile(target, scope, true);
+            target.add(Instruction.operation(loc(), operation));
+
+            target.add(Instruction.storeMember(loc(), pollute));
+            target.setDebug(BreakpointType.STEP_IN);
+        }
+        else {
+            object.compile(target, scope, true);
+            index.compile(target, scope, true);
+            value.compile(target, scope, true);
+
+            target.add(Instruction.storeMember(loc(), pollute));
+            target.setDebug(BreakpointType.STEP_IN);
+        }
+    }
+
+    public IndexAssignStatement(Location loc, Statement object, Statement index, Statement value, Operation operation) {
+        super(loc);
+        this.object = object;
+        this.index = index;
+        this.value = value;
+        this.operation = operation;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/IndexStatement.java

@@ -1,51 +1,49 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class IndexStatement extends AssignableStatement {
-    public final Statement object;
-    public final Statement index;
-
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public Statement toAssign(Statement val, Operation operation) {
-        return new IndexAssignStatement(loc(), object, index, val, operation);
-    }
-    public void compile(CompileTarget target, ScopeRecord scope, boolean dupObj, boolean pollute) {
-        object.compile(target, scope, true);
-        if (dupObj) target.add(Instruction.dup().locate(loc()));
-        if (index instanceof ConstantStatement) {
-            target.add(Instruction.loadMember(((ConstantStatement)index).value).locate(loc()));
-            target.setDebug();
-            return;
-        }
-
-        index.compile(target, scope, true);
-        target.add(Instruction.loadMember().locate(loc()));
-        target.setDebug();
-        if (!pollute) target.add(Instruction.discard().locate(loc()));
-    }
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        compile(target, scope, false, pollute);
-    }
-
-    public IndexStatement(Location loc, Statement object, Statement index) {
-        super(loc);
-        this.object = object;
-        this.index = index;
-    }
-    public IndexStatement(Location loc, Statement object, Object index) {
-        super(loc);
-        this.object = object;
-        this.index = new ConstantStatement(loc, index);
-    }
-}
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.AssignableStatement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class IndexStatement extends AssignableStatement {
+    public final Statement object;
+    public final Statement index;
+
+    @Override
+    public Statement toAssign(Statement val, Operation operation) {
+        return new IndexAssignStatement(loc(), object, index, val, operation);
+    }
+    public void compile(CompileTarget target, ScopeRecord scope, boolean dupObj, boolean pollute) {
+        object.compile(target, scope, true);
+        if (dupObj) target.add(Instruction.dup(loc()));
+        if (index instanceof ConstantStatement) {
+            target.add(Instruction.loadMember(loc(), ((ConstantStatement)index).value));
+            target.setDebug(BreakpointType.STEP_IN);
+            return;
+        }
+
+        index.compile(target, scope, true);
+        target.add(Instruction.loadMember(loc()));
+        target.setDebug(BreakpointType.STEP_IN);
+        if (!pollute) target.add(Instruction.discard(loc()));
+    }
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, false, pollute);
+    }
+
+    public IndexStatement(Location loc, Statement object, Statement index) {
+        super(loc);
+        this.object = object;
+        this.index = index;
+    }
+    public IndexStatement(Location loc, Statement object, Object index) {
+        super(loc);
+        this.object = object;
+        this.index = new ConstantStatement(loc, index);
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/LazyAndStatement.java

@@ -1,42 +1,39 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class LazyAndStatement extends Statement {
-    public final Statement first, second;
-
-    @Override
-    public boolean pure() {
-        return first.pure() && second.pure();
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (first instanceof ConstantStatement) {
-            if (Values.not(((ConstantStatement)first).value)) {
-                first.compile(target, scope, pollute);
-            }
-            else second.compile(target, scope, pollute);
-            return;
-        }
-
-        first.compile(target, scope, true);
-        if (pollute) target.add(Instruction.dup().locate(loc()));
-        int start = target.size();
-        target.add(Instruction.nop());
-        if (pollute) target.add(Instruction.discard().locate(loc()));
-        second.compile(target, scope, pollute);
-        target.set(start, Instruction.jmpIfNot(target.size() - start).locate(loc()));
-    }
-
-    public LazyAndStatement(Location loc, Statement first, Statement second) {
-        super(loc);
-        this.first = first;
-        this.second = second;
-    }
-}
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.values.Values;
+
+public class LazyAndStatement extends Statement {
+    public final Statement first, second;
+
+    @Override public boolean pure() { return first.pure() && second.pure(); }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (first instanceof ConstantStatement) {
+            if (Values.not(((ConstantStatement)first).value)) {
+                first.compile(target, scope, pollute);
+            }
+            else second.compile(target, scope, pollute);
+            return;
+        }
+
+        first.compile(target, scope, true);
+        if (pollute) target.add(Instruction.dup(loc()));
+        int start = target.size();
+        target.add(Instruction.nop(null));
+        if (pollute) target.add(Instruction.discard(loc()));
+        second.compile(target, scope, pollute);
+        target.set(start, Instruction.jmpIfNot(loc(), target.size() - start));
+    }
+
+    public LazyAndStatement(Location loc, Statement first, Statement second) {
+        super(loc);
+        this.first = first;
+        this.second = second;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/LazyOrStatement.java

@@ -1,42 +1,39 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
-
-public class LazyOrStatement extends Statement {
-    public final Statement first, second;
-
-    @Override
-    public boolean pure() {
-        return first.pure() && second.pure();
-    }
-
-    @Override
-    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
-        if (first instanceof ConstantStatement) {
-            if (Values.not(((ConstantStatement)first).value)) {
-                second.compile(target, scope, pollute);
-            }
-            else first.compile(target, scope, pollute);
-            return;
-        }
-
-        first.compile(target, scope, true);
-        if (pollute) target.add(Instruction.dup().locate(loc()));
-        int start = target.size();
-        target.add(Instruction.nop());
-        if (pollute) target.add(Instruction.discard().locate(loc()));
-        second.compile(target, scope, pollute);
-        target.set(start, Instruction.jmpIf(target.size() - start).locate(loc()));
-    }
-
-    public LazyOrStatement(Location loc, Statement first, Statement second) {
-        super(loc);
-        this.first = first;
-        this.second = second;
-    }
-}
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.values.Values;
+
+public class LazyOrStatement extends Statement {
+    public final Statement first, second;
+
+    @Override public boolean pure() { return first.pure() && second.pure(); }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (first instanceof ConstantStatement) {
+            if (Values.not(((ConstantStatement)first).value)) {
+                second.compile(target, scope, pollute);
+            }
+            else first.compile(target, scope, pollute);
+            return;
+        }
+
+        first.compile(target, scope, true);
+        if (pollute) target.add(Instruction.dup(loc()));
+        int start = target.size();
+        target.add(Instruction.nop(null));
+        if (pollute) target.add(Instruction.discard(loc()));
+        second.compile(target, scope, pollute);
+        target.set(start, Instruction.jmpIf(loc(), target.size() - start));
+    }
+
+    public LazyOrStatement(Location loc, Statement first, Statement second) {
+        super(loc);
+        this.first = first;
+        this.second = second;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/ObjectStatement.java

@@ -0,0 +1,63 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class ObjectStatement extends Statement {
+    public final Map<Object, Statement> map;
+    public final Map<Object, FunctionStatement> getters;
+    public final Map<Object, FunctionStatement> setters;
+
+    @Override public boolean pure() {
+        for (var el : map.values()) {
+            if (!el.pure()) return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.loadObj(loc()));
+
+        for (var el : map.entrySet()) {
+            target.add(Instruction.dup(loc()));
+            target.add(Instruction.loadValue(loc(), el.getKey()));
+            var val = el.getValue();
+            FunctionStatement.compileWithName(val, target, scope, true, el.getKey().toString());
+            target.add(Instruction.storeMember(loc()));
+        }
+
+        var keys = new ArrayList<Object>();
+        keys.addAll(getters.keySet());
+        keys.addAll(setters.keySet());
+
+        for (var key : keys) {
+            if (key instanceof String) target.add(Instruction.loadValue(loc(), (String)key));
+            else target.add(Instruction.loadValue(loc(), (Double)key));
+
+            if (getters.containsKey(key)) getters.get(key).compile(target, scope, true);
+            else target.add(Instruction.loadValue(loc(), null));
+
+            if (setters.containsKey(key)) setters.get(key).compile(target, scope, true);
+            else target.add(Instruction.loadValue(loc(), null));
+
+            target.add(Instruction.defProp(loc()));
+        }
+
+        if (!pollute) target.add(Instruction.discard(loc()));
+    }
+
+    public ObjectStatement(Location loc, Map<Object, Statement> map, Map<Object, FunctionStatement> getters, Map<Object, FunctionStatement> setters) {
+        super(loc);
+        this.map = map;
+        this.getters = getters;
+        this.setters = setters;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/OperationStatement.java

@@ -0,0 +1,37 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class OperationStatement extends Statement {
+    public final Statement[] args;
+    public final Operation operation;
+
+    @Override public boolean pure() {
+        for (var el : args) {
+            if (!el.pure()) return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        for (var arg : args) {
+            arg.compile(target, scope, true);
+        }
+
+        if (pollute) target.add(Instruction.operation(loc(), operation));
+        else target.add(Instruction.discard(loc()));
+    }
+
+    public OperationStatement(Location loc, Operation operation, Statement ...args) {
+        super(loc);
+        this.operation = operation;
+        this.args = args;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/RegexStatement.java

@@ -0,0 +1,26 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class RegexStatement extends Statement {
+    public final String pattern, flags;
+
+    // Not really pure, since a function is called, but can be ignored.
+    @Override public boolean pure() { return true; }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        target.add(Instruction.loadRegex(loc(), pattern, flags));
+        if (!pollute) target.add(Instruction.discard(loc()));
+    }
+
+    public RegexStatement(Location loc, String pattern, String flags) {
+        super(loc);
+        this.pattern = pattern;
+        this.flags = flags;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/TypeofStatement.java

@@ -0,0 +1,33 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class TypeofStatement extends Statement {
+    public final Statement value;
+
+    // Not really pure, since a variable from the global scope could be accessed,
+    // which could lead to code execution, that would get omitted
+    @Override public boolean pure() { return true; }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (value instanceof VariableStatement) {
+            var i = scope.getKey(((VariableStatement)value).name);
+            if (i instanceof String) {
+                target.add(Instruction.typeof(loc(), (String)i));
+                return;
+            }
+        }
+        value.compile(target, scope, pollute);
+        target.add(Instruction.typeof(loc()));
+    }
+
+    public TypeofStatement(Location loc, Statement value) {
+        super(loc);
+        this.value = value;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/VariableAssignStatement.java

@@ -0,0 +1,38 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class VariableAssignStatement extends Statement {
+    public final String name;
+    public final Statement value;
+    public final Operation operation;
+
+    @Override public boolean pure() { return false; }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        var i = scope.getKey(name);
+        if (operation != null) {
+            target.add(Instruction.loadVar(loc(), i));
+            FunctionStatement.compileWithName(value, target, scope, true, name);
+            target.add(Instruction.operation(loc(), operation));
+            target.add(Instruction.storeVar(loc(), i, pollute));
+        }
+        else {
+            FunctionStatement.compileWithName(value, target, scope, true, name);
+            target.add(Instruction.storeVar(loc(), i, pollute));
+        }
+    }
+
+    public VariableAssignStatement(Location loc, String name, Statement val, Operation operation) {
+        super(loc);
+        this.name = name;
+        this.value = val;
+        this.operation = operation;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/VariableIndexStatement.java

@@ -0,0 +1,23 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class VariableIndexStatement extends Statement {
+    public final int index;
+
+    @Override public boolean pure() { return true; }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (pollute) target.add(Instruction.loadVar(loc(), index));
+    }
+
+    public VariableIndexStatement(Location loc, int i) {
+        super(loc);
+        this.index = i;
+    }
+}

src/me/topchetoeu/jscript/core/compilation/values/VariableStatement.java

@@ -0,0 +1,32 @@
+package me.topchetoeu.jscript.core.compilation.values;
+
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.compilation.AssignableStatement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
+import me.topchetoeu.jscript.core.engine.Operation;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
+
+public class VariableStatement extends AssignableStatement {
+    public final String name;
+
+    @Override public boolean pure() { return false; }
+
+    @Override
+    public Statement toAssign(Statement val, Operation operation) {
+        return new VariableAssignStatement(loc(), name, val, operation);
+    }
+
+    @Override
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        var i = scope.getKey(name);
+        target.add(Instruction.loadVar(loc(), i));
+        if (!pollute) target.add(Instruction.discard(loc()));
+    }
+
+    public VariableStatement(Location loc, String name) {
+        super(loc);
+        this.name = name;
+    }
+}

src/me/topchetoeu/jscript/core/engine/Context.java

@@ -0,0 +1,166 @@
+package me.topchetoeu.jscript.core.engine;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import me.topchetoeu.jscript.common.Filename;
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.engine.debug.DebugContext;
+import me.topchetoeu.jscript.core.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Values;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
+import me.topchetoeu.jscript.lib.EnvironmentLib;
+import me.topchetoeu.jscript.utils.mapping.SourceMap;
+
+public class Context implements Extensions {
+    public static final Context NULL = new Context(null);
+
+    public final Context parent;
+    public final Environment environment;
+    public final CodeFrame frame;
+    public final Engine engine;
+    public final int stackSize;
+
+    @Override public <T> void add(Symbol key, T obj) {
+        if (environment != null) environment.add(key, obj);
+        else if (engine != null) engine.add(key, obj);
+    }
+    @Override public <T> T get(Symbol key) {
+        if (environment != null && environment.has(key)) return environment.get(key);
+        else if (engine != null && engine.has(key)) return engine.get(key);
+        return null;
+    }
+    @Override public boolean has(Symbol key) {
+        return
+            environment != null && environment.has(key) ||
+            engine != null && engine.has(key);
+    }
+    @Override public boolean remove(Symbol key) {
+        var res = false;
+
+        if (environment != null) res |= environment.remove(key);
+        else if (engine != null) res |= engine.remove(key);
+
+        return res;
+    }
+    @Override public Iterable<Symbol> keys() {
+        if (engine == null && environment == null) return List.of();
+        if (engine == null) return environment.keys();
+        if (environment == null) return engine.keys();
+
+        return () -> Stream.concat(
+            StreamSupport.stream(engine.keys().spliterator(), false),
+            StreamSupport.stream(environment.keys().spliterator(), false)
+        ).distinct().iterator();
+    }
+
+    public FunctionValue compile(Filename filename, String raw) {
+        var env = environment;
+        var result = Environment.compileFunc(this).call(this, null, raw, filename.toString(), new EnvironmentLib(env));
+
+        var function = (FunctionValue)Values.getMember(this, result, "function");
+        if (!DebugContext.enabled(this)) return function;
+
+        var rawMapChain = ((ArrayValue)Values.getMember(this, result, "mapChain")).toArray();
+        var breakpoints = new TreeSet<>(
+            Arrays.stream(((ArrayValue)Values.getMember(this, result, "breakpoints")).toArray())
+                .map(v -> Location.parse(Values.toString(this, v)))
+                .collect(Collectors.toList())
+        );
+        var maps = new SourceMap[rawMapChain.length];
+
+        for (var i = 0; i < maps.length; i++) maps[i] = SourceMap.parse(Values.toString(this, (String)rawMapChain[i]));
+
+        var map = SourceMap.chain(maps);
+
+        if (map != null) {
+            var newBreakpoints = new TreeSet<Location>();
+            for (var bp : breakpoints) {
+                bp = map.toCompiled(bp);
+                if (bp != null) newBreakpoints.add(bp);
+            }
+            breakpoints = newBreakpoints;
+        }
+
+        DebugContext.get(this).onSource(filename, raw, breakpoints, map);
+
+        return function;
+    }
+
+    public Context pushFrame(CodeFrame frame) {
+        var res = new Context(this, frame.function.environment, frame, engine, stackSize + 1);
+        return res;
+    }
+
+    public Iterable<CodeFrame> frames() {
+        var self = this;
+        return () -> new Iterator<CodeFrame>() {
+            private Context curr = self;
+
+            private void update() {
+                while (curr != null && curr.frame == null) curr = curr.parent;
+            }
+
+            @Override public boolean hasNext() {
+                update();
+                return curr != null;
+            }
+            @Override public CodeFrame next() {
+                update();
+                var res = curr.frame;
+                curr = curr.parent;
+                return res;
+            }
+        };
+    }
+    public List<String> stackTrace() {
+        var res = new ArrayList<String>();
+
+        for (var el : frames()) {
+            var name = el.function.name;
+            Location loc = null;
+
+            for (var j = el.codePtr; j >= 0 && loc == null; j--) loc = el.function.body[j].location;
+            if (loc == null) loc = el.function.loc();
+
+            var trace = "";
+
+            if (loc != null) trace += "at " + loc.toString() + " ";
+            if (name != null && !name.equals("")) trace += "in " + name + " ";
+
+            trace = trace.trim();
+
+            if (!trace.equals("")) res.add(trace);
+        }
+
+        return res;
+    }
+
+    private Context(Context parent, Environment environment, CodeFrame frame, Engine engine, int stackSize) {
+        this.parent = parent;
+        this.environment = environment;
+        this.frame = frame;
+        this.engine = engine;
+        this.stackSize = stackSize;
+
+        if (hasNotNull(Environment.MAX_STACK_COUNT) && stackSize > (int)get(Environment.MAX_STACK_COUNT)) {
+            throw EngineException.ofRange("Stack overflow!");
+        }
+    }
+
+    public Context(Engine engine) {
+        this(null, null, null, engine, 0);
+    }
+    public Context(Engine engine, Environment env) {
+        this(null, env, null, engine, 0);
+    }
+}

src/me/topchetoeu/jscript/core/engine/Engine.java

@@ -0,0 +1,57 @@
+package me.topchetoeu.jscript.core.engine;
+
+import java.util.HashMap;
+
+import me.topchetoeu.jscript.common.Filename;
+import me.topchetoeu.jscript.common.events.Awaitable;
+import me.topchetoeu.jscript.core.compilation.FunctionBody;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
+
+public class Engine extends EventLoop implements Extensions {
+    public static final HashMap<Long, FunctionBody> functions = new HashMap<>();
+
+    private final Environment env = new Environment();
+
+    @Override
+    public <T> void add(Symbol key, T obj) {
+        this.env.add(key, obj);
+    }
+    @Override
+    public <T> T get(Symbol key) {
+        return this.env.get(key);
+    }
+    @Override
+    public boolean has(Symbol key) {
+        return this.env.has(key);
+    }
+    @Override
+    public boolean remove(Symbol key) {
+        return this.env.remove(key);
+    }
+    @Override
+    public Iterable<Symbol> keys() {
+        return env.keys();
+    }
+
+    public Engine copy() {
+        var res = new Engine();
+        res.env.addAll(env);
+        return res;
+    }
+
+    public Awaitable<Object> pushMsg(boolean micro, Environment env, FunctionValue func, Object thisArg, Object ...args) {
+        return pushMsg(() -> {
+            return func.call(new Context(this, env), thisArg, args);
+        }, micro);
+    }
+    public Awaitable<Object> pushMsg(boolean micro, Environment env, Filename filename, String raw, Object thisArg, Object ...args) {
+        return pushMsg(() -> {
+            var ctx = new Context(this, env);
+            return ctx.compile(filename, raw).call(new Context(this, env), thisArg, args);
+        }, micro);
+    }
+
+    public Engine() {
+    }
+}

src/me/topchetoeu/jscript/core/engine/Environment.java

@@ -0,0 +1,128 @@
+package me.topchetoeu.jscript.core.engine;
+
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
+import me.topchetoeu.jscript.common.Filename;
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.core.engine.debug.DebugContext;
+import me.topchetoeu.jscript.core.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.NativeFunction;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Values;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
+import me.topchetoeu.jscript.core.parsing.Parsing;
+import me.topchetoeu.jscript.utils.interop.NativeWrapperProvider;
+
+@SuppressWarnings("unchecked")
+public class Environment implements Extensions {
+
+    public static final HashMap<String, Symbol> symbols = new HashMap<>();
+
+    public static final Symbol WRAPPERS = Symbol.get("Environment.wrappers");
+    public static final Symbol COMPILE_FUNC = Symbol.get("Environment.compile");
+
+    public static final Symbol REGEX_CONSTR = Symbol.get("Environment.regexConstructor");
+    public static final Symbol STACK = Symbol.get("Environment.stack");
+    public static final Symbol MAX_STACK_COUNT = Symbol.get("Environment.maxStackCount");
+    public static final Symbol HIDE_STACK = Symbol.get("Environment.hideStack");
+
+    public static final Symbol OBJECT_PROTO = Symbol.get("Environment.objectPrototype");
+    public static final Symbol FUNCTION_PROTO = Symbol.get("Environment.functionPrototype");
+    public static final Symbol ARRAY_PROTO = Symbol.get("Environment.arrayPrototype");
+    public static final Symbol BOOL_PROTO = Symbol.get("Environment.boolPrototype");
+    public static final Symbol NUMBER_PROTO = Symbol.get("Environment.numberPrototype");
+    public static final Symbol STRING_PROTO = Symbol.get("Environment.stringPrototype");
+    public static final Symbol SYMBOL_PROTO = Symbol.get("Environment.symbolPrototype");
+    public static final Symbol ERROR_PROTO = Symbol.get("Environment.errorPrototype");
+    public static final Symbol SYNTAX_ERR_PROTO = Symbol.get("Environment.syntaxErrorPrototype");
+    public static final Symbol TYPE_ERR_PROTO = Symbol.get("Environment.typeErrorPrototype");
+    public static final Symbol RANGE_ERR_PROTO = Symbol.get("Environment.rangeErrorPrototype");
+
+    private HashMap<Symbol, Object> data = new HashMap<>();
+
+    public GlobalScope global;
+    public WrapperProvider wrappers;
+
+    @Override public <T> void add(Symbol key, T obj) {
+        data.put(key, obj);
+    }
+    @Override public <T> T get(Symbol key) {
+        return (T)data.get(key);
+    }
+    @Override public boolean remove(Symbol key) {
+        if (data.containsKey(key)) {
+            data.remove(key);
+            return true;
+        }
+        return false;
+    }
+    @Override public boolean has(Symbol key) {
+        return data.containsKey(key);
+    }
+    @Override public Iterable<Symbol> keys() {
+        return data.keySet();
+    }
+
+    public static FunctionValue compileFunc(Extensions ext) {
+        return ext.init(COMPILE_FUNC, new NativeFunction("compile", args -> {
+            var source = args.getString(0);
+            var filename = args.getString(1);
+            var env = Values.wrapper(Values.getMember(args.ctx, args.get(2), Symbol.get("env")), Environment.class);
+            var isDebug = DebugContext.enabled(args.ctx);
+            var res = new ObjectValue();
+
+            var target = Parsing.compile(env, Filename.parse(filename), source);
+            Engine.functions.putAll(target.functions);
+            Engine.functions.remove(0l);
+
+            res.defineProperty(args.ctx, "function", target.func(env));
+            res.defineProperty(args.ctx, "mapChain", new ArrayValue());
+
+            if (isDebug) res.defineProperty(
+                args.ctx, "breakpoints",
+                ArrayValue.of(args.ctx, target.breakpoints.stream().map(Location::toString).collect(Collectors.toList()))
+            );
+
+            return res;
+        }));
+    }
+    public static FunctionValue regexConstructor(Extensions ext) {
+        return ext.init(COMPILE_FUNC, new NativeFunction("RegExp", args -> {
+            throw EngineException.ofError("Regular expressions not supported.").setCtx(args.ctx.environment, args.ctx.engine);
+        }));
+    }
+
+    public Environment copy() {
+        var res = new Environment(null, global);
+
+        res.wrappers = wrappers.fork(res);
+        res.global = global;
+        res.data.putAll(data);
+
+        return res;
+    }
+    public Environment child() {
+        var res = copy();
+        res.global = res.global.globalChild();
+        return res;
+    }
+
+    public Context context(Engine engine) {
+        return new Context(engine, this);
+    }
+
+    public Environment(WrapperProvider nativeConverter, GlobalScope global) {
+        if (nativeConverter == null) nativeConverter = new NativeWrapperProvider(this);
+        if (global == null) global = new GlobalScope();
+
+        this.wrappers = nativeConverter;
+        this.global = global;
+    }
+    public Environment() {
+        this(null, null);
+    }
+}

src/me/topchetoeu/jscript/core/engine/EventLoop.java

@@ -0,0 +1,81 @@
+package me.topchetoeu.jscript.core.engine;
+
+import java.util.concurrent.PriorityBlockingQueue;
+
+import me.topchetoeu.jscript.common.ResultRunnable;
+import me.topchetoeu.jscript.common.events.Awaitable;
+import me.topchetoeu.jscript.common.events.DataNotifier;
+import me.topchetoeu.jscript.core.exceptions.InterruptException;
+
+public class EventLoop {
+    private static class Task implements Comparable<Task> {
+        public final ResultRunnable<?> runnable;
+        public final DataNotifier<Object> notifier = new DataNotifier<>();
+        public final boolean micro;
+
+        public Task(ResultRunnable<?> runnable, boolean micro) {
+            this.runnable = runnable;
+            this.micro = micro;
+        }
+
+        @Override
+        public int compareTo(Task other) {
+            return Integer.compare(this.micro ? 0 : 1, other.micro ? 0 : 1);
+        }
+    }
+
+    private PriorityBlockingQueue<Task> tasks = new PriorityBlockingQueue<>();
+    private Thread thread;
+
+    @SuppressWarnings("unchecked")
+    public <T> Awaitable<T> pushMsg(ResultRunnable<T> runnable, boolean micro) {
+        var msg = new Task(runnable, micro);
+        tasks.add(msg);
+        return (Awaitable<T>)msg.notifier;
+    }
+    public Awaitable<Object> pushMsg(Runnable runnable, boolean micro) {
+        return pushMsg(() -> { runnable.run(); return null; }, micro);
+    }
+
+    public void run(boolean untilEmpty) {
+        while (!untilEmpty || !tasks.isEmpty()) {
+            try {
+                var task = tasks.take();
+
+                try {
+                    task.notifier.next(task.runnable.run());
+                }
+                catch (RuntimeException e) {
+                    if (e instanceof InterruptException) throw e;
+                    task.notifier.error(e);
+                }
+            }
+            catch (InterruptedException | InterruptException e) {
+                for (var msg : tasks) msg.notifier.error(new InterruptException(e));
+                break;
+            }
+        }
+    }
+
+    public Thread thread() {
+        return thread;
+    }
+    public Thread start() {
+        if (thread == null) {
+            thread = new Thread(() -> run(false), "Event loop #" + hashCode());
+            thread.start();
+        }
+        return thread;
+    }
+    public void stop() {
+        if (thread != null) thread.interrupt();
+        thread = null;
+    }
+
+    public boolean inLoopThread() {
+        return Thread.currentThread() == thread;
+    }
+    public boolean isRunning() {
+        return this.thread != null;
+    }
+}

src/me/topchetoeu/jscript/core/engine/Extensions.java

@@ -0,0 +1,34 @@
+package me.topchetoeu.jscript.core.engine;
+
+import me.topchetoeu.jscript.core.engine.values.Symbol;
+
+public interface Extensions {
+    <T> T get(Symbol key);
+    <T> void add(Symbol key, T obj);
+    Iterable<Symbol> keys();
+
+    boolean has(Symbol key);
+    boolean remove(Symbol key);
+
+    default boolean hasNotNull(Symbol key) {
+        return has(key) && get(key) != null;
+    }
+
+    default <T> T get(Symbol key, T defaultVal) {
+        if (has(key)) return get(key);
+        else return defaultVal;
+    }
+
+    default <T> T init(Symbol key, T val) {
+        if (has(key)) return get(key);
+        else {
+            add(key, val);
+            return val;
+        }
+    }
+    default void addAll(Extensions source) {
+        for (var key : source.keys()) {
+            add(key, source.get(key));
+        }
+    }
+}