refactor: remove old useless exceptions

Major codebase cleanup

.gitattributes

@@ -1,9 +1 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# Linux start script should use lf
-/gradlew        text eol=lf
-
-# These are Windows script files and should use crlf
-*.bat           text eol=crlf
-
+* -text

.github/workflows/tagged-release.yml

@@ -11,20 +11,20 @@ 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:
+          branch: 'master' # fuck this political bullshitshit, took me an hour to fix this
           owner: 'TopchetoEU'
           repository: 'java-jscript'
       - name: "Build"
         run: |
-          cd java-jscript;
-          ls;
-          mkdir -p dst/classes;
-          rsync -av --exclude='*.java' src/ dst/classes;
-          tsc --outDir dst/classes/me/topchetoeu/jscript/js --declarationDir dst/classes/me/topchetoeu/jscript/dts;
-          find src -name "*.java" | xargs javac -d dst/classes;
-          jar -c -f dst/jscript.jar -e me.topchetoeu.jscript.Main -C dst/classes .
+          cd java-jscript; node ./build.js release ${{ github.ref }}
 
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:

.gitignore

@@ -1,8 +1,18 @@
-.vscode
-.gradle
-.ignore
-out
-build
-bin
-dst
-/*.js
+*
+
+!/src
+!/src/**/*
+
+/src/assets/js/ts.js
+
+!/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

@@ -0,0 +1,173 @@
+const { spawn } = require('child_process');
+const fs = require('fs/promises');
+const pt = require('path');
+const { argv, exit } = require('process');
+const { Readable } = require('stream');
+
+
+async function* find(src, dst, wildcard) {
+    const stat = await fs.stat(src);
+
+    if (stat.isDirectory()) {
+        for (const el of await fs.readdir(src)) {
+            for await (const res of find(pt.join(src, el), dst ? pt.join(dst, el) : undefined, wildcard)) yield res;
+        }
+    }
+    else if (stat.isFile() && wildcard(src)) yield dst ? { src, dst } : src;
+}
+async function copy(src, dst, wildcard) {
+    const promises = [];
+
+    for await (const el of find(src, dst, wildcard)) {
+        promises.push((async () => {
+            await fs.mkdir(pt.dirname(el.dst), { recursive: true });
+            await fs.copyFile(el.src, el.dst);
+        })());
+    }
+
+    await Promise.all(promises);
+}
+
+function run(suppressOutput, cmd, ...args) {
+    return new Promise((res, rej) => {
+        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}.`));
+        });
+    })
+}
+
+async function downloadTypescript(outFile) {
+    try {
+        // 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/Metadata.java')).toString()
+            .replace('${VERSION}', conf.version)
+            .replace('${NAME}', conf.name)
+            .replace('${AUTHOR}', conf.author)
+        );
+        const args = ['--release', '11', ];
+        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(false, conf.javahome + 'javac', ...args);
+        console.log('Compiled java project!');
+    }
+    finally {
+        await fs.rm('Metadata.java');
+    }
+}
+
+(async () => {
+    try {
+        if (argv[2] === 'init-ts') {
+            await downloadTypescript('src/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([
+                downloadTypescript('dst/classes/assets/js/ts.js'),
+                copy('src', 'dst/classes', v => !v.endsWith('.java')),
+                compileJava(conf),
+            ]);
+
+            await run(true, 'jar', '-c', '-f', 'dst/jscript.jar', '-e', 'me.topchetoeu.jscript.Main', '-C', 'dst/classes', '.');
+            console.log('Done!');
+        }
+    }
+    catch (e) {
+        if (argv[2] === 'debug') throw e;
+        console.log(e.toString());
+        exit(-1);
+    }
+})();

lib/core.ts

@@ -1,191 +0,0 @@
-type PropertyDescriptor<T, ThisT> = {
-    value: any;
-    writable?: boolean;
-    enumerable?: boolean;
-    configurable?: boolean;
-} | {
-    get?(this: ThisT): T;
-    set(this: ThisT, val: T): void;
-    enumerable?: boolean;
-    configurable?: boolean;
-} | {
-    get(this: ThisT): T;
-    set?(this: ThisT, val: T): void;
-    enumerable?: boolean;
-    configurable?: boolean;
-};
-type Exclude<T, U> = T extends U ? never : T;
-type Extract<T, U> = T extends U ? T : never;
-type Record<KeyT extends string | number | symbol, ValT> = { [x in KeyT]: ValT }
-
-interface IArguments {
-    [i: number]: any;
-    length: number;
-}
-
-interface MathObject {
-    readonly E: number;
-    readonly PI: number;
-    readonly SQRT2: number;
-    readonly SQRT1_2: number;
-    readonly LN2: number;
-    readonly LN10: number;
-    readonly LOG2E: number;
-    readonly LOG10E: number;
-
-    asin(x: number): number;
-    acos(x: number): number;
-    atan(x: number): number;
-    atan2(y: number, x: number): number;
-    asinh(x: number): number;
-    acosh(x: number): number;
-    atanh(x: number): number;
-    sin(x: number): number;
-    cos(x: number): number;
-    tan(x: number): number;
-    sinh(x: number): number;
-    cosh(x: number): number;
-    tanh(x: number): number;
-    sqrt(x: number): number;
-    cbrt(x: number): number;
-    hypot(...vals: number[]): number;
-    imul(a: number, b: number): number;
-    exp(x: number): number;
-    expm1(x: number): number;
-    pow(x: number, y: number): number;
-    log(x: number): number;
-    log10(x: number): number;
-    log1p(x: number): number;
-    log2(x: number): number;
-    ceil(x: number): number;
-    floor(x: number): number;
-    round(x: number): number;
-    fround(x: number): number;
-    trunc(x: number): number;
-    abs(x: number): number;
-    max(...vals: number[]): number;
-    min(...vals: number[]): number;
-    sign(x: number): number;
-    random(): number;
-    clz32(x: number): number;
-}
-
-
-//@ts-ignore
-declare const arguments: IArguments;
-declare const Math: MathObject;
-
-declare var setTimeout: <T extends any[]>(handle: (...args: [ ...T, ...any[] ]) => void, delay?: number, ...args: T) => number;
-declare var setInterval: <T extends any[]>(handle: (...args: [ ...T, ...any[] ]) => void, delay?: number, ...args: T) => number;
-
-declare var clearTimeout: (id: number) => void;
-declare var clearInterval: (id: number) => void;
-
-/** @internal */
-declare var internals: any;
-/** @internal */
-declare function run(file: string, pollute?: boolean): void;
-
-/** @internal */
-type ReplaceThis<T, ThisT> = T extends ((...args: infer ArgsT) => infer RetT) ?
-    ((this: ThisT, ...args: ArgsT) => RetT) :
-    T;
-
-/** @internal */
-declare var setProps: <
-    TargetT extends object,
-    DescT extends { [x in Exclude<keyof TargetT, 'constructor'> ]?: ReplaceThis<TargetT[x], TargetT> }
->(target: TargetT, desc: DescT) => void;
-/** @internal */
-declare var setConstr: <ConstrT, T extends { constructor: ConstrT }>(target: T, constr: ConstrT) => void;
-
-declare function log(...vals: any[]): void;
-/** @internal */
-declare var lgt: typeof globalThis, gt: typeof globalThis;
-
-declare function assert(condition: () => unknown, message?: string): boolean;
-
-gt.assert = (cond, msg) => {
-    try {
-        if (!cond()) throw 'condition not satisfied';
-        log('Passed ' + msg);
-        return true;
-    }
-    catch (e) {
-        log('Failed ' + msg + ' because of: ' + e);
-        return false;
-    }
-}
-
-try {
-    lgt.setProps = (target, desc) => {
-        var props = internals.keys(desc, false);
-        for (var i = 0; i < props.length; i++) {
-            var key = props[i];
-            internals.defineField(
-                target, key, (desc as any)[key],
-                true, // writable
-                false, // enumerable
-                true // configurable
-            );
-        }
-    }
-    lgt.setConstr = (target, constr) => {
-        internals.defineField(
-            target, 'constructor', constr,
-            true, // writable
-            false, // enumerable
-            true // configurable
-        );
-    }
-    
-    run('values/object.js');
-    run('values/symbol.js');
-    run('values/function.js');
-    run('values/errors.js');
-    run('values/string.js');
-    run('values/number.js');
-    run('values/boolean.js');
-    run('values/array.js');
-    
-    internals.special(Object, Function, Error, Array);
-    
-    gt.setTimeout = (func, delay, ...args) => {
-        if (typeof func !== 'function') throw new TypeError("func must be a function.");
-        delay = (delay ?? 0) - 0;
-        return internals.setTimeout(() => func(...args), delay)
-    };
-    gt.setInterval = (func, delay, ...args) => {
-        if (typeof func !== 'function') throw new TypeError("func must be a function.");
-        delay = (delay ?? 0) - 0;
-        return internals.setInterval(() => func(...args), delay)
-    };
-    
-    gt.clearTimeout = (id) => {
-        id = id | 0;
-        internals.clearTimeout(id);
-    };
-    gt.clearInterval = (id) => {
-        id = id | 0;
-        internals.clearInterval(id);
-    };
-    
-    
-    run('iterators.js');
-    run('promise.js');
-    run('map.js', true);
-    run('set.js', true);
-    run('regex.js');
-    run('require.js');
-    
-    log('Loaded polyfills!');
-}
-catch (e: any) {
-    var err = 'Uncaught error while loading polyfills: ';
-    if (typeof Error !== 'undefined' && e instanceof Error && e.toString !== {}.toString) err += e;
-    else if ('message' in e) {
-        if ('name' in e) err += e.name + ": " + e.message;
-        else err += 'Error: ' + e.message;
-    }
-    else err += e;
-}

lib/iterators.ts

@@ -1,216 +0,0 @@
-interface SymbolConstructor {
-    readonly iterator: unique symbol;
-    readonly asyncIterator: unique symbol;
-}
-
-type IteratorYieldResult<TReturn> =
-    { done?: false; } &
-    (TReturn extends undefined ? { value?: undefined; } : { value: TReturn; });
-
-type IteratorReturnResult<TReturn> =
-    { done: true } &
-    (TReturn extends undefined ? { value?: undefined; } : { value: TReturn; });
-
-type IteratorResult<T, TReturn = any> = IteratorYieldResult<T> | IteratorReturnResult<TReturn>;
-
-interface Iterator<T, TReturn = any, TNext = undefined> {
-    next(...args: [] | [TNext]): IteratorResult<T, TReturn>;
-    return?(value?: TReturn): IteratorResult<T, TReturn>;
-    throw?(e?: any): IteratorResult<T, TReturn>;
-}
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface Generator<T = unknown, TReturn = any, TNext = unknown> extends Iterator<T, TReturn, TNext> {
-    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
-    next(...args: [] | [TNext]): IteratorResult<T, TReturn>;
-    return(value: TReturn): IteratorResult<T, TReturn>;
-    throw(e: any): IteratorResult<T, TReturn>;
-    [Symbol.iterator](): Generator<T, TReturn, TNext>;
-}
-
-interface GeneratorFunction {
-    /**
-     * Creates a new Generator object.
-     * @param args A list of arguments the function accepts.
-     */
-    new (...args: any[]): Generator;
-    /**
-     * Creates a new Generator object.
-     * @param args A list of arguments the function accepts.
-     */
-    (...args: any[]): Generator;
-    /**
-     * The length of the arguments.
-     */
-    readonly length: number;
-    /**
-     * Returns the name of the function.
-     */
-    readonly name: string;
-    /**
-     * A reference to the prototype.
-     */
-    readonly prototype: Generator;
-}
-
-interface GeneratorFunctionConstructor {
-    /**
-     * Creates a new Generator function.
-     * @param args A list of arguments the function accepts.
-     */
-    new (...args: string[]): GeneratorFunction;
-    /**
-     * Creates a new Generator function.
-     * @param args A list of arguments the function accepts.
-     */
-    (...args: string[]): GeneratorFunction;
-    /**
-     * The length of the arguments.
-     */
-    readonly length: number;
-    /**
-     * Returns the name of the function.
-     */
-    readonly name: string;
-    /**
-     * A reference to the prototype.
-     */
-}
-
-interface AsyncIterator<T, TReturn = any, TNext = undefined> {
-    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
-    next(...args: [] | [TNext]): Promise<IteratorResult<T, TReturn>>;
-    return?(value?: TReturn | Thenable<TReturn>): Promise<IteratorResult<T, TReturn>>;
-    throw?(e?: any): Promise<IteratorResult<T, TReturn>>;
-}
-
-interface AsyncIterable<T> {
-    [Symbol.asyncIterator](): AsyncIterator<T>;
-}
-
-interface AsyncIterableIterator<T> extends AsyncIterator<T> {
-    [Symbol.asyncIterator](): AsyncIterableIterator<T>;
-}
-
-interface AsyncGenerator<T = unknown, TReturn = any, TNext = unknown> extends AsyncIterator<T, TReturn, TNext> {
-    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
-    next(...args: [] | [TNext]): Promise<IteratorResult<T, TReturn>>;
-    return(value: TReturn | Thenable<TReturn>): Promise<IteratorResult<T, TReturn>>;
-    throw(e: any): Promise<IteratorResult<T, TReturn>>;
-    [Symbol.asyncIterator](): AsyncGenerator<T, TReturn, TNext>;
-}
-
-interface AsyncGeneratorFunction {
-    /**
-     * Creates a new AsyncGenerator object.
-     * @param args A list of arguments the function accepts.
-     */
-    new (...args: any[]): AsyncGenerator;
-    /**
-     * Creates a new AsyncGenerator object.
-     * @param args A list of arguments the function accepts.
-     */
-    (...args: any[]): AsyncGenerator;
-    /**
-     * The length of the arguments.
-     */
-    readonly length: number;
-    /**
-     * Returns the name of the function.
-     */
-    readonly name: string;
-    /**
-     * A reference to the prototype.
-     */
-    readonly prototype: AsyncGenerator;
-}
-
-interface AsyncGeneratorFunctionConstructor {
-    /**
-     * Creates a new AsyncGenerator function.
-     * @param args A list of arguments the function accepts.
-     */
-    new (...args: string[]): AsyncGeneratorFunction;
-    /**
-     * Creates a new AsyncGenerator function.
-     * @param args A list of arguments the function accepts.
-     */
-    (...args: string[]): AsyncGeneratorFunction;
-    /**
-     * The length of the arguments.
-     */
-    readonly length: number;
-    /**
-     * Returns the name of the function.
-     */
-    readonly name: string;
-    /**
-     * A reference to the prototype.
-     */
-    readonly prototype: AsyncGeneratorFunction;
-}
-
-
-interface Array<T> extends IterableIterator<T> {
-    entries(): IterableIterator<[number, T]>;
-    values(): IterableIterator<T>;
-    keys(): IterableIterator<number>;
-}
-
-setProps(Symbol, {
-    iterator: Symbol("Symbol.iterator") as any,
-    asyncIterator: Symbol("Symbol.asyncIterator") as any,
-});
-
-setProps(Array.prototype, {
-    [Symbol.iterator]: function() {
-        return this.values();
-    },
-
-    values() {
-        var i = 0;
-
-        return {
-            next: () => {
-                while (i < this.length) {
-                    if (i++ in this) return { done: false, value: this[i - 1] };
-                }
-                return { done: true, value: undefined };
-            },
-            [Symbol.iterator]() { return this; }
-        };
-    },
-    keys() {
-        var i = 0;
-
-        return {
-            next: () => {
-                while (i < this.length) {
-                    if (i++ in this) return { done: false, value: i - 1 };
-                }
-                return { done: true, value: undefined };
-            },
-            [Symbol.iterator]() { return this; }
-        };
-    },
-    entries() {
-        var i = 0;
-
-        return {
-            next: () => {
-                while (i < this.length) {
-                    if (i++ in this) return { done: false, value: [i - 1, this[i - 1]] };
-                }
-                return { done: true, value: undefined };
-            },
-            [Symbol.iterator]() { return this; }
-        };
-    },
-});

lib/map.ts

@@ -1,44 +0,0 @@
-declare class Map<KeyT, ValueT> {
-    public [Symbol.iterator](): IterableIterator<[KeyT, ValueT]>;
-
-    public clear(): void;
-    public delete(key: KeyT): boolean;
-
-    public entries(): IterableIterator<[KeyT, ValueT]>;
-    public keys(): IterableIterator<KeyT>;
-    public values(): IterableIterator<ValueT>;
-
-    public get(key: KeyT): ValueT;
-    public set(key: KeyT, val: ValueT): this;
-    public has(key: KeyT): boolean;
-
-    public get size(): number;
-
-    public forEach(func: (key: KeyT, val: ValueT, map: Map<KeyT, ValueT>) => void, thisArg?: any): void;
-
-    public constructor();
-}
-
-Map.prototype[Symbol.iterator] = function() {
-    return this.entries();
-};
-
-var entries = Map.prototype.entries;
-var keys = Map.prototype.keys;
-var values = Map.prototype.values;
-
-Map.prototype.entries = function() {
-    var it = entries.call(this);
-    it[Symbol.iterator] = () => it;
-    return it;
-};
-Map.prototype.keys = function() {
-    var it = keys.call(this);
-    it[Symbol.iterator] = () => it;
-    return it;
-};
-Map.prototype.values = function() {
-    var it = values.call(this);
-    it[Symbol.iterator] = () => it;
-    return it;
-};

lib/promise.ts

@@ -1,43 +0,0 @@
-type PromiseFulfillFunc<T> = (val: T) => void;
-type PromiseThenFunc<T, NextT> = (val: T) => NextT;
-type PromiseRejectFunc = (err: unknown) => void;
-type PromiseFunc<T> = (resolve: PromiseFulfillFunc<T>, reject: PromiseRejectFunc) => void;
-
-type PromiseResult<T> ={ type: 'fulfilled'; value: T; } | { type: 'rejected'; reason: any; }
-
-interface Thenable<T> {
-    then<NextT>(this: Promise<T>, onFulfilled: PromiseThenFunc<T, NextT>, onRejected?: PromiseRejectFunc): Promise<Awaited<NextT>>;
-    then(this: Promise<T>, onFulfilled: undefined, onRejected?: PromiseRejectFunc): Promise<T>;
-}
-
-// wippidy-wine, this code is now mine :D
-type Awaited<T> =
-    T extends null | undefined ? T : // special case for `null | undefined` when not in `--strictNullChecks` mode
-        T extends object & { then(onfulfilled: infer F, ...args: infer _): any } ? // `await` only unwraps object types with a callable `then`. Non-object types are not unwrapped
-            F extends ((value: infer V, ...args: infer _) => any) ? // if the argument to `then` is callable, extracts the first argument
-                Awaited<V> : // recursively unwrap the value
-                never : // the argument to `then` was not callable
-        T;
-
-interface PromiseConstructor {
-    prototype: Promise<any>;
-
-    new <T>(func: PromiseFunc<T>): Promise<Awaited<T>>;
-    resolve<T>(val: T): Promise<Awaited<T>>;
-    reject(val: any): Promise<never>;
-
-    any<T>(promises: (Promise<T>|T)[]): Promise<T>;
-    race<T>(promises: (Promise<T>|T)[]): Promise<T>;
-    all<T extends any[]>(promises: T): Promise<{ [Key in keyof T]: Awaited<T[Key]> }>;
-    allSettled<T extends any[]>(...promises: T): Promise<[...{ [P in keyof T]: PromiseResult<Awaited<T[P]>>}]>;
-}
-
-interface Promise<T> extends Thenable<T> {
-    constructor: PromiseConstructor;
-    catch(func: PromiseRejectFunc): Promise<T>;
-    finally(func: () => void): Promise<T>;
-}
-
-declare var Promise: PromiseConstructor;
-
-(Promise.prototype as any)[Symbol.typeName] = 'Promise';

lib/regex.ts

@@ -1,211 +0,0 @@
-interface RegExpResultIndices extends Array<[number, number]> {
-    groups?: { [name: string]: [number, number]; };
-}
-interface RegExpResult extends Array<string> {
-    groups?: { [name: string]: string; };
-    index: number;
-    input: string;
-    indices?: RegExpResultIndices;
-    escape(raw: string, flags: string): RegExp;
-}
-interface SymbolConstructor {
-    readonly match: unique symbol;
-    readonly matchAll: unique symbol;
-    readonly split: unique symbol;
-    readonly replace: unique symbol;
-    readonly search: unique symbol;
-}
-
-type ReplaceFunc = (match: string, ...args: any[]) => string;
-
-interface Matcher {
-    [Symbol.match](target: string): RegExpResult | string[] | null;
-    [Symbol.matchAll](target: string): IterableIterator<RegExpResult>;
-}
-interface Splitter {
-    [Symbol.split](target: string, limit?: number, sensible?: boolean): string[];
-}
-interface Replacer {
-    [Symbol.replace](target: string, replacement: string): string;
-}
-interface Searcher {
-    [Symbol.search](target: string, reverse?: boolean, start?: number): number;
-}
-
-declare class RegExp implements Matcher, Splitter, Replacer, Searcher {
-    static escape(raw: any, flags?: string): RegExp;
-
-    prototype: RegExp;
-
-    exec(val: string): RegExpResult | null;
-    test(val: string): boolean;
-    toString(): string;
-
-    [Symbol.match](target: string): RegExpResult | string[] | null;
-    [Symbol.matchAll](target: string): IterableIterator<RegExpResult>;
-    [Symbol.split](target: string, limit?: number, sensible?: boolean): string[];
-    [Symbol.replace](target: string, replacement: string | ReplaceFunc): string;
-    [Symbol.search](target: string, reverse?: boolean, start?: number): number;
-
-    readonly dotAll: boolean;
-    readonly global: boolean;
-    readonly hasIndices: boolean;
-    readonly ignoreCase: boolean;
-    readonly multiline: boolean;
-    readonly sticky: boolean;
-    readonly unicode: boolean;
-
-    readonly source: string;
-    readonly flags: string;
-
-    lastIndex: number;
-
-    constructor(pattern?: string, flags?: string);
-    constructor(pattern?: RegExp, flags?: string);
-}
-
-(Symbol as any).replace = Symbol('Symbol.replace');
-(Symbol as any).match = Symbol('Symbol.match');
-(Symbol as any).matchAll = Symbol('Symbol.matchAll');
-(Symbol as any).split = Symbol('Symbol.split');
-(Symbol as any).search = Symbol('Symbol.search');
-
-setProps(RegExp.prototype, {
-    [Symbol.typeName]: 'RegExp',
-
-    test(val) {
-        return !!this.exec(val);
-    },
-    toString() {
-        return '/' + this.source + '/' + this.flags;
-    },
-
-    [Symbol.match](target) {
-        if (this.global) {
-            const res: string[] = [];
-            let val;
-            while (val = this.exec(target)) {
-                res.push(val[0]);
-            }
-            this.lastIndex = 0;
-            return res;
-        }
-        else {
-            const res = this.exec(target);
-            if (!this.sticky) this.lastIndex = 0;
-            return res;
-        }
-    },
-    [Symbol.matchAll](target) {
-        let pattern: RegExp | undefined = new this.constructor(this, this.flags + "g") as RegExp;
-
-        return {
-            next: (): IteratorResult<RegExpResult, undefined> => {
-                const val = pattern?.exec(target);
-
-                if (val === null || val === undefined) {
-                    pattern = undefined;
-                    return { done: true };
-                }
-                else return { value: val };
-            },
-            [Symbol.iterator]() { return this; }
-        }
-    },
-    [Symbol.split](target, limit, sensible) {
-        const pattern = new this.constructor(this, this.flags + "g") as RegExp;
-        let match: RegExpResult | null;
-        let lastEnd = 0;
-        const res: string[] = [];
-
-        while ((match = pattern.exec(target)) !== null) {
-            let added: string[] = [];
-
-            if (match.index >= target.length) break;
-
-            if (match[0].length === 0) {
-                added = [ target.substring(lastEnd, pattern.lastIndex), ];
-                if (pattern.lastIndex < target.length) added.push(...match.slice(1));
-            }
-            else if (match.index - lastEnd > 0) {
-                added = [ target.substring(lastEnd, match.index), ...match.slice(1) ];
-            }
-            else {
-                for (let i = 1; i < match.length; i++) {
-                    res[res.length - match.length + i] = match[i];
-                }
-            }
-
-            if (sensible) {
-                if (limit !== undefined && res.length + added.length >= limit) break;
-                else res.push(...added);
-            }
-            else {
-                for (let i = 0; i < added.length; i++) {
-                    if (limit !== undefined && res.length >= limit) return res;
-                    else res.push(added[i]);
-                }
-            }
-
-            lastEnd = pattern.lastIndex;
-        }
-
-        if (lastEnd < target.length) {
-            res.push(target.substring(lastEnd));
-        }
-
-        return res;
-    },
-    [Symbol.replace](target, replacement) {
-        const pattern = new this.constructor(this, this.flags + "d") as RegExp;
-        let match: RegExpResult | null;
-        let lastEnd = 0;
-        const res: string[] = [];
-
-        // log(pattern.toString());
-
-        while ((match = pattern.exec(target)) !== null) {
-            const indices = match.indices![0];
-            res.push(target.substring(lastEnd, indices[0]));
-            if (replacement instanceof Function) {
-                res.push(replacement(target.substring(indices[0], indices[1]), ...match.slice(1), indices[0], target));
-            }
-            else {
-                res.push(replacement);
-            }
-            lastEnd = indices[1];
-            if (!pattern.global) break;
-        }
-
-        if (lastEnd < target.length) {
-            res.push(target.substring(lastEnd));
-        }
-
-        return res.join('');
-    },
-    [Symbol.search](target, reverse, start) {
-        const pattern: RegExp | undefined = new this.constructor(this, this.flags + "g") as RegExp;
-
-        
-        if (!reverse) {
-            pattern.lastIndex = (start as any) | 0;
-            const res = pattern.exec(target);
-            if (res) return res.index;
-            else return -1;
-        }
-        else {
-            start ??= target.length;
-            start |= 0;
-            let res: RegExpResult | null = null;
-
-            while (true) {
-                const tmp = pattern.exec(target);
-                if (tmp === null || tmp.index > start) break;
-                res = tmp;
-            }
-
-            if (res && res.index <= start) return res.index;
-            else return -1;
-        }
-    },
-});

lib/require.ts

@@ -1,15 +0,0 @@
-type RequireFunc = (path: string) => any;
-
-interface Module {
-    exports: any;
-    name: string;
-}
-
-declare var require: RequireFunc;
-declare var exports: any;
-declare var module: Module;
-
-gt.require = function(path: string) {
-    if (typeof path !== 'string') path = path + '';
-    return internals.require(path);
-};

lib/set.ts

@@ -1,45 +0,0 @@
-declare class Set<T> {
-    public [Symbol.iterator](): IterableIterator<T>;
-
-    public entries(): IterableIterator<[T, T]>;
-    public keys(): IterableIterator<T>;
-    public values(): IterableIterator<T>;
-
-    public clear(): void;
-
-    public add(val: T): this;
-    public delete(val: T): boolean;
-    public has(key: T): boolean;
-
-    public get size(): number;
-
-    public forEach(func: (key: T, set: Set<T>) => void, thisArg?: any): void;
-
-    public constructor();
-}
-
-Set.prototype[Symbol.iterator] = function() {
-    return this.values();
-};
-
-(() => {
-    var entries = Set.prototype.entries;
-    var keys = Set.prototype.keys;
-    var values = Set.prototype.values;
-
-    Set.prototype.entries = function() {
-        var it = entries.call(this);
-        it[Symbol.iterator] = () => it;
-        return it;
-    };
-    Set.prototype.keys = function() {
-        var it = keys.call(this);
-        it[Symbol.iterator] = () => it;
-        return it;
-    };
-    Set.prototype.values = function() {
-        var it = values.call(this);
-        it[Symbol.iterator] = () => it;
-        return it;
-    };
-})();

lib/values/array.ts

@@ -1,369 +0,0 @@
-// god this is awful
-type FlatArray<Arr, Depth extends number> = {
-    "done": Arr,
-    "recur": Arr extends Array<infer InnerArr>
-        ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][Depth]>
-        : Arr
-}[Depth extends -1 ? "done" : "recur"];
-
-interface Array<T> {
-    [i: number]: T;
-
-    constructor: ArrayConstructor;
-    length: number;
-
-    toString(): string;
-    // toLocaleString(): string;
-    join(separator?: string): string;
-    fill(val: T, start?: number, end?: number): T[];
-    pop(): T | undefined;
-    push(...items: T[]): number;
-    concat(...items: (T | T[])[]): T[];
-    concat(...items: (T | T[])[]): T[];
-    join(separator?: string): string;
-    reverse(): T[];
-    shift(): T | undefined;
-    slice(start?: number, end?: number): T[];
-    sort(compareFn?: (a: T, b: T) => number): this;
-    splice(start: number, deleteCount?: number | undefined, ...items: T[]): T[];
-    unshift(...items: T[]): number;
-    indexOf(searchElement: T, fromIndex?: number): number;
-    lastIndexOf(searchElement: T, fromIndex?: number): number;
-    every(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
-    some(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
-    forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-    includes(el: any, start?: number): boolean;
-
-    map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
-    filter(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): T[];
-    find(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-    findIndex(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): number;
-    findLast(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-    findLastIndex(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): number;
-
-    flat<D extends number = 1>(depth?: D): FlatArray<T, D>;
-    flatMap(func: (val: T, i: number, arr: T[]) => T | T[], thisAarg?: any): FlatArray<T[], 1>;
-    sort(func?: (a: T, b: T) => number): this;
-
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
-    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-}
-interface ArrayConstructor {
-    new <T>(arrayLength?: number): T[];
-    new <T>(...items: T[]): T[];
-    <T>(arrayLength?: number): T[];
-    <T>(...items: T[]): T[];
-    isArray(arg: any): arg is any[];
-    prototype: Array<any>;
-}
-
-declare var Array: ArrayConstructor;
-
-gt.Array = function(len?: number) {
-    var res = [];
-
-    if (typeof len === 'number' && arguments.length === 1) {
-        if (len < 0) throw 'Invalid array length.';
-        res.length = len;
-    }
-    else {
-        for (var i = 0; i < arguments.length; i++) {
-            res[i] = arguments[i];
-        }
-    }
-
-    return res;
-} as ArrayConstructor;
-
-Array.prototype = ([] as any).__proto__ as Array<any>;
-setConstr(Array.prototype, Array);
-
-function wrapI(max: number, i: number) {
-    i |= 0;
-    if (i < 0) i = max + i;
-    return i;
-}
-function clampI(max: number, i: number) {
-    if (i < 0) i = 0;
-    if (i > max) i = max;
-    return i;
-}
-
-lgt.wrapI = wrapI;
-lgt.clampI = clampI;
-
-(Array.prototype as any)[Symbol.typeName] = "Array";
-
-setProps(Array.prototype, {
-    concat() {
-        var res = [] as any[];
-        res.push.apply(res, this);
-
-        for (var i = 0; i < arguments.length; i++) {
-            var arg = arguments[i];
-            if (arg instanceof Array) {
-                res.push.apply(res, arg);
-            }
-            else {
-                res.push(arg);
-            }
-        }
-
-        return res;
-    },
-    every(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument not a function.");
-        func = func.bind(thisArg);
-
-        for (var i = 0; i < this.length; i++) {
-            if (!func(this[i], i, this)) return false;
-        }
-
-        return true;
-    },
-    some(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument not a function.");
-        func = func.bind(thisArg);
-
-        for (var i = 0; i < this.length; i++) {
-            if (func(this[i], i, this)) return true;
-        }
-
-        return false;
-    },
-    fill(val, start, end) {
-        if (arguments.length < 3) end = this.length;
-        if (arguments.length < 2) start = 0;
-
-        start = clampI(this.length, wrapI(this.length + 1, start ?? 0));
-        end = clampI(this.length, wrapI(this.length + 1, end ?? this.length));
-
-        for (; start < end; start++) {
-            this[start] = val;
-        }
-
-        return this;
-    },
-    filter(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument is not a function.");
-
-        var res = [];
-        for (var i = 0; i < this.length; i++) {
-            if (i in this && func.call(thisArg, this[i], i, this)) res.push(this[i]);
-        }
-        return res;
-    },
-    find(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument is not a function.");
-
-        for (var i = 0; i < this.length; i++) {
-            if (i in this && func.call(thisArg, this[i], i, this)) return this[i];
-        }
-
-        return undefined;
-    },
-    findIndex(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument is not a function.");
-
-        for (var i = 0; i < this.length; i++) {
-            if (i in this && func.call(thisArg, this[i], i, this)) return i;
-        }
-
-        return -1;
-    },
-    findLast(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument is not a function.");
-    
-        for (var i = this.length - 1; i >= 0; i--) {
-            if (i in this && func.call(thisArg, this[i], i, this)) return this[i];
-        }
-    
-        return undefined;
-    },
-    findLastIndex(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument is not a function.");
-    
-        for (var i = this.length - 1; i >= 0; i--) {
-            if (i in this && func.call(thisArg, this[i], i, this)) return i;
-        }
-    
-        return -1;
-    },
-    flat(depth) {
-        var res = [] as any[];
-        var buff = [];
-        res.push(...this);
-    
-        for (var i = 0; i < (depth ?? 1); i++) {
-            var anyArrays = false;
-            for (var el of res) {
-                if (el instanceof Array) {
-                    buff.push(...el);
-                    anyArrays = true;
-                }
-                else buff.push(el);
-            }
-    
-            res = buff;
-            buff = [];
-            if (!anyArrays) break;
-        }
-    
-        return res;
-    },
-    flatMap(func, th) {
-        return this.map(func, th).flat();
-    },
-    forEach(func, thisArg) {
-        for (var i = 0; i < this.length; i++) {
-            if (i in this) func.call(thisArg, this[i], i, this);
-        }
-    },
-    map(func, thisArg) {
-        if (typeof func !== 'function') throw new TypeError("Given argument is not a function.");
-    
-        var res = [];
-        for (var i = 0; i < this.length; i++) {
-            if (i in this) res[i] = func.call(thisArg, this[i], i, this);
-        }
-        return res;
-    },
-    pop() {
-        if (this.length === 0) return undefined;
-        var val = this[this.length - 1];
-        this.length--;
-        return val;
-    },
-    push() {
-        for (var i = 0; i < arguments.length; i++) {
-            this[this.length] = arguments[i];
-        }
-        return arguments.length;
-    },
-    shift() {
-        if (this.length === 0) return undefined;
-        var res = this[0];
-
-        for (var i = 0; i < this.length - 1; i++) {
-            this[i] = this[i + 1];
-        }
-
-        this.length--;
-
-        return res;
-    },
-    unshift() {
-        for (var i = this.length - 1; i >= 0; i--) {
-            this[i + arguments.length] = this[i];
-        }
-        for (var i = 0; i < arguments.length; i++) {
-            this[i] = arguments[i];
-        }
-
-        return arguments.length;
-    },
-    slice(start, end) {
-        start = clampI(this.length, wrapI(this.length + 1, start ?? 0));
-        end = clampI(this.length, wrapI(this.length + 1, end ?? this.length));
-
-        var res: any[] = [];
-        var n = end - start;
-        if (n <= 0) return res;
-    
-        for (var i = 0; i < n; i++) {
-            res[i] = this[start + i];
-        }
-    
-        return res;
-    },
-    toString() {
-        let res = '';
-        for (let i = 0; i < this.length; i++) {
-            if (i > 0) res += ',';
-            if (i in this && this[i] !== undefined && this[i] !== null) res += this[i];
-        }
-    
-        return res;
-    },
-    indexOf(el, start) {
-        start = start! | 0;
-        for (var i = Math.max(0, start); i < this.length; i++) {
-            if (i in this && this[i] == el) return i;
-        }
-    
-        return -1;
-    },
-    lastIndexOf(el, start) {
-        start = start! | 0;
-        for (var i = this.length; i >= start; i--) {
-            if (i in this && this[i] == el) return i;
-        }
-
-        return -1;
-    },
-    includes(el, start) {
-        return this.indexOf(el, start) >= 0;
-    },
-    join(val = ',') {
-        let res = '', first = true;
-
-        for (let i = 0; i < this.length; i++) {
-            if (!(i in this)) continue;
-            if (!first) res += val;
-            first = false;
-            res += this[i];
-        }
-        return res;
-    },
-    sort(func) {
-        func ??= (a, b) => {
-            const _a = a + '';
-            const _b = b + '';
-
-            if (_a > _b) return 1;
-            if (_a < _b) return -1;
-            return 0;
-        };
-
-        if (typeof func !== 'function') throw new TypeError('Expected func to be undefined or a function.');
-
-        internals.sort(this, func);
-        return this;
-    },
-    splice(start, deleteCount, ...items) {
-        start = clampI(this.length, wrapI(this.length, start ?? 0));
-        deleteCount = (deleteCount ?? Infinity | 0);
-        if (start + deleteCount >= this.length) deleteCount = this.length - start;
-
-        const res = this.slice(start, start + deleteCount);
-        const moveN = items.length - deleteCount;
-        const len = this.length;
-
-        if (moveN < 0) {
-            for (let i = start - moveN; i < len; i++) {
-                this[i + moveN] = this[i];
-            }
-        }
-        else if (moveN > 0) {
-            for (let i = len - 1; i >= start; i--) {
-                this[i + moveN] = this[i];
-            }
-        }
-
-        for (let i = 0; i < items.length; i++) {
-            this[i + start] = items[i];
-        }
-
-        this.length = len + moveN;
-
-        return res;
-    }
-});
-
-setProps(Array, {
-    isArray(val: any) { return internals.isArr(val); }
-});

lib/values/boolean.ts

@@ -1,22 +0,0 @@
-interface Boolean {
-    valueOf(): boolean;
-    constructor: BooleanConstructor;
-}
-interface BooleanConstructor {
-    (val: any): boolean;
-    new (val: any): Boolean;
-    prototype: Boolean;
-}
-
-declare var Boolean: BooleanConstructor;
-
-gt.Boolean = function (this: Boolean | undefined, arg) {
-    var val;
-    if (arguments.length === 0) val = false;
-    else val = !!arg;
-    if (this === undefined || this === null) return val;
-    else (this as any).value = val;
-} as BooleanConstructor;
-
-Boolean.prototype = (false as any).__proto__ as Boolean;
-setConstr(Boolean.prototype, Boolean);

lib/values/errors.ts

@@ -1,89 +0,0 @@
-interface Error {
-    constructor: ErrorConstructor;
-    name: string;
-    message: string;
-    stack: string[];
-}
-interface ErrorConstructor {
-    (msg?: any): Error;
-    new (msg?: any): Error;
-    prototype: Error;
-}
-
-interface TypeErrorConstructor extends ErrorConstructor {
-    (msg?: any): TypeError;
-    new (msg?: any): TypeError;
-    prototype: Error;
-}
-interface TypeError extends Error {
-    constructor: TypeErrorConstructor;
-    name: 'TypeError';
-}
-
-interface RangeErrorConstructor extends ErrorConstructor {
-    (msg?: any): RangeError;
-    new (msg?: any): RangeError;
-    prototype: Error;
-}
-interface RangeError extends Error {
-    constructor: RangeErrorConstructor;
-    name: 'RangeError';
-}
-
-interface SyntaxErrorConstructor extends ErrorConstructor {
-    (msg?: any): RangeError;
-    new (msg?: any): RangeError;
-    prototype: Error;
-}
-interface SyntaxError extends Error {
-    constructor: SyntaxErrorConstructor;
-    name: 'SyntaxError';
-}
-
-
-declare var Error: ErrorConstructor;
-declare var RangeError: RangeErrorConstructor;
-declare var TypeError: TypeErrorConstructor;
-declare var SyntaxError: SyntaxErrorConstructor;
-
-gt.Error = function Error(msg: string) {
-    if (msg === undefined) msg = '';
-    else msg += '';
-
-    return Object.setPrototypeOf({
-        message: msg,
-        stack: [] as string[],
-    }, Error.prototype);
-} as ErrorConstructor;
-
-Error.prototype = internals.err ?? {};
-Error.prototype.name = 'Error';
-setConstr(Error.prototype, Error);
-
-Error.prototype.toString = function() {
-    if (!(this instanceof Error)) return '';
-
-    if (this.message === '') return this.name;
-    else return this.name + ': ' + this.message;
-};
-
-function makeError<T extends ErrorConstructor>(name: string, proto: any): T {
-    var err = function (msg: string) {
-        var res = new Error(msg);
-        (res as any).__proto__ = err.prototype;
-        return res;
-    } as T;
-
-    err.prototype = proto;
-    err.prototype.name = name;
-    setConstr(err.prototype, err as ErrorConstructor);
-    (err.prototype as any).__proto__ = Error.prototype;
-    (err as any).__proto__ = Error;
-    internals.special(err);
-
-    return err;
-}
-
-gt.RangeError = makeError('RangeError', internals.range ?? {});
-gt.TypeError = makeError('TypeError', internals.type ?? {});
-gt.SyntaxError = makeError('SyntaxError', internals.syntax ?? {});

lib/values/function.ts

@@ -1,181 +0,0 @@
-interface Function {
-    apply(this: Function, thisArg: any, argArray?: any): any;
-    call(this: Function, thisArg: any, ...argArray: any[]): any;
-    bind(this: Function, thisArg: any, ...argArray: any[]): Function;
-
-    toString(): string;
-
-    prototype: any;
-    constructor: FunctionConstructor;
-    readonly length: number;
-    name: string;
-}
-interface FunctionConstructor extends Function {
-    (...args: string[]): (...args: any[]) => any;
-    new (...args: string[]): (...args: any[]) => any;
-    prototype: Function;
-    async<ArgsT extends any[], RetT>(
-        func: (await: <T>(val: T) => Awaited<T>) => (...args: ArgsT) => RetT
-    ): (...args: ArgsT) => Promise<RetT>;
-    asyncGenerator<ArgsT extends any[], RetT>(
-        func: (await: <T>(val: T) => Awaited<T>, _yield: <T>(val: T) => void) => (...args: ArgsT) => RetT
-    ): (...args: ArgsT) => AsyncGenerator<RetT>;
-    generator<ArgsT extends any[], T = unknown, RetT = unknown, TNext = unknown>(
-        func: (_yield: <T>(val: T) => TNext) => (...args: ArgsT) => RetT
-    ): (...args: ArgsT) => Generator<T, RetT, TNext>;
-}
-
-interface CallableFunction extends Function {
-    (...args: any[]): any;
-    apply<ThisArg, Args extends any[], RetT>(this: (this: ThisArg, ...args: Args) => RetT, thisArg: ThisArg, argArray?: Args): RetT;
-    call<ThisArg, Args extends any[], RetT>(this: (this: ThisArg, ...args: Args) => RetT, thisArg: ThisArg, ...argArray: Args): RetT;
-    bind<ThisArg, Args extends any[], Rest extends any[], RetT>(this: (this: ThisArg, ...args: [ ...Args, ...Rest ]) => RetT, thisArg: ThisArg, ...argArray: Args): (this: void, ...args: Rest) => RetT;
-}
-interface NewableFunction extends Function {
-    new(...args: any[]): any;
-    apply<Args extends any[], RetT>(this: new (...args: Args) => RetT, thisArg: any, argArray?: Args): RetT;
-    call<Args extends any[], RetT>(this: new (...args: Args) => RetT, thisArg: any, ...argArray: Args): RetT;
-    bind<Args extends any[], RetT>(this: new (...args: Args) => RetT, thisArg: any, ...argArray: Args): new (...args: Args) => RetT;
-}
-
-declare var Function: FunctionConstructor;
-
-gt.Function = function() {
-    throw 'Using the constructor Function() is forbidden.';
-} as unknown as FunctionConstructor;
-
-Function.prototype = (Function as any).__proto__ as Function;
-setConstr(Function.prototype, Function);
-
-setProps(Function.prototype, {
-    apply(thisArg, args) {
-        if (typeof args !== 'object') throw 'Expected arguments to be an array-like object.';
-        var len = args.length - 0;
-        let newArgs: any[];
-        if (Array.isArray(args)) newArgs = args;
-        else {
-            newArgs = [];
-
-            while (len >= 0) {
-                len--;
-                newArgs[len] = args[len];
-            }
-        }
-
-        return internals.apply(this, thisArg, newArgs);
-    },
-    call(thisArg, ...args) {
-        return this.apply(thisArg, args);
-    },
-    bind(thisArg, ...args) {
-        var func = this;
-
-        var res = function() {
-            var resArgs = [];
-
-            for (var i = 0; i < args.length; i++) {
-                resArgs[i] = args[i];
-            }
-            for (var i = 0; i < arguments.length; i++) {
-                resArgs[i + args.length] = arguments[i];
-            }
-
-            return func.apply(thisArg, resArgs);
-        };
-        res.name = "<bound> " + func.name;
-        return res;
-    },
-    toString() {
-        return 'function (...) { ... }';
-    },
-});
-setProps(Function, {
-    async(func) {
-        if (typeof func !== 'function') throw new TypeError('Expected func to be function.');
-
-        return function (this: any) {
-            const args = arguments;
-
-            return new Promise((res, rej) => {
-                const gen = Function.generator(func as any).apply(this, args as any);
-
-                (function next(type: 'none' | 'err' | 'ret', val?: any) {
-                    try {
-                        let result;
-
-                        switch (type) {
-                            case 'err': result = gen.throw(val); break;
-                            case 'ret': result = gen.next(val); break;
-                            case 'none': result = gen.next(); break;
-                        }
-                        if (result.done) res(result.value);
-                        else Promise.resolve(result.value).then(
-                            v => next('ret', v),
-                            v => next('err', v)
-                        )
-                    }
-                    catch (e) {
-                        rej(e);
-                    }
-                })('none');
-            });
-        };
-    },
-    asyncGenerator(func) {
-        if (typeof func !== 'function') throw new TypeError('Expected func to be function.');
-
-
-        return function(this: any) {
-            const gen = Function.generator<any[], ['await' | 'yield', any]>((_yield) => func(
-                val => _yield(['await', val]) as any,
-                val => _yield(['yield', val])
-            )).apply(this, arguments as any);
-
-            const next = (resolve: Function, reject: Function, type: 'none' | 'val' | 'ret' | 'err', val?: any) => {
-                let res;
-
-                try {
-                    switch (type) {
-                        case 'val': res = gen.next(val); break;
-                        case 'ret': res = gen.return(val); break;
-                        case 'err': res = gen.throw(val); break;
-                        default: res = gen.next(); break;
-                    }
-                }
-                catch (e) { return reject(e); }
-
-                if (res.done) return { done: true, res: <any>res };
-                else if (res.value[0] === 'await') Promise.resolve(res.value[1]).then(
-                    v => next(resolve, reject, 'val', v),
-                    v => next(resolve, reject, 'err', v),
-                )
-                else resolve({ done: false, value: res.value[1] });
-            };
-
-            return {
-                next() {
-                    const args = arguments;
-                    if (arguments.length === 0) return new Promise((res, rej) => next(res, rej, 'none'));
-                    else return new Promise((res, rej) => next(res, rej, 'val', args[0]));
-                },
-                return: (value) => new Promise((res, rej) => next(res, rej, 'ret', value)),
-                throw: (value) => new Promise((res, rej) => next(res, rej, 'err', value)),
-                [Symbol.asyncIterator]() { return this; }
-            }
-        }
-    },
-    generator(func) {
-        if (typeof func !== 'function') throw new TypeError('Expected func to be function.');
-        const gen = internals.makeGenerator(func);
-        return (...args: any[]) => {
-            const it = gen(args);
-
-            return {
-                next: it.next,
-                return: it.return,
-                throw: it.throw,
-                [Symbol.iterator]() { return this; }
-            }
-        }
-    }
-})

lib/values/number.ts

@@ -1,50 +0,0 @@
-interface Number {
-    toString(): string;
-    valueOf(): number;
-    constructor: NumberConstructor;
-}
-interface NumberConstructor {
-    (val: any): number;
-    new (val: any): Number;
-    prototype: Number;
-    parseInt(val: unknown): number;
-    parseFloat(val: unknown): number;
-}
-
-declare var Number: NumberConstructor;
-declare var parseInt: typeof Number.parseInt;
-declare var parseFloat: typeof Number.parseFloat;
-declare var NaN: number;
-declare var Infinity: number;
-
-gt.Number = function(this: Number | undefined, arg: any) {
-    var val;
-    if (arguments.length === 0) val = 0;
-    else val = arg - 0;
-    if (this === undefined || this === null) return val;
-    else (this as any).value = val;
-} as NumberConstructor;
-
-Number.prototype = (0 as any).__proto__ as Number;
-setConstr(Number.prototype, Number);
-
-setProps(Number.prototype, {
-    valueOf() {
-        if (typeof this === 'number') return this;
-        else return (this as any).value;
-    },
-    toString() {
-        if (typeof this === 'number') return this + '';
-        else return (this as any).value + '';
-    }
-});
-
-setProps(Number, {
-    parseInt(val) { return Math.trunc(Number.parseFloat(val)); },
-    parseFloat(val) { return internals.parseFloat(val); },
-});
-
-Object.defineProperty(gt, 'parseInt', { value: Number.parseInt, writable: false });
-Object.defineProperty(gt, 'parseFloat', { value: Number.parseFloat, writable: false });
-Object.defineProperty(gt, 'NaN', { value: 0 / 0, writable: false });
-Object.defineProperty(gt, 'Infinity', { value: 1 / 0, writable: false });

lib/values/object.ts

@@ -1,234 +0,0 @@
-    interface Object {
-    constructor: NewableFunction;
-    [Symbol.typeName]: string;
-
-    valueOf(): this;
-    toString(): string;
-    hasOwnProperty(key: any): boolean;
-}
-interface ObjectConstructor extends Function {
-    (arg: string): String;
-    (arg: number): Number;
-    (arg: boolean): Boolean;
-    (arg?: undefined | null): {};
-    <T extends object>(arg: T): T;
-
-    new (arg: string): String;
-    new (arg: number): Number;
-    new (arg: boolean): Boolean;
-    new (arg?: undefined | null): {};
-    new <T extends object>(arg: T): T;
-
-    prototype: Object;
-
-    assign<T extends object>(target: T, ...src: object[]): T;
-    create<T extends object>(proto: T, props?: { [key: string]: PropertyDescriptor<any, T> }): T;
-
-    keys<T extends object>(obj: T, onlyString?: true): (keyof T)[];
-    keys<T extends object>(obj: T, onlyString: false): any[];
-    entries<T extends object>(obj: T, onlyString?: true): [keyof T, T[keyof T]][];
-    entries<T extends object>(obj: T, onlyString: false): [any, any][];
-    values<T extends object>(obj: T, onlyString?: true): (T[keyof T])[];
-    values<T extends object>(obj: T, onlyString: false): any[];
-
-    fromEntries(entries: Iterable<[any, any]>): object;
-
-    defineProperty<T, ThisT extends object>(obj: ThisT, key: any, desc: PropertyDescriptor<T, ThisT>): ThisT;
-    defineProperties<ThisT extends object>(obj: ThisT, desc: { [key: string]: PropertyDescriptor<any, ThisT> }): ThisT;
-
-    getOwnPropertyNames<T extends object>(obj: T): (keyof T)[];
-    getOwnPropertySymbols<T extends object>(obj: T): (keyof T)[];
-    hasOwn<T extends object, KeyT>(obj: T, key: KeyT): boolean;
-
-    getOwnPropertyDescriptor<T extends object, KeyT extends keyof T>(obj: T, key: KeyT): PropertyDescriptor<T[KeyT], T>;
-    getOwnPropertyDescriptors<T extends object>(obj: T): { [x in keyof T]: PropertyDescriptor<T[x], T> };
-
-    getPrototypeOf(obj: any): object | null;
-    setPrototypeOf<T>(obj: T, proto: object | null): T;
-
-    preventExtensions<T extends object>(obj: T): T;
-    seal<T extends object>(obj: T): T;
-    freeze<T extends object>(obj: T): T;
-
-    isExtensible(obj: object): boolean;
-    isSealed(obj: object): boolean;
-    isFrozen(obj: object): boolean;
-}
-
-declare var Object: ObjectConstructor;
-
-gt.Object = function(arg: any) {
-    if (arg === undefined || arg === null) return {};
-    else if (typeof arg === 'boolean') return new Boolean(arg);
-    else if (typeof arg === 'number') return new Number(arg);
-    else if (typeof arg === 'string') return new String(arg);
-    return arg;
-} as ObjectConstructor;
-
-Object.prototype = ({} as any).__proto__ as Object;
-setConstr(Object.prototype, Object as any);
-
-function throwNotObject(obj: any, name: string) {
-    if (obj === null || typeof obj !== 'object' && typeof obj !== 'function') {
-        throw new TypeError(`Object.${name} may only be used for objects.`);
-    }
-}
-function check(obj: any) {
-    return typeof obj === 'object' && obj !== null || typeof obj === 'function';
-}
-
-setProps(Object, {
-    assign: function(dst, ...src) {
-        throwNotObject(dst, 'assign');
-        for (let i = 0; i < src.length; i++) {
-            const obj = src[i];
-            throwNotObject(obj, 'assign');
-            for (const key of Object.keys(obj)) {
-                (dst as any)[key] = (obj as any)[key];
-            }
-        }
-        return dst;
-    },
-    create(obj, props) {
-        props ??= {};
-        return Object.defineProperties({ __proto__: obj }, props as any) as any;
-    },
-
-    defineProperty(obj, key, attrib) {
-        throwNotObject(obj, 'defineProperty');
-        if (typeof attrib !== 'object') throw new TypeError('Expected attributes to be an object.');
-    
-        if ('value' in attrib) {
-            if ('get' in attrib || 'set' in attrib) throw new TypeError('Cannot specify a value and accessors for a property.');
-            if (!internals.defineField(
-                obj, key,
-                attrib.value,
-                !!attrib.writable,
-                !!attrib.enumerable,
-                !!attrib.configurable
-            )) throw new TypeError('Can\'t define property \'' + key + '\'.');
-        }
-        else {
-            if (typeof attrib.get !== 'function' && attrib.get !== undefined) throw new TypeError('Get accessor must be a function.');
-            if (typeof attrib.set !== 'function' && attrib.set !== undefined) throw new TypeError('Set accessor must be a function.');
-    
-            if (!internals.defineProp(
-                obj, key,
-                attrib.get,
-                attrib.set,
-                !!attrib.enumerable,
-                !!attrib.configurable
-            )) throw new TypeError('Can\'t define property \'' + key + '\'.');
-        }
-    
-        return obj;
-    },
-    defineProperties(obj, attrib) {
-        throwNotObject(obj, 'defineProperties');
-        if (typeof attrib !== 'object' && typeof attrib !== 'function') throw 'Expected second argument to be an object.';
-    
-        for (var key in attrib) {
-            Object.defineProperty(obj, key, attrib[key]);
-        }
-    
-        return obj;
-    },
-
-    keys(obj, onlyString) {
-        onlyString = !!(onlyString ?? true);
-        return internals.keys(obj, onlyString);
-    },
-    entries(obj, onlyString) {
-        return Object.keys(obj, onlyString).map(v => [ v, (obj as any)[v] ]);
-    },
-    values(obj, onlyString) {
-        return Object.keys(obj, onlyString).map(v => (obj as any)[v]);
-    },
-
-    getOwnPropertyDescriptor(obj, key) {
-        return internals.ownProp(obj, key);
-    },
-    getOwnPropertyDescriptors(obj) {
-        return Object.fromEntries([
-            ...Object.getOwnPropertyNames(obj),
-            ...Object.getOwnPropertySymbols(obj)
-        ].map(v => [ v, Object.getOwnPropertyDescriptor(obj, v) ])) as any;
-    },
-
-    getOwnPropertyNames(obj) {
-        return internals.ownPropKeys(obj, false);
-    },
-    getOwnPropertySymbols(obj) {
-        return internals.ownPropKeys(obj, true);
-    },
-    hasOwn(obj, key) {
-        if (Object.getOwnPropertyNames(obj).includes(key)) return true;
-        if (Object.getOwnPropertySymbols(obj).includes(key)) return true;
-        return false;
-    },
-
-    getPrototypeOf(obj) {
-        return obj.__proto__;
-    },
-    setPrototypeOf(obj, proto) {
-        (obj as any).__proto__ = proto;
-        return obj;
-    },
-
-    fromEntries(iterable) {
-        const res = {} as any;
-
-        for (const el of iterable) {
-            res[el[0]] = el[1];
-        }
-
-        return res;
-    },
-
-    preventExtensions(obj) {
-        throwNotObject(obj, 'preventExtensions');
-        internals.preventExtensions(obj);
-        return obj;
-    },
-    seal(obj) {
-        throwNotObject(obj, 'seal');
-        internals.seal(obj);
-        return obj;
-    },
-    freeze(obj) {
-        throwNotObject(obj, 'freeze');
-        internals.freeze(obj);
-        return obj;
-    },
-
-    isExtensible(obj) {
-        if (!check(obj)) return false;
-        return internals.extensible(obj);
-    },
-    isSealed(obj) {
-        if (!check(obj)) return true;
-        if (Object.isExtensible(obj)) return false;
-        return Object.getOwnPropertyNames(obj).every(v => !Object.getOwnPropertyDescriptor(obj, v).configurable);
-    },
-    isFrozen(obj) {
-        if (!check(obj)) return true;
-        if (Object.isExtensible(obj)) return false;
-        return Object.getOwnPropertyNames(obj).every(v => {
-            var prop = Object.getOwnPropertyDescriptor(obj, v);
-            if ('writable' in prop && prop.writable) return false;
-            return !prop.configurable;
-        });
-    }
-});
-
-setProps(Object.prototype, {
-    valueOf() {
-        return this;
-    },
-    toString() {
-        return '[object ' + (this[Symbol.typeName] ?? 'Unknown') + ']';
-    },
-    hasOwnProperty(key) {
-        return Object.hasOwn(this, key);
-    },
-});

lib/values/string.ts

@@ -1,261 +0,0 @@
-interface Replacer {
-    [Symbol.replace](target: string, val: string | ((match: string, ...args: any[]) => string)): string;
-}
-
-interface String {
-    [i: number]: string;
-
-    toString(): string;
-    valueOf(): string;
-
-    charAt(pos: number): string;
-    charCodeAt(pos: number): number;
-    substring(start?: number, end?: number): string;
-    slice(start?: number, end?: number): string;
-    substr(start?: number, length?: number): string;
-
-    startsWith(str: string, pos?: number): string;
-    endsWith(str: string, pos?: number): string;
-
-    replace(pattern: string | Replacer, val: string): string;
-    replaceAll(pattern: string | Replacer, val: string): string;
-
-    match(pattern: string | Matcher): RegExpResult | string[] | null;
-    matchAll(pattern: string | Matcher): IterableIterator<RegExpResult>;
-
-    split(pattern: string | Splitter, limit?: number, sensible?: boolean): string;
-
-    concat(...others: string[]): string;
-    indexOf(term: string | Searcher, start?: number): number;
-    lastIndexOf(term: string | Searcher, start?: number): number;
-
-    toLowerCase(): string;
-    toUpperCase(): string;
-
-    trim(): string;
-
-    includes(term: string, start?: number): boolean;
-
-    length: number;
-
-    constructor: StringConstructor;
-}
-interface StringConstructor {
-    (val: any): string;
-    new (val: any): String;
-
-    fromCharCode(val: number): string;
-
-    prototype: String;
-}
-
-declare var String: StringConstructor;
-
-gt.String = function(this: String | undefined, arg: any) {
-    var val;
-    if (arguments.length === 0) val = '';
-    else val = arg + '';
-    if (this === undefined || this === null) return val;
-    else (this as any).value = val;
-} as StringConstructor;
-
-String.prototype = ('' as any).__proto__ as String;
-setConstr(String.prototype, String);
-
-setProps(String.prototype, {
-    toString() {
-        if (typeof this === 'string') return this;
-        else return (this as any).value;
-    },
-    valueOf() {
-        if (typeof this === 'string') return this;
-        else return (this as any).value;
-    },
-
-    substring(start, end) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.substring(start, end);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-        start = start ?? 0 | 0;
-        end = (end ?? this.length) | 0;
-        return internals.substring(this, start, end);
-    },
-    substr(start, length) {
-        start = start ?? 0 | 0;
-
-        if (start >= this.length) start = this.length - 1;
-        if (start < 0) start = 0;
-
-        length = (length ?? this.length - start) | 0;
-        return this.substring(start, length + start);
-    },
-
-    toLowerCase() {
-        return internals.toLower(this + '');
-    },
-    toUpperCase() {
-        return internals.toUpper(this + '');
-    },
-
-    charAt(pos) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.charAt(pos);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        pos = pos | 0;
-        if (pos < 0 || pos >= this.length) return '';
-        return this[pos];
-    },
-    charCodeAt(pos) {
-        var res = this.charAt(pos);
-        if (res === '') return NaN;
-        else return internals.toCharCode(res);
-    },
-
-    startsWith(term, pos) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.startsWith(term, pos);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-        pos = pos! | 0;
-        return internals.startsWith(this, term + '', pos);
-    },
-    endsWith(term, pos) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.endsWith(term, pos);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-        pos = (pos ?? this.length) | 0;
-        return internals.endsWith(this, term + '', pos);
-    },
-
-    indexOf(term: any, start) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.indexOf(term, start);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof term[Symbol.search] !== 'function') term = RegExp.escape(term);
-
-        return term[Symbol.search](this, false, start);
-    },
-    lastIndexOf(term: any, start) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.indexOf(term, start);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof term[Symbol.search] !== 'function') term = RegExp.escape(term);
-
-        return term[Symbol.search](this, true, start);
-    },
-    includes(term, start) {
-        return this.indexOf(term, start) >= 0;
-    },
-
-    replace(pattern: any, val) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.replace(pattern, val);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof pattern[Symbol.replace] !== 'function') pattern = RegExp.escape(pattern);
-
-        return pattern[Symbol.replace](this, val);
-    },
-    replaceAll(pattern: any, val) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.replace(pattern, val);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof pattern[Symbol.replace] !== 'function') pattern = RegExp.escape(pattern, "g");
-        if (pattern instanceof RegExp && !pattern.global) pattern = new pattern.constructor(pattern.source, pattern.flags + "g");
-
-        return pattern[Symbol.replace](this, val);
-    },
-
-    match(pattern: any) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.match(pattern);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof pattern[Symbol.match] !== 'function') pattern = RegExp.escape(pattern);
-
-        return pattern[Symbol.match](this);
-    },
-    matchAll(pattern: any) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.matchAll(pattern);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof pattern[Symbol.match] !== 'function') pattern = RegExp.escape(pattern, "g");
-        if (pattern instanceof RegExp && !pattern.global) pattern = new pattern.constructor(pattern.source, pattern.flags + "g");
-
-        return pattern[Symbol.match](this);
-    },
-
-    split(pattern: any, lim, sensible) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.split(pattern, lim, sensible);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        if (typeof pattern[Symbol.split] !== 'function') pattern = RegExp.escape(pattern, "g");
-
-        return pattern[Symbol.split](this, lim, sensible);
-    },
-    slice(start, end) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.slice(start, end);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        start = wrapI(this.length, start ?? 0 | 0);
-        end = wrapI(this.length, end ?? this.length | 0);
-
-        if (start > end) return '';
-
-        return this.substring(start, end);
-    },
-
-    concat(...args) {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.concat(...args);
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        var res = this;
-        for (var arg of args) res += arg;
-        return res;
-    },
-
-    trim() {
-        return this
-            .replace(/^\s+/g, '')
-            .replace(/\s+$/g, '');
-    }
-});
-
-setProps(String, {
-    fromCharCode(val) {
-        return internals.fromCharCode(val | 0);
-    },
-})
-
-Object.defineProperty(String.prototype, 'length', {
-    get() {
-        if (typeof this !== 'string') {
-            if (this instanceof String) return (this as any).value.length;
-            else throw new Error('This function may be used only with primitive or object strings.');
-        }
-
-        return internals.strlen(this);
-    },
-    configurable: true,
-    enumerable: false,
-});

lib/values/symbol.ts

@@ -1,38 +0,0 @@
-interface Symbol {
-    valueOf(): symbol;
-    constructor: SymbolConstructor;
-}
-interface SymbolConstructor {
-    (val?: any): symbol;
-    prototype: Symbol;
-    for(key: string): symbol;
-    keyFor(sym: symbol): string;
-    readonly typeName: unique symbol;
-}
-
-declare var Symbol: SymbolConstructor;
-
-gt.Symbol = function(this: any, val?: string) {
-    if (this !== undefined && this !== null) throw new TypeError("Symbol may not be called with 'new'.");
-    if (typeof val !== 'string' && val !== undefined) throw new TypeError('val must be a string or undefined.');
-    return internals.symbol(val, true);
-} as SymbolConstructor;
-
-Symbol.prototype = internals.symbolProto;
-setConstr(Symbol.prototype, Symbol);
-(Symbol as any).typeName = Symbol("Symbol.name");
-
-setProps(Symbol, {
-    for(key) {
-        if (typeof key !== 'string' && key !== undefined) throw new TypeError('key must be a string or undefined.');
-        return internals.symbol(key, false);
-    },
-    keyFor(sym) {
-        if (typeof sym !== 'symbol') throw new TypeError('sym must be a symbol.');
-        return internals.symStr(sym);
-    },
-    typeName: Symbol('Symbol.name') as any,
-});
-
-Object.defineProperty(Object.prototype, Symbol.typeName, { value: 'Object' });
-Object.defineProperty(gt, Symbol.typeName, { value: 'Window' });

src/assets/debugger/index.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>JScript Debugger</title>
+</head>
+<body>
+    <p>
+        This is the debugger of JScript. It implement the <a href="https://chromedevtools.github.io/devtools-protocol/1-2/">V8 Debugging protocol</a>,
+        so you can use the devtools in chrome. <br>
+        The debugger is still in early development, so please report any issues to
+        <a href="https://github.com/TopchetoEU/java-jscript/issues">the github repo</a>.
+    </p>
+
+    <p>
+        Here are the available entrypoints:
+        <ul>
+            <li><a href="json/version">/json/version</a> - version and other stuff about the JScript engine</li>
+            <li><a href="json/list">/json/list</a> - a list of all entrypoints</li>
+            <li><a href="json/protocol">/json/protocol</a> - documentation of the implemented V8 protocol</li>
+            <li>/(any target) - websocket entrypoints for debugging</li>
+        </ul>
+    </p>
+
+    <p>
+        Running ${NAME} v${VERSION} by ${AUTHOR}
+    </p>
+</body>
+</html>

src/assets/js/bootstrap.js

@@ -0,0 +1,113 @@
+(function (ts, env, libs) {
+    var src = '', version = 0;
+    var lib = libs.concat([
+        'declare function exit(): never;',
+        'declare function go(): any;',
+        'declare function getTsDeclarations(): string[];'
+    ]).join('');
+    var libSnapshot = ts.ScriptSnapshot.fromString(lib);
+    var environments = {};
+    var declSnapshots = [];
+
+    var settings = {
+        outDir: "/out",
+        declarationDir: "/out",
+        target: ts.ScriptTarget.ES5,
+        lib: [ ],
+        module: ts.ModuleKind.None,
+        declaration: true,
+        stripInternal: true,
+        downlevelIteration: true,
+        forceConsistentCasingInFileNames: true,
+        experimentalDecorators: true,
+        strict: true,
+        sourceMap: true,
+    };
+
+    var reg = ts.createDocumentRegistry();
+    var service = ts.createLanguageService({
+        getCurrentDirectory: function() { return "/"; },
+        getDefaultLibFileName: function() { return "/lib.d.ts"; },
+        getScriptFileNames: function() {
+            var res = [ "/src.ts", "/lib.d.ts" ];
+            for (var i = 0; i < declSnapshots.length; i++) res.push("/glob." + (i + 1) + ".d.ts");
+            return res;
+        },
+        getCompilationSettings: function () { return settings; },
+        fileExists: function(filename) { return filename === "/lib.d.ts" || filename === "/src.ts" || filename === "/glob.d.ts"; },
+
+        getScriptSnapshot: function(filename) {
+            if (filename === "/lib.d.ts") return libSnapshot;
+            if (filename === "/src.ts") return ts.ScriptSnapshot.fromString(src);
+
+            var index = /\/glob\.(\d+)\.d\.ts/g.exec(filename);
+            if (index && index[1] && (index = Number(index[1])) && index > 0 && index <= declSnapshots.length) {
+                return declSnapshots[index - 1];
+            }
+
+            throw new Error("File '" + filename + "' doesn't exist.");
+        },
+        getScriptVersion: function (filename) {
+            if (filename === "/lib.d.ts" || filename.startsWith("/glob.")) return 0;
+            else return version;
+        },
+    }, reg);
+
+    service.getEmitOutput("/lib.d.ts");
+    log("Loaded libraries!");
+
+    var oldCompile = env.compile;
+
+    function compile(code, filename, env) {
+        src = code;
+        version++;
+
+        if (!environments[env.id]) environments[env.id] = []
+        var decls = declSnapshots = environments[env.id];
+        var emit = service.getEmitOutput("/src.ts");
+
+        var diagnostics = []
+            .concat(service.getCompilerOptionsDiagnostics())
+            .concat(service.getSyntacticDiagnostics("/src.ts"))
+            .concat(service.getSemanticDiagnostics("/src.ts"))
+            .map(function (diagnostic) {
+                var message = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
+                if (diagnostic.file) {
+                    var pos = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+                    var file = diagnostic.file.fileName.substring(1);
+                    if (file === "src.ts") file = filename;
+                    return file + ":" + (pos.line + 1) + ":" + (pos.character + 1) + ": " + message;
+                }
+                else return message;
+            });
+
+        if (diagnostics.length > 0) {
+            throw new SyntaxError(diagnostics.join("\n"));
+        }
+
+        var map = JSON.parse(emit.outputFiles[0].text);
+        var result = emit.outputFiles[1].text;
+        var declaration = emit.outputFiles[2].text;
+
+        var compiled = oldCompile(result, filename, env);
+
+        return {
+            function: function () {
+                var val = compiled.function.apply(this, arguments);
+                if (declaration !== '') decls.push(ts.ScriptSnapshot.fromString(declaration));
+                return val;
+            },
+            breakpoints: compiled.breakpoints,
+            mapChain: compiled.mapChain.concat(map.mappings),
+        };
+    }
+
+    function apply(env) {
+        env.compile = compile;
+        env.global.getTsDeclarations = function() {
+            return environments[env.id];
+        }
+    }
+
+    apply(env);
+})(arguments[0], arguments[1], arguments[2]);

src/assets/js/lib.d.ts

@@ -0,0 +1,623 @@
+type PropertyDescriptor<T, ThisT> = {
+    value: any;
+    writable?: boolean;
+    enumerable?: boolean;
+    configurable?: boolean;
+} | {
+    get?(this: ThisT): T;
+    set(this: ThisT, val: T): void;
+    enumerable?: boolean;
+    configurable?: boolean;
+} | {
+    get(this: ThisT): T;
+    set?(this: ThisT, val: T): void;
+    enumerable?: boolean;
+    configurable?: boolean;
+};
+type Exclude<T, U> = T extends U ? never : T;
+type Extract<T, U> = T extends U ? T : never;
+type Record<KeyT extends string | number | symbol, ValT> = { [x in KeyT]: ValT }
+type ReplaceFunc = (match: string, ...args: any[]) => string;
+
+type PromiseResult<T> = { type: 'fulfilled'; value: T; } | { type: 'rejected'; reason: any; }
+
+// wippidy-wine, this code is now mine :D
+type Awaited<T> =
+    T extends null | undefined ? T : // special case for `null | undefined` when not in `--strictNullChecks` mode
+        T extends object & { then(onfulfilled: infer F, ...args: infer _): any } ? // `await` only unwraps object types with a callable `then`. Non-object types are not unwrapped
+            F extends ((value: infer V, ...args: infer _) => any) ? // if the argument to `then` is callable, extracts the first argument
+                Awaited<V> : // recursively unwrap the value
+                never : // the argument to `then` was not callable
+        T;
+
+type IteratorYieldResult<TReturn> =
+    { done?: false; } &
+    (TReturn extends undefined ? { value?: undefined; } : { value: TReturn; });
+
+type IteratorReturnResult<TReturn> =
+    { done: true } &
+    (TReturn extends undefined ? { value?: undefined; } : { value: TReturn; });
+
+type IteratorResult<T, TReturn = any> = IteratorYieldResult<T> | IteratorReturnResult<TReturn>;
+
+interface Thenable<T> {
+    then<NextT = void>(onFulfilled?: (val: T) => NextT, onRejected?: (err: any) => NextT): Promise<Awaited<NextT>>;
+}
+
+interface RegExpResultIndices extends Array<[number, number]> {
+    groups?: { [name: string]: [number, number]; };
+}
+interface RegExpResult extends Array<string> {
+    groups?: { [name: string]: string; };
+    index: number;
+    input: string;
+    indices?: RegExpResultIndices;
+    escape(raw: string, flags: string): RegExp;
+}
+
+interface Matcher {
+    [Symbol.match](target: string): RegExpResult | string[] | null;
+    [Symbol.matchAll](target: string): IterableIterator<RegExpResult>;
+}
+interface Splitter {
+    [Symbol.split](target: string, limit?: number, sensible?: boolean): string[];
+}
+interface Replacer {
+    [Symbol.replace](target: string, replacement: string | ReplaceFunc): string;
+}
+interface Searcher {
+    [Symbol.search](target: string, reverse?: boolean, start?: number): number;
+}
+
+type FlatArray<Arr, Depth extends number> = {
+    "done": Arr,
+    "recur": Arr extends Array<infer InnerArr>
+        ? FlatArray<InnerArr, [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20][Depth]>
+        : Arr
+}[Depth extends -1 ? "done" : "recur"];
+
+interface IArguments {
+    [i: number]: any;
+    length: number;
+}
+
+interface Iterator<T, TReturn = any, TNext = undefined> {
+    next(...args: [] | [TNext]): IteratorResult<T, TReturn>;
+    return?(value?: TReturn): IteratorResult<T, TReturn>;
+    throw?(e?: any): IteratorResult<T, TReturn>;
+}
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
+
+interface AsyncIterator<T, TReturn = any, TNext = undefined> {
+    next(...args: [] | [TNext]): Promise<IteratorResult<T, TReturn>>;
+    return?(value?: TReturn | Thenable<TReturn>): Promise<IteratorResult<T, TReturn>>;
+    throw?(e?: any): Promise<IteratorResult<T, TReturn>>;
+}
+interface AsyncIterable<T> {
+    [Symbol.asyncIterator](): AsyncIterator<T>;
+}
+interface AsyncIterableIterator<T> extends AsyncIterator<T> {
+    [Symbol.asyncIterator](): AsyncIterableIterator<T>;
+}
+
+interface Generator<T = unknown, TReturn = void, TNext = unknown> extends Iterator<T, TReturn, TNext> {
+    [Symbol.iterator](): Generator<T, TReturn, TNext>;
+    return(value: TReturn): IteratorResult<T, TReturn>;
+    throw(e: any): IteratorResult<T, TReturn>;
+}
+interface GeneratorFunction {
+    new (...args: any[]): Generator;
+    (...args: any[]): Generator;
+    readonly length: number;
+    readonly name: string;
+    readonly prototype: Generator;
+}
+
+interface AsyncGenerator<T = unknown, TReturn = void, TNext = unknown> extends AsyncIterator<T, TReturn, TNext> {
+    return(value: TReturn | Thenable<TReturn>): Promise<IteratorResult<T, TReturn>>;
+    throw(e: any): Promise<IteratorResult<T, TReturn>>;
+    [Symbol.asyncIterator](): AsyncGenerator<T, TReturn, TNext>;
+}
+interface AsyncGeneratorFunction {
+    new (...args: any[]): AsyncGenerator;
+    (...args: any[]): AsyncGenerator;
+    readonly length: number;
+    readonly name: string;
+    readonly prototype: AsyncGenerator;
+}
+
+
+interface MathObject {
+    readonly E: number;
+    readonly PI: number;
+    readonly SQRT2: number;
+    readonly SQRT1_2: number;
+    readonly LN2: number;
+    readonly LN10: number;
+    readonly LOG2E: number;
+    readonly LOG10E: number;
+
+    asin(x: number): number;
+    acos(x: number): number;
+    atan(x: number): number;
+    atan2(y: number, x: number): number;
+    asinh(x: number): number;
+    acosh(x: number): number;
+    atanh(x: number): number;
+    sin(x: number): number;
+    cos(x: number): number;
+    tan(x: number): number;
+    sinh(x: number): number;
+    cosh(x: number): number;
+    tanh(x: number): number;
+    sqrt(x: number): number;
+    cbrt(x: number): number;
+    hypot(...vals: number[]): number;
+    imul(a: number, b: number): number;
+    exp(x: number): number;
+    expm1(x: number): number;
+    pow(x: number, y: number): number;
+    log(x: number): number;
+    log10(x: number): number;
+    log1p(x: number): number;
+    log2(x: number): number;
+    ceil(x: number): number;
+    floor(x: number): number;
+    round(x: number): number;
+    fround(x: number): number;
+    trunc(x: number): number;
+    abs(x: number): number;
+    max(...vals: number[]): number;
+    min(...vals: number[]): number;
+    sign(x: number): number;
+    random(): number;
+    clz32(x: number): number;
+}
+
+interface Array<T> extends IterableIterator<T> {
+    [i: number]: T;
+
+    length: number;
+
+    toString(): string;
+    // toLocaleString(): string;
+    join(separator?: string): string;
+    fill(val: T, start?: number, end?: number): T[];
+    pop(): T | undefined;
+    push(...items: T[]): number;
+    concat(...items: (T | T[])[]): T[];
+    concat(...items: (T | T[])[]): T[];
+    join(separator?: string): string;
+    reverse(): T[];
+    shift(): T | undefined;
+    slice(start?: number, end?: number): T[];
+    sort(compareFn?: (a: T, b: T) => number): this;
+    splice(start: number, deleteCount?: number | undefined, ...items: T[]): T[];
+    unshift(...items: T[]): number;
+    indexOf(searchElement: T, fromIndex?: number): number;
+    lastIndexOf(searchElement: T, fromIndex?: number): number;
+    every(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
+    some(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
+    forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
+    includes(el: any, start?: number): boolean;
+
+    map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
+    filter(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): T[];
+    find(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
+    findIndex(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): number;
+    findLast(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
+    findLastIndex(predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): number;
+
+    flat<D extends number = 1>(depth?: D): FlatArray<T, D>;
+    flatMap(func: (val: T, i: number, arr: T[]) => T | T[], thisAarg?: any): FlatArray<T[], 1>;
+    sort(func?: (a: T, b: T) => number): this;
+
+    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
+    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
+    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
+    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
+    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+
+    entries(): IterableIterator<[number, T]>;
+    values(): IterableIterator<T>;
+    keys(): IterableIterator<number>;
+}
+interface ArrayConstructor {
+    new <T>(arrayLength?: number): T[];
+    new <T>(...items: T[]): T[];
+    <T>(arrayLength?: number): T[];
+    <T>(...items: T[]): T[];
+    isArray(arg: any): arg is any[];
+    prototype: Array<any>;
+}
+
+interface Boolean {
+    toString(): string;
+    valueOf(): boolean;
+}
+interface BooleanConstructor {
+    (val: any): boolean;
+    new (val: any): Boolean;
+    prototype: Boolean;
+}
+
+interface Error {
+    name: string;
+    message: string;
+    stack: string[];
+    toString(): string;
+}
+interface ErrorConstructor {
+    (msg?: any): Error;
+    new (msg?: any): Error;
+    prototype: Error;
+}
+
+interface TypeErrorConstructor extends ErrorConstructor {
+    (msg?: any): TypeError;
+    new (msg?: any): TypeError;
+    prototype: Error;
+}
+interface TypeError extends Error {
+    name: 'TypeError';
+}
+
+interface RangeErrorConstructor extends ErrorConstructor {
+    (msg?: any): RangeError;
+    new (msg?: any): RangeError;
+    prototype: Error;
+}
+interface RangeError extends Error {
+    name: 'RangeError';
+}
+
+interface SyntaxErrorConstructor extends ErrorConstructor {
+    (msg?: any): RangeError;
+    new (msg?: any): RangeError;
+    prototype: Error;
+}
+interface SyntaxError extends Error {
+    name: 'SyntaxError';
+}
+
+interface Function {
+    apply(this: Function, thisArg: any, argArray?: any): any;
+    call(this: Function, thisArg: any, ...argArray: any[]): any;
+    bind(this: Function, thisArg: any, ...argArray: any[]): Function;
+
+    toString(): string;
+
+    prototype: any;
+    readonly length: number;
+    name: string;
+}
+interface CallableFunction extends Function {
+    (...args: any[]): any;
+    apply<ThisArg, Args extends any[], RetT>(this: (this: ThisArg, ...args: Args) => RetT, thisArg: ThisArg, argArray?: Args): RetT;
+    call<ThisArg, Args extends any[], RetT>(this: (this: ThisArg, ...args: Args) => RetT, thisArg: ThisArg, ...argArray: Args): RetT;
+    bind<ThisArg, Args extends any[], Rest extends any[], RetT>(this: (this: ThisArg, ...args: [ ...Args, ...Rest ]) => RetT, thisArg: ThisArg, ...argArray: Args): (this: void, ...args: Rest) => RetT;
+}
+interface NewableFunction extends Function {
+    new(...args: any[]): any;
+    apply<Args extends any[], RetT>(this: new (...args: Args) => RetT, thisArg: any, argArray?: Args): RetT;
+    call<Args extends any[], RetT>(this: new (...args: Args) => RetT, thisArg: any, ...argArray: Args): RetT;
+    bind<Args extends any[], RetT>(this: new (...args: Args) => RetT, thisArg: any, ...argArray: Args): new (...args: Args) => RetT;
+}
+interface FunctionConstructor extends Function {
+    (...args: string[]): (...args: any[]) => any;
+    new (...args: string[]): (...args: any[]) => any;
+    prototype: Function;
+    async<ArgsT extends any[], RetT>(
+        func: (await: <T>(val: T) => Awaited<T>) => (...args: ArgsT) => RetT
+    ): (...args: ArgsT) => Promise<RetT>;
+    asyncGenerator<ArgsT extends any[], RetT>(
+        func: (await: <T>(val: T) => Awaited<T>, _yield: <T>(val: T) => void) => (...args: ArgsT) => RetT
+    ): (...args: ArgsT) => AsyncGenerator<RetT>;
+    generator<ArgsT extends any[], T = unknown, RetT = unknown, TNext = unknown>(
+        func: (_yield: <T>(val: T) => TNext) => (...args: ArgsT) => RetT
+    ): (...args: ArgsT) => Generator<T, RetT, TNext>;
+}
+
+interface Number {
+    toString(): string;
+    valueOf(): number;
+}
+interface NumberConstructor {
+    (val: any): number;
+    new (val: any): Number;
+    prototype: Number;
+    parseInt(val: unknown): number;
+    parseFloat(val: unknown): number;
+}
+
+interface Object {
+    constructor: NewableFunction;
+    [Symbol.typeName]: string;
+
+    valueOf(): this;
+    toString(): string;
+    hasOwnProperty(key: any): boolean;
+}
+interface ObjectConstructor {
+    (arg: string): String;
+    (arg: number): Number;
+    (arg: boolean): Boolean;
+    (arg?: undefined | null): {};
+    <T extends object>(arg: T): T;
+
+    new (arg: string): String;
+    new (arg: number): Number;
+    new (arg: boolean): Boolean;
+    new (arg?: undefined | null): {};
+    new <T extends object>(arg: T): T;
+
+    prototype: Object;
+
+    assign<T extends object>(target: T, ...src: object[]): T;
+    create<T extends object>(proto: T, props?: { [key: string]: PropertyDescriptor<any, T> }): T;
+
+    keys<T extends object>(obj: T, onlyString?: true): (keyof T)[];
+    keys<T extends object>(obj: T, onlyString: false): any[];
+    entries<T extends object>(obj: T, onlyString?: true): [keyof T, T[keyof T]][];
+    entries<T extends object>(obj: T, onlyString: false): [any, any][];
+    values<T extends object>(obj: T, onlyString?: true): (T[keyof T])[];
+    values<T extends object>(obj: T, onlyString: false): any[];
+
+    fromEntries(entries: Iterable<[any, any]>): object;
+
+    defineProperty<T, ThisT extends object>(obj: ThisT, key: any, desc: PropertyDescriptor<T, ThisT>): ThisT;
+    defineProperties<ThisT extends object>(obj: ThisT, desc: { [key: string]: PropertyDescriptor<any, ThisT> }): ThisT;
+
+    getOwnPropertyNames<T extends object>(obj: T): (keyof T)[];
+    getOwnPropertySymbols<T extends object>(obj: T): (keyof T)[];
+    hasOwn<T extends object, KeyT>(obj: T, key: KeyT): boolean;
+
+    getOwnPropertyDescriptor<T extends object, KeyT extends keyof T>(obj: T, key: KeyT): PropertyDescriptor<T[KeyT], T>;
+    getOwnPropertyDescriptors<T extends object>(obj: T): { [x in keyof T]: PropertyDescriptor<T[x], T> };
+
+    getPrototypeOf(obj: any): object | null;
+    setPrototypeOf<T>(obj: T, proto: object | null): T;
+
+    preventExtensions<T extends object>(obj: T): T;
+    seal<T extends object>(obj: T): T;
+    freeze<T extends object>(obj: T): T;
+
+    isExtensible(obj: object): boolean;
+    isSealed(obj: object): boolean;
+    isFrozen(obj: object): boolean;
+}
+
+interface String {
+    [i: number]: string;
+
+    toString(): string;
+    valueOf(): string;
+
+    charAt(pos: number): string;
+    charCodeAt(pos: number): number;
+    substring(start?: number, end?: number): string;
+    slice(start?: number, end?: number): string;
+    substr(start?: number, length?: number): string;
+
+    startsWith(str: string, pos?: number): string;
+    endsWith(str: string, pos?: number): string;
+
+    replace(pattern: string | Replacer, val: string | ReplaceFunc): string;
+    replaceAll(pattern: string | Replacer, val: string | ReplaceFunc): string;
+
+    match(pattern: string | Matcher): RegExpResult | string[] | null;
+    matchAll(pattern: string | Matcher): IterableIterator<RegExpResult>;
+
+    split(pattern: string | Splitter, limit?: number, sensible?: boolean): string;
+
+    concat(...others: string[]): string;
+    indexOf(term: string | Searcher, start?: number): number;
+    lastIndexOf(term: string | Searcher, start?: number): number;
+
+    toLowerCase(): string;
+    toUpperCase(): string;
+
+    trim(): string;
+
+    includes(term: string, start?: number): boolean;
+
+    length: number;
+}
+interface StringConstructor {
+    (val: any): string;
+    new (val: any): String;
+
+    fromCharCode(val: number): string;
+
+    prototype: String;
+}
+
+interface Symbol {
+    valueOf(): symbol;
+}
+interface SymbolConstructor {
+    (val?: any): symbol;
+    new(...args: any[]): never;
+    prototype: Symbol;
+    for(key: string): symbol;
+    keyFor(sym: symbol): string;
+
+    readonly typeName: unique symbol;
+    readonly match: unique symbol;
+    readonly matchAll: unique symbol;
+    readonly split: unique symbol;
+    readonly replace: unique symbol;
+    readonly search: unique symbol;
+    readonly iterator: unique symbol;
+    readonly asyncIterator: unique symbol;
+}
+
+
+interface Promise<T> extends Thenable<T> {
+    catch<ResT = void>(func: (err: unknown) => ResT): Promise<ResT>;
+    finally(func: () => void): Promise<T>;
+    constructor: PromiseConstructor;
+}
+interface PromiseConstructorLike {
+    new <T>(func: (res: (val: T) => void, rej: (err: unknown) => void) => void): Thenable<Awaited<T>>;
+}
+interface PromiseConstructor extends PromiseConstructorLike {
+    prototype: Promise<any>;
+
+    new <T>(func: (res: (val: T) => void, rej: (err: unknown) => void) => void): Promise<Awaited<T>>;
+    resolve<T>(val: T): Promise<Awaited<T>>;
+    reject(val: any): Promise<never>;
+
+    isAwaitable(val: unknown): val is Thenable<any>;
+    any<T>(promises: T[]): Promise<Awaited<T>>;
+    race<T>(promises: (Promise<T>|T)[]): Promise<T>;
+    all<T extends any[]>(promises: T): Promise<{ [Key in keyof T]: Awaited<T[Key]> }>;
+    allSettled<T extends any[]>(...promises: T): Promise<[...{ [P in keyof T]: PromiseResult<Awaited<T[P]>>}]>;
+}
+
+interface FileStat {
+    type: 'file' | 'folder';
+    mode: 'r' | 'rw';
+}
+interface File {
+    readonly pointer: Promise<number>;
+    readonly length: Promise<number>;
+
+    read(n: number): Promise<number[]>;
+    write(buff: number[]): Promise<void>;
+    close(): Promise<void>;
+    seek(offset: number, whence: number): Promise<void>;
+}
+interface Filesystem {
+    readonly SEEK_SET: 0;
+    readonly SEEK_CUR: 1;
+    readonly SEEK_END: 2;
+
+    open(path: string, mode: 'r' | 'rw'): Promise<File>;
+    ls(path: string): AsyncIterableIterator<string>;
+    mkdir(path: string): Promise<void>;
+    mkfile(path: string): Promise<void>;
+    rm(path: string, recursive?: boolean): Promise<void>;
+    stat(path: string): Promise<FileStat>;
+    exists(path: string): Promise<boolean>;
+    normalize(...paths: string[]): string;
+}
+
+interface Encoding {
+    encode(val: string): number[];
+    decode(val: number[]): string;
+}
+
+declare var String: StringConstructor;
+//@ts-ignore
+declare const arguments: IArguments;
+declare var NaN: number;
+declare var Infinity: number;
+
+declare var setTimeout: <T extends any[]>(handle: (...args: [ ...T, ...any[] ]) => void, delay?: number, ...args: T) => number;
+declare var setInterval: <T extends any[]>(handle: (...args: [ ...T, ...any[] ]) => void, delay?: number, ...args: T) => number;
+
+declare var clearTimeout: (id: number) => void;
+declare var clearInterval: (id: number) => void;
+
+declare var parseInt: typeof Number.parseInt;
+declare var parseFloat: typeof Number.parseFloat;
+
+declare function log(...vals: any[]): void;
+declare function require(name: string): any;
+
+declare var Array: ArrayConstructor;
+declare var Boolean: BooleanConstructor;
+declare var Promise: PromiseConstructor;
+declare var Function: FunctionConstructor;
+declare var Number: NumberConstructor;
+declare var Object: ObjectConstructor;
+declare var Symbol: SymbolConstructor;
+declare var Promise: PromiseConstructor;
+declare var Math: MathObject;
+declare var Encoding: Encoding;
+declare var Filesystem: Filesystem;
+
+declare var Error: ErrorConstructor;
+declare var RangeError: RangeErrorConstructor;
+declare var TypeError: TypeErrorConstructor;
+declare var SyntaxError: SyntaxErrorConstructor;
+declare var self: typeof globalThis;
+
+declare class Map<KeyT, ValueT> {
+    public [Symbol.iterator](): IterableIterator<[KeyT, ValueT]>;
+
+    public clear(): void;
+    public delete(key: KeyT): boolean;
+
+    public entries(): IterableIterator<[KeyT, ValueT]>;
+    public keys(): IterableIterator<KeyT>;
+    public values(): IterableIterator<ValueT>;
+
+    public get(key: KeyT): ValueT;
+    public set(key: KeyT, val: ValueT): this;
+    public has(key: KeyT): boolean;
+
+    public get size(): number;
+
+    public forEach(func: (val: ValueT, key: KeyT, map: Map<KeyT, ValueT>) => void, thisArg?: any): void;
+
+    public constructor();
+}
+declare class Set<T> {
+    public [Symbol.iterator](): IterableIterator<T>;
+
+    public entries(): IterableIterator<[T, T]>;
+    public keys(): IterableIterator<T>;
+    public values(): IterableIterator<T>;
+
+    public clear(): void;
+
+    public add(val: T): this;
+    public delete(val: T): boolean;
+    public has(key: T): boolean;
+
+    public get size(): number;
+
+    public forEach(func: (key: T, value: T, set: Set<T>) => void, thisArg?: any): void;
+
+    public constructor();
+}
+
+declare class RegExp implements Matcher, Splitter, Replacer, Searcher {
+    static escape(raw: any, flags?: string): RegExp;
+
+    prototype: RegExp;
+
+    exec(val: string): RegExpResult | null;
+    test(val: string): boolean;
+    toString(): string;
+
+    [Symbol.match](target: string): RegExpResult | string[] | null;
+    [Symbol.matchAll](target: string): IterableIterator<RegExpResult>;
+    [Symbol.split](target: string, limit?: number, sensible?: boolean): string[];
+    [Symbol.replace](target: string, replacement: string | ReplaceFunc): string;
+    [Symbol.search](target: string, reverse?: boolean, start?: number): number;
+
+    readonly dotAll: boolean;
+    readonly global: boolean;
+    readonly hasIndices: boolean;
+    readonly ignoreCase: boolean;
+    readonly multiline: boolean;
+    readonly sticky: boolean;
+    readonly unicode: boolean;
+
+    readonly source: string;
+    readonly flags: string;
+
+    lastIndex: number;
+
+    constructor(pattern?: string, flags?: string);
+    constructor(pattern?: RegExp, flags?: string);
+}

src/me/topchetoeu/jscript/Buffer.java

@@ -0,0 +1,53 @@
+package me.topchetoeu.jscript;
+
+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/Filename.java

@@ -0,0 +1,65 @@
+package me.topchetoeu.jscript;
+
+import java.io.File;
+import java.nio.file.Path;
+
+public class Filename {
+    public final String protocol;
+    public final String path;
+
+    public String toString() {
+        return protocol + "://" + path;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + protocol.hashCode();
+        result = prime * result + path.hashCode();
+        return result;
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
+
+        var other = (Filename) obj;
+
+        if (protocol == null) {
+            if (other.protocol != null) return false;
+        }
+        else if (!protocol.equals(other.protocol)) return false;
+
+        if (path == null) {
+            if (other.path != null) return false;
+        }
+        else if (!path.equals(other.path)) return false;
+        return true;
+    }
+
+
+
+
+    public Filename(String protocol, String path) {
+        path = path.trim();
+        protocol = protocol.trim();
+        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/Location.java

@@ -1,18 +1,18 @@
 package me.topchetoeu.jscript;
 
-public class Location {
-    public static final Location INTERNAL = new Location(0, 0, "<internal>");
+public class Location implements Comparable<Location> {
+    public static final Location INTERNAL = new Location(0, 0, new Filename("jscript", "native"));
     private int line;
     private int start;
-    private String filename;
+    private Filename filename;
 
     public int line() { return line; }
     public int start() { return start; }
-    public String filename() { return filename; }
+    public Filename filename() { return filename; }
 
     @Override
     public String toString() {
-        return filename + ":" + line + ":" + start;
+        return filename.toString() + ":" + line + ":" + start;
     }
 
     public Location add(int n, boolean clone) {
@@ -55,9 +55,39 @@ public class Location {
         return true;
     }
 
-    public Location(int line, int start, String filename) {
+    @Override
+    public int compareTo(Location other) {
+        int a = filename.toString().compareTo(other.filename.toString());
+        int b = Integer.compare(line, other.line);
+        int c = Integer.compare(start, other.start);
+
+        if (a != 0) return a;
+        if (b != 0) return b;
+        return c;
+    }
+
+    public Location(int line, int start, Filename filename) {
         this.line = line;
         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/Main.java

@@ -1,116 +1,172 @@
-package me.topchetoeu.jscript;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-
-import me.topchetoeu.jscript.engine.Engine;
-import me.topchetoeu.jscript.engine.values.Values;
-import me.topchetoeu.jscript.events.Observer;
-import me.topchetoeu.jscript.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
-import me.topchetoeu.jscript.polyfills.PolyfillEngine;
-import me.topchetoeu.jscript.polyfills.TypescriptEngine;
-
-public class Main {
-    static Thread task;
-    static Engine engine;
-
-    private static Observer<Object> valuePrinter = new Observer<Object>() {
-        public void next(Object data) {
-            try {
-                Values.printValue(engine.context(), data);
-            }
-            catch (InterruptedException e) { }
-            System.out.println();
-        }
-
-        public void error(RuntimeException err) {
-            try {
-                if (err instanceof EngineException) {
-                    System.out.println("Uncaught " + ((EngineException)err).toString(engine.context()));
-                }
-                else if (err instanceof SyntaxException) {
-                    System.out.println("Syntax error:" + ((SyntaxException)err).msg);
-                }
-                else if (err.getCause() instanceof InterruptedException) return;
-                else {
-                    System.out.println("Internal error ocurred:");
-                    err.printStackTrace();
-                }
-            }
-            catch (EngineException ex) {
-                System.out.println("Uncaught [error while converting to string]");
-            }
-            catch (InterruptedException ex) {
-                return;
-            }
-        }
-    };
-
-    public static void main(String args[]) {
-        var in = new BufferedReader(new InputStreamReader(System.in));
-        engine = new TypescriptEngine(new File("."));
-        var scope = engine.global().globalChild();
-        var exited = new boolean[1];
-
-        scope.define("exit", ctx -> {
-            exited[0] = true;
-            task.interrupt();
-            throw new InterruptedException();
-        });
-        scope.define("go", ctx -> {
-            try {
-                var func = engine.compile(scope, "do.js", new String(Files.readAllBytes(Path.of("do.js"))));
-                return func.call(ctx);
-            }
-            catch (IOException e) {
-                throw new EngineException("Couldn't open do.js");
-            }
-        });
-
-        task = engine.start();
-        var reader = new Thread(() -> {
-            try {
-                while (true) {
-                    try {
-                        var raw = in.readLine();
-
-                        if (raw == null) break;
-                        engine.pushMsg(false, scope, Map.of(), "<stdio>", raw, null).toObservable().once(valuePrinter);
-                    }
-                    catch (EngineException e) {
-                        try {
-                            System.out.println("Uncaught " + e.toString(engine.context()));
-                        }
-                        catch (EngineException ex) {
-                            System.out.println("Uncaught [error while converting to string]");
-                        }
-                    }
-                }
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-            catch (SyntaxException ex) {
-                if (exited[0]) return;
-                System.out.println("Syntax error:" + ex.msg);
-            }
-            catch (RuntimeException ex) {
-                if (exited[0]) return;
-                System.out.println("Internal error ocurred:");
-                ex.printStackTrace();
-            }
-            catch (InterruptedException e) { return; }
-            if (exited[0]) return;
-        });
-        reader.setDaemon(true);
-        reader.setName("STD Reader");
-        reader.start();
-    }
-}
+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.debug.DebugContext;
+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.exceptions.EngineException;
+import me.topchetoeu.jscript.exceptions.InterruptException;
+import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.filesystem.Filesystem;
+import me.topchetoeu.jscript.filesystem.MemoryFilesystem;
+import me.topchetoeu.jscript.filesystem.Mode;
+import me.topchetoeu.jscript.filesystem.PhysicalFilesystem;
+import me.topchetoeu.jscript.filesystem.RootFilesystem;
+import me.topchetoeu.jscript.lib.EnvironmentLib;
+import me.topchetoeu.jscript.lib.Internals;
+import me.topchetoeu.jscript.modules.ModuleRepo;
+import me.topchetoeu.jscript.permissions.PermissionsManager;
+import me.topchetoeu.jscript.permissions.PermissionsProvider;
+
+public class Main {
+    static Thread engineTask, debugTask;
+    static Engine engine = new Engine();
+    static DebugServer debugServer = new DebugServer();
+    static Environment environment = new Environment();
+
+    static int j = 0;
+    static boolean exited = false;
+    static String[] args;
+
+    private static void reader() {
+        try {
+            for (var arg : args) {
+                try {
+                    if (arg.equals("--ts")) initTypescript();
+                    else {
+                        var file = Path.of(arg);
+                        var raw = Files.readString(file);
+                        var res = engine.pushMsg(
+                            false, environment,
+                            Filename.fromFile(file.toFile()),
+                            raw, null
+                        ).await();
+                        Values.printValue(null, res);
+                        System.out.println();
+                    }
+                }
+                catch (EngineException e) { Values.printError(e, null); }
+            }
+            for (var i = 0; ; i++) {
+                try {
+                    var raw = Reading.readline();
+
+                    if (raw == null) break;
+                    var res = engine.pushMsg(
+                        false, environment,
+                        new Filename("jscript", "repl/" + i + ".js"),
+                        raw, null
+                    ).await();
+                    Values.printValue(null, res);
+                    System.out.println();
+                }
+                catch (EngineException e) { Values.printError(e, null); }
+                catch (SyntaxException e) { Values.printError(e, null); }
+            }
+        }
+        catch (IOException e) {
+            System.out.println(e.toString());
+            exited = true;
+        }
+        catch (RuntimeException ex) {
+            if (!exited) {
+                System.out.println("Internal error ocurred:");
+                ex.printStackTrace();
+            }
+        }
+        if (exited) {
+            debugTask.interrupt();
+            engineTask.interrupt();
+        }
+    }
+
+    private static void initEnv() {
+        environment = Internals.apply(environment);
+
+        environment.global.define(false, new NativeFunction("exit", args -> {
+            exited = true;
+            throw new InterruptException();
+        }));
+        environment.global.define(false, new NativeFunction("go", args -> {
+            try {
+                var f = Path.of("do.js");
+                var func = args.ctx.compile(new Filename("do", "do/" + j++ + ".js"), new String(Files.readAllBytes(f)));
+                return func.call(args.ctx);
+            }
+            catch (IOException e) {
+                throw new EngineException("Couldn't open do.js");
+            }
+        }));
+
+        var fs = new RootFilesystem(PermissionsProvider.get(environment));
+        fs.protocols.put("temp", new MemoryFilesystem(Mode.READ_WRITE));
+        fs.protocols.put("file", new PhysicalFilesystem("."));
+
+        environment.add(PermissionsProvider.ENV_KEY, PermissionsManager.ALL_PERMS);
+        environment.add(Filesystem.ENV_KEY, fs);
+        environment.add(ModuleRepo.ENV_KEY, ModuleRepo.ofFilesystem(fs));
+    }
+    private static void initEngine() {
+        var ctx = new DebugContext();
+        engine.add(DebugContext.ENV_KEY, ctx);
+
+        debugServer.targets.put("target", (ws, req) -> new SimpleDebugger(ws).attach(ctx));
+        engineTask = engine.start();
+        debugTask = debugServer.start(new InetSocketAddress("127.0.0.1", 9229), true);
+    }
+    private static void initTypescript() throws IOException {
+        var tsEnv = Internals.apply(new Environment());
+        var bsEnv = Internals.apply(new Environment());
+
+        try {
+            tsEnv.global.define(null, "module", false, new ObjectValue());
+
+            engine.pushMsg(
+                false, tsEnv,
+                new Filename("jscript", "ts.js"),
+                Reading.resourceToString("assets/js/ts.js"), null
+            ).await();
+            System.out.println("Loaded typescript!");
+
+            var typescript = tsEnv.global.get(new Context(engine, bsEnv), "ts");
+            var libs = new ArrayValue(null, Reading.resourceToString("assets/js/lib.d.ts"));
+
+            engine.pushMsg(
+                false, bsEnv,
+                new Filename("jscript", "bootstrap.js"), Reading.resourceToString("assets/js/bootstrap.js"), null,
+                typescript, new EnvironmentLib(environment), libs
+            ).await();
+        }
+        catch (EngineException e) {
+            Values.printError(e, "(while initializing TS)");
+        }
+
+        bsEnv.add(Environment.HIDE_STACK, true);
+        tsEnv.add(Environment.HIDE_STACK, true);
+    }
+
+    public static void main(String args[]) {
+        System.out.println(String.format("Running %s v%s by %s", Metadata.name(), Metadata.version(), Metadata.author()));
+
+        Main.args = args;
+        var reader = new Thread(Main::reader);
+
+        initEnv();
+        initEngine();
+
+        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

@@ -0,0 +1,20 @@
+package me.topchetoeu.jscript;
+
+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/Reading.java

@@ -0,0 +1,33 @@
+package me.topchetoeu.jscript;
+
+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/ResultRunnable.java

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

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

@@ -1,19 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public abstract class AssignStatement extends Statement {
-    public abstract void compile(List<Instruction> target, ScopeRecord scope, boolean retPrevValue);
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        compile(target, scope, false);
-    }
-
-    protected AssignStatement(Location loc) {
-        super(loc);
-    }
-}

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

@@ -4,7 +4,7 @@ import me.topchetoeu.jscript.Location;
 import me.topchetoeu.jscript.engine.Operation;
 
 public abstract class AssignableStatement extends Statement {
-    public abstract AssignStatement toAssign(Statement val, Operation operation);
+    public abstract Statement toAssign(Statement val, Operation operation);
 
     protected AssignableStatement(Location loc) {
         super(loc);

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

@@ -0,0 +1,21 @@
+package me.topchetoeu.jscript.compilation;
+
+import me.topchetoeu.jscript.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/compilation/CompileOptions.java

@@ -1,11 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-public class CompileOptions {
-    public final boolean emitBpMap;
-    public final boolean emitVarNames;
-
-    public CompileOptions(boolean emitBpMap, boolean emitVarNames) {
-        this.emitBpMap = emitBpMap;
-        this.emitVarNames = emitVarNames;
-    }
-}

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

@@ -0,0 +1,66 @@
+package me.topchetoeu.jscript.compilation;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.Vector;
+
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.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/compilation/CompoundStatement.java

@@ -1,77 +1,64 @@
 package me.topchetoeu.jscript.compilation;
 
-import java.util.ArrayList;
 import java.util.List;
+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.Instruction.BreakpointType;
 import me.topchetoeu.jscript.compilation.values.FunctionStatement;
 import me.topchetoeu.jscript.engine.scope.ScopeRecord;
 
 public class CompoundStatement extends Statement {
     public final Statement[] statements;
+    public final boolean separateFuncs;
+    public Location end;
 
-    @Override
-    public boolean pollutesStack() {
+    @Override public boolean pure() {
         for (var stm : statements) {
-            if (stm instanceof FunctionStatement) continue;
-            return true;
+            if (!stm.pure()) return false;
         }
 
-        return false;
+        return true;
     }
 
     @Override
     public void declare(ScopeRecord varsScope) {
-        for (var stm : statements) {
-            stm.declare(varsScope);
-        }
+        for (var stm : statements) stm.declare(varsScope);
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        for (var stm : statements) {
-            if (stm instanceof FunctionStatement) {
-                int start = target.size();
-                ((FunctionStatement)stm).compile(target, scope, null, true);
-                target.get(start).setDebug(true);
-                target.add(Instruction.discard());
+    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);
         }
 
-        for (var i = 0; i < statements.length; i++) {
-            var stm = statements[i];
-            
-            if (stm instanceof FunctionStatement) continue;
-            if (i != statements.length - 1) stm.compileNoPollution(target, scope, true);
-            else stm.compileWithPollution(target, scope);
+        if (!polluted && pollute) {
+            target.add(Instruction.loadValue(loc(), null));
         }
     }
 
-    @Override
-    public Statement optimize() {
-        var res = new ArrayList<Statement>();
-
-        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) {
+    public CompoundStatement(Location loc, boolean separateFuncs, Statement ...statements) {
         super(loc);
+        this.separateFuncs = separateFuncs;
         this.statements = statements;
     }
 }

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

@@ -1,33 +0,0 @@
-package me.topchetoeu.jscript.compilation;
-
-import java.util.List;
-
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (value == null) return;
-        value.compile(target, scope);
-        if (value.pollutesStack()) target.add(Instruction.discard());
-    }
-    @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

@@ -0,0 +1,29 @@
+package me.topchetoeu.jscript.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/compilation/Instruction.java

@@ -7,11 +7,11 @@ import me.topchetoeu.jscript.exceptions.SyntaxException;
 public class Instruction {
     public static enum Type {
         RETURN,
-        SIGNAL,
         THROW,
         THROW_SYNTAX,
         DELETE,
-        TRY,
+        TRY_START,
+        TRY_END,
         NOP,
 
         CALL,
@@ -34,7 +34,6 @@ public class Instruction {
         LOAD_REGEX,
 
         DUP,
-        MOVE,
 
         STORE_VAR,
         STORE_MEMBER,
@@ -46,61 +45,35 @@ public class Instruction {
 
         TYPEOF,
         OPERATION;
-        // TYPEOF,
-        // INSTANCEOF(true),
-        // IN(true),
+    }
+    public static enum BreakpointType {
+        NONE,
+        STEP_OVER,
+        STEP_IN;
 
-        // 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 boolean shouldStepIn() {
+            return this != NONE;
+        }
+        public boolean shouldStepOver() {
+            return this == STEP_OVER;
+        }
     }
 
     public final Type type;
     public final Object[] params;
     public Location location;
-    public boolean debugged;
+    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;
     }
-    public Instruction setDebug(boolean debug) {
-        debugged = debug;
-        return this;
-    }
 
     @SuppressWarnings("unchecked")
     public <T> T get(int i) {
@@ -129,46 +102,38 @@ public class Instruction {
         return params[i].equals(arg);
     }
 
-    private Instruction(Location location, Type type, Object... params) {
+    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 tryStart(Location loc, int catchStart, int finallyStart, int end) {
+        return new Instruction(loc, Type.TRY_START, catchStart, finallyStart, end);
     }
-    public static Instruction throwInstr() {
-        return new Instruction(null, Type.THROW);
+    public static Instruction tryEnd(Location loc) {
+        return new Instruction(loc, Type.TRY_END);
     }
-    public static Instruction throwSyntax(SyntaxException err) {
-        return new Instruction(null, Type.THROW_SYNTAX, err.getMessage());
+    public static Instruction throwInstr(Location loc) {
+        return new Instruction(loc, Type.THROW);
     }
-    public static Instruction delete() {
-        return new Instruction(null, Type.DELETE);
+    public static Instruction throwSyntax(Location loc, SyntaxException err) {
+        return new Instruction(loc, Type.THROW_SYNTAX, err.getMessage());
     }
-    public static Instruction ret() {
-        return new Instruction(null, Type.RETURN);
+    public static Instruction throwSyntax(Location loc, String err) {
+        return new Instruction(loc, Type.THROW_SYNTAX, err);
     }
-    public static Instruction debug() {
-        return new Instruction(null, Type.NOP, "debug");
+    public static Instruction delete(Location loc) {
+        return new Instruction(loc, Type.DELETE);
     }
-    public static Instruction debugVarNames(String[] names) {
-        var args = new Object[names.length + 1];
-        args[0] = "dbg_vars";
-
-        System.arraycopy(names, 0, args, 1, names.length);
-
-        return new Instruction(null, Type.NOP, args);
+    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");
     }
 
-    /**
-     * ATTENTION: Usage outside of try/catch is broken af
-     */
-    public static Instruction signal(String name) {
-        return new Instruction(null, Type.SIGNAL, name);
-    }
-    public static Instruction nop(Object ...params) {
+    public static Instruction nop(Location loc, Object ...params) {
         for (var param : params) {
             if (param instanceof String) continue;
             if (param instanceof Boolean) continue;
@@ -178,109 +143,104 @@ public class Instruction {
 
             throw new RuntimeException("NOP params may contain only strings, booleans, doubles, integers and nulls.");
         }
-        return new Instruction(null, Type.NOP, params);
+        return new Instruction(loc, Type.NOP, params);
     }
 
-    public static Instruction call(int argn) {
-        return new Instruction(null, Type.CALL, argn);
+    public static Instruction call(Location loc, int argn) {
+        return new Instruction(loc, Type.CALL, argn);
     }
-    public static Instruction callNew(int argn) {
-        return new Instruction(null, Type.CALL_NEW, argn);
+    public static Instruction callNew(Location loc, int argn) {
+        return new Instruction(loc, Type.CALL_NEW, argn);
     }
-    public static Instruction jmp(int offset) {
-        return new Instruction(null, Type.JMP, offset);
+    public static Instruction jmp(Location loc, int offset) {
+        return new Instruction(loc, Type.JMP, offset);
     }
-    public static Instruction jmpIf(int offset) {
-        return new Instruction(null, Type.JMP_IF, offset);
+    public static Instruction jmpIf(Location loc, int offset) {
+        return new Instruction(loc, Type.JMP_IF, offset);
     }
-    public static Instruction jmpIfNot(int offset) {
-        return new Instruction(null, Type.JMP_IFN, offset);
+    public static Instruction jmpIfNot(Location loc, int offset) {
+        return new Instruction(loc, Type.JMP_IFN, offset);
     }
 
-    public static Instruction loadValue(Object val) {
-        return new Instruction(null, Type.LOAD_VALUE, val);
+    public static Instruction loadValue(Location loc, Object val) {
+        return new Instruction(loc, Type.LOAD_VALUE, val);
     }
 
-    public static Instruction makeVar(String name) {
-        return new Instruction(null, Type.MAKE_VAR, name);
+    public static Instruction makeVar(Location loc, String name) {
+        return new Instruction(loc, Type.MAKE_VAR, name);
     }
-    public static Instruction loadVar(Object i) {
-        return new Instruction(null, Type.LOAD_VAR, i);
+    public static Instruction loadVar(Location loc, Object i) {
+        return new Instruction(loc, Type.LOAD_VAR, i);
     }
-    public static Instruction loadGlob() {
-        return new Instruction(null, Type.LOAD_GLOB);
+    public static Instruction loadGlob(Location loc) {
+        return new Instruction(loc, Type.LOAD_GLOB);
     }
-    public static Instruction loadMember() {
-        return new Instruction(null, Type.LOAD_MEMBER);
+    public static Instruction loadMember(Location loc) {
+        return new Instruction(loc, Type.LOAD_MEMBER);
     }
-    public static Instruction loadMember(Object key) {
+    public static Instruction loadMember(Location loc, Object key) {
         if (key instanceof Number) key = ((Number)key).doubleValue();
-        return new Instruction(null, Type.LOAD_VAL_MEMBER, key);
+        return new Instruction(loc, 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 loadRegex(Location loc, String pattern, String flags) {
+        return new Instruction(loc, Type.LOAD_REGEX, pattern, flags);
     }
-    public static Instruction loadFunc(int instrN, int varN, int len, int[] captures) {
-        var args = new Object[3 + captures.length];
-        args[0] = instrN;
-        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 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() {
-        return new Instruction(null, Type.LOAD_OBJ);
+    public static Instruction loadObj(Location loc) {
+        return new Instruction(loc, Type.LOAD_OBJ);
     }
-    public static Instruction loadArr(int count) {
-        return new Instruction(null, Type.LOAD_ARR, count);
+    public static Instruction loadArr(Location loc, int count) {
+        return new Instruction(loc, Type.LOAD_ARR, count);
     }
-    public static Instruction dup() {
-        return new Instruction(null, Type.DUP, 0, 1);
+    public static Instruction dup(Location loc) {
+        return new Instruction(loc, Type.DUP, 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 dup(Location loc, int count) {
+        return new Instruction(loc, Type.DUP, count);
     }
 
-    public static Instruction storeSelfFunc(int i) {
-        return new Instruction(null, Type.STORE_SELF_FUNC, i);
+    public static Instruction storeSelfFunc(Location loc, int i) {
+        return new Instruction(loc, Type.STORE_SELF_FUNC, i);
     }
-    public static Instruction storeVar(Object i) {
-        return new Instruction(null, Type.STORE_VAR, i, false);
+    public static Instruction storeVar(Location loc, Object i) {
+        return new Instruction(loc, 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 storeVar(Location loc, Object i, boolean keep) {
+        return new Instruction(loc, Type.STORE_VAR, i, keep);
     }
-    public static Instruction storeMember() {
-        return new Instruction(null, Type.STORE_MEMBER, false);
+    public static Instruction storeMember(Location loc) {
+        return new Instruction(loc, Type.STORE_MEMBER, false);
     }
-    public static Instruction storeMember(boolean keep) {
-        return new Instruction(null, Type.STORE_MEMBER, keep);
+    public static Instruction storeMember(Location loc, boolean keep) {
+        return new Instruction(loc, Type.STORE_MEMBER, keep);
     }
-    public static Instruction discard() {
-        return new Instruction(null, Type.DISCARD);
+    public static Instruction discard(Location loc) {
+        return new Instruction(loc, Type.DISCARD);
     }
 
-    public static Instruction typeof() {
-        return new Instruction(null, Type.TYPEOF);
+    public static Instruction typeof(Location loc) {
+        return new Instruction(loc, Type.TYPEOF);
     }
-    public static Instruction typeof(Object varName) {
-        return new Instruction(null, Type.TYPEOF, varName);
+    public static Instruction typeof(Location loc, Object varName) {
+        return new Instruction(loc, Type.TYPEOF, varName);
     }
 
-    public static Instruction keys() {
-        return new Instruction(null, Type.KEYS);
+    public static Instruction keys(Location loc, boolean forInFormat) {
+        return new Instruction(loc, Type.KEYS, forInFormat);
     }
 
-    public static Instruction defProp() {
-        return new Instruction(null, Type.DEF_PROP);
+    public static Instruction defProp(Location loc) {
+        return new Instruction(loc, Type.DEF_PROP);
     }
 
-    public static Instruction operation(Operation op) {
-        return new Instruction(null, Type.OPERATION, op);
+    public static Instruction operation(Location loc, Operation op) {
+        return new Instruction(loc, Type.OPERATION, op);
     }
 
     @Override

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

@@ -1,36 +1,26 @@
 package me.topchetoeu.jscript.compilation;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
 import me.topchetoeu.jscript.engine.scope.ScopeRecord;
 
 public abstract class Statement {
     private Location _loc;
 
-    public abstract boolean pollutesStack();
     public boolean pure() { return false; }
-    public abstract void compile(List<Instruction> target, ScopeRecord scope);
     public void declare(ScopeRecord varsScope) { }
-    public Statement optimize() { return this; }
 
-    public void compileNoPollution(List<Instruction> target, ScopeRecord scope, boolean debug) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute, BreakpointType type) {
         int start = target.size();
-        compile(target, scope);
-        if (debug && target.size() != start) target.get(start).setDebug(true);
-        if (pollutesStack()) target.add(Instruction.discard().locate(loc()));
+        compile(target, scope, pollute);
+
+        if (target.size() != start) {
+            target.get(start).locate(loc());
+            target.setDebug(start, type);
+        }
     }
-    public void compileWithPollution(List<Instruction> target, ScopeRecord scope, boolean debug) {
-        int start = target.size();
-        compile(target, scope);
-        if (debug && target.size() != start) target.get(start).setDebug(true);
-        if (!pollutesStack()) target.add(Instruction.loadValue(null).locate(loc()));
-    }
-    public void compileNoPollution(List<Instruction> target, ScopeRecord scope) {
-        compileNoPollution(target, scope, false);
-    }
-    public void compileWithPollution(List<Instruction> target, ScopeRecord scope) {
-        compileWithPollution(target, scope, false);
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, pollute, BreakpointType.NONE);
     }
 
     public Location loc() { return _loc; }

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

@@ -0,0 +1,18 @@
+package me.topchetoeu.jscript.compilation;
+
+import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.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/compilation/VariableDeclareStatement.java

@@ -1,52 +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 Pair(String name, Statement value) {
-            this.name = name;
-            this.value = value;
-        }
-    }
-
-    public final List<Pair> values;
-
-    @Override
-    public boolean pollutesStack() { return false; }
-    @Override
-    public void declare(ScopeRecord varsScope) {
-        for (var key : values) {
-            varsScope.define(key.name);
-        }
-    }
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        for (var entry : values) {
-            if (entry.name == null) continue;
-            var key = scope.getKey(entry.name);
-            if (key instanceof String) target.add(Instruction.makeVar((String)key).locate(loc()));
-
-            if (entry.value instanceof FunctionStatement) {
-                ((FunctionStatement)entry.value).compile(target, scope, entry.name, false);
-                target.add(Instruction.storeVar(key).locate(loc()));
-            }
-            else if (entry.value != null) {
-                entry.value.compileWithPollution(target, scope);
-                target.add(Instruction.storeVar(key).locate(loc()));
-            }
-        }
-    }
-
-    public VariableDeclareStatement(Location loc, List<Pair> values) {
-        super(loc);
-        this.values = values;
-    }
-}
+package me.topchetoeu.jscript.compilation;
+
+import java.util.List;
+
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+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);
+
+            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/compilation/control/BreakStatement.java

@@ -1,25 +1,22 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.nop("break", label).locate(loc()));
-    }
-
-    public BreakStatement(Location loc, String label) {
-        super(loc);
-        this.label = label;
-    }
-}
+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(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/compilation/control/ContinueStatement.java

@@ -1,25 +1,22 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.nop("cont", label).locate(loc()));
-    }
-
-    public ContinueStatement(Location loc, String label) {
-        super(loc);
-        this.label = label;
-    }
-}
+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(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/compilation/control/DebugStatement.java

@@ -1,22 +1,19 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.debug().locate(loc()));
-    }
-
-    public DebugStatement(Location loc) {
-        super(loc);
-    }
-}
+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(loc()));
+        if (pollute) target.add(Instruction.loadValue(loc(), null));
+    }
+
+    public DebugStatement(Location loc) {
+        super(loc);
+    }
+}

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

@@ -1,29 +1,27 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        value.compile(target, scope);
-        key.compile(target, scope);
-        target.add(Instruction.delete().locate(loc()));
-    }
-
-    public DeleteStatement(Location loc, Statement key, Statement value) {
-        super(loc);
-        this.key = key;
-        this.value = value;
-    }
-}
+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(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/compilation/control/DoWhileStatement.java

@@ -1,82 +1,37 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-    }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (condition instanceof ConstantStatement) {
-            int start = target.size();
-            body.compileNoPollution(target, scope);
-            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);
-            }
-            return;
-        }
-
-        int start = target.size();
-        body.compileNoPollution(target, scope, true);
-        int mid = target.size();
-        condition.compileWithPollution(target, scope);
-        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;
-    }
-}
+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.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.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/compilation/control/ForInStatement.java

@@ -1,82 +1,73 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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;
-
-    @Override
-    public boolean pollutesStack() { return false; }
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-        if (isDeclaration) globScope.define(varName);
-    }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        var key = scope.getKey(varName);
-        if (key instanceof String) target.add(Instruction.makeVar((String)key));
-
-        if (varValue != null) {
-            varValue.compileWithPollution(target, scope);
-            target.add(Instruction.storeVar(scope.getKey(varName)));
-        }
-
-        object.compileWithPollution(target, scope);
-        target.add(Instruction.keys());
-        
-        int start = target.size();
-        target.add(Instruction.dup());
-        target.add(Instruction.loadMember("length"));
-        target.add(Instruction.loadValue(0));
-        target.add(Instruction.operation(Operation.LESS_EQUALS));
-        int mid = target.size();
-        target.add(Instruction.nop());
-
-        target.add(Instruction.dup());
-        target.add(Instruction.dup());
-        target.add(Instruction.loadMember("length"));
-        target.add(Instruction.loadValue(1));
-        target.add(Instruction.operation(Operation.SUBTRACT));
-        target.add(Instruction.dup(1, 2));
-        target.add(Instruction.loadValue("length"));
-        target.add(Instruction.dup(1, 2));
-        target.add(Instruction.storeMember());
-        target.add(Instruction.loadMember());
-        target.add(Instruction.storeVar(key));
-
-        for (var i = start; i < target.size(); i++) target.get(i).locate(loc());
-
-        body.compileNoPollution(target, scope, true);
-
-
-        int end = target.size();
-
-        WhileStatement.replaceBreaks(target, label, mid + 1, end, start, end + 1);
-
-        target.add(Instruction.jmp(start - end).locate(loc()));
-        target.add(Instruction.discard().locate(loc()));
-        target.set(mid, Instruction.jmpIf(end - mid + 1).locate(loc()));
-    }
-
-    public ForInStatement(Location loc, String label, boolean isDecl, String varName, Statement varValue, Statement object, Statement body) {
-        super(loc);
-        this.label = label;
-        this.isDeclaration = isDecl;
-        this.varName = varName;
-        this.varValue = varValue;
-        this.object = object;
-        this.body = body;
-    }
-}
+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.compilation.Instruction.BreakpointType;
+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(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/compilation/control/ForStatement.java

@@ -1,97 +1,47 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        declaration.declare(globScope);
-        body.declare(globScope);
-    }
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        declaration.compile(target, scope);
-
-        if (condition instanceof ConstantStatement) {
-            if (Values.toBoolean(((ConstantStatement)condition).value)) {
-                int start = target.size();
-                body.compileNoPollution(target, scope);
-                int mid = target.size();
-                assignment.compileNoPollution(target, scope, true);
-                int end = target.size();
-                WhileStatement.replaceBreaks(target, label, start, mid, mid, end + 1);
-                target.add(Instruction.jmp(start - target.size()).locate(loc()));
-                return;
-            }
-        }
-
-        int start = target.size();
-        condition.compileWithPollution(target, scope);
-        int mid = target.size();
-        target.add(Instruction.nop());
-        body.compileNoPollution(target, scope);
-        int beforeAssign = target.size();
-        assignment.compile(target, scope);
-        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()));
-    }
-    @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
-            ))
-        );
-    }
-}
+package me.topchetoeu.jscript.compilation.control;
+
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.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/compilation/control/IfStatement.java

@@ -1,80 +1,52 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-        if (elseBody != null) elseBody.declare(globScope);
-    }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (condition instanceof ConstantStatement) {
-            if (Values.not(((ConstantStatement)condition).value)) {
-                if (elseBody != null) elseBody.compileNoPollution(target, scope, true);
-            }
-            else {
-                body.compileNoPollution(target, scope, true);
-            }
-
-            return;
-        }
-
-        condition.compileWithPollution(target, scope);
-        if (elseBody == null) {
-            int i = target.size();
-            target.add(Instruction.nop());
-            body.compileNoPollution(target, scope, true);
-            int endI = target.size();
-            target.set(i, Instruction.jmpIfNot(endI - i).locate(loc()));
-        }
-        else {
-            int start = target.size();
-            target.add(Instruction.nop());
-            body.compileNoPollution(target, scope, true);
-            target.add(Instruction.nop());
-            int mid = target.size();
-            elseBody.compileNoPollution(target, scope, true);
-            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;
-    }
-}
+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.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.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/compilation/control/ReturnStatement.java

@@ -1,27 +1,23 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (value == null) target.add(Instruction.loadValue(null).locate(loc()));
-        else value.compileWithPollution(target, scope);
-        target.add(Instruction.ret().locate(loc()));
-    }
-
-    public ReturnStatement(Location loc, Statement value) {
-        super(loc);
-        this.value = value;
-    }
-}
+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(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/compilation/control/SwitchStatement.java

@@ -1,90 +1,87 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.HashMap;
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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;
-        }
-    }
-
-    @Override
-    public boolean pollutesStack() { return false; }
-
-    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(List<Instruction> target, ScopeRecord scope) {
-        var caseMap = new HashMap<Integer, Integer>();
-        var stmIndexMap = new HashMap<Integer, Integer>();
-
-        value.compile(target, scope);
-
-        for (var ccase : cases) {
-            target.add(Instruction.dup().locate(loc()));
-            ccase.value.compileWithPollution(target, scope);
-            target.add(Instruction.operation(Operation.EQUALS).locate(loc()));
-            caseMap.put(target.size(), ccase.statementI);
-            target.add(Instruction.nop());
-        }
-
-        int start = target.size();
-
-        target.add(Instruction.nop());
-
-        for (var stm : body) {
-            stmIndexMap.put(stmIndexMap.size(), target.size());
-            stm.compileNoPollution(target, scope, true);
-        }
-
-        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));
-            }
-            if (instr.type == Type.NOP && instr.is(0, "try_break") && instr.get(1) == null) {
-                target.set(i, Instruction.signal("jmp_" + (target.size() - (Integer)instr.get(2))).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).setDebug(true));
-        }
-
-        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;
-    }
-}
+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.BreakpointType;
+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 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/compilation/control/ThrowStatement.java

@@ -1,26 +1,22 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        value.compileWithPollution(target, scope);
-        target.add(Instruction.throwInstr().locate(loc()));
-    }
-
-    public ThrowStatement(Location loc, Statement value) {
-        super(loc);
-        this.value = value;
-    }
-}
+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(loc()));
+    }
+
+    public ThrowStatement(Location loc, Statement value) {
+        super(loc);
+        this.value = value;
+    }
+}

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

@@ -1,74 +1,61 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return false; }
-
-    @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(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.nop());
-
-        int start = target.size(), tryN, catchN = -1, finN = -1;
-
-        tryBody.compileNoPollution(target, scope);
-        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.compileNoPollution(target, scope);
-            local.undefine();
-            catchN = target.size() - tmp;
-        }
-
-        if (finallyBody != null) {
-            int tmp = target.size();
-            finallyBody.compileNoPollution(target, scope);
-            finN = target.size() - tmp;
-        }
-
-        // for (int i = start; i < target.size(); i++) {
-        //     if (target.get(i).type == Type.NOP) {
-        //         var instr = target.get(i);
-        //         if (instr.is(0, "break")) {
-        //             target.set(i, Instruction.nop("try_break", instr.get(1), target.size()).locate(instr.location));
-        //         }
-        //         else if (instr.is(0, "cont")) {
-        //             target.set(i, Instruction.nop("try_cont", instr.get(1), target.size()).locate(instr.location));
-        //         }
-        //     }
-        // }
-
-        target.set(start - 1, Instruction.tryInstr(tryN, catchN, finN).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.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.compilation.Instruction.BreakpointType;
+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, 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/compilation/control/WhileStatement.java

@@ -1,104 +1,54 @@
-package me.topchetoeu.jscript.compilation.control;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-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 boolean pollutesStack() { return false; }
-
-    @Override
-    public void declare(ScopeRecord globScope) {
-        body.declare(globScope);
-    }
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (condition instanceof ConstantStatement) {
-            if (Values.toBoolean(((ConstantStatement)condition).value)) {
-                int start = target.size();
-                body.compileNoPollution(target, scope);
-                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.compileWithPollution(target, scope);
-        int mid = target.size();
-        target.add(Instruction.nop());
-        body.compileNoPollution(target, scope);
-
-        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()));
-    }
-    @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(List<Instruction> 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;
-            }
-            if (instr.type == Type.NOP && instr.is(0, "try_cont") && (instr.get(1) == null || instr.is(1, label))) {
-                target.set(i, Instruction.signal("jmp_" + (continuePoint - (Integer)instr.get(2))));
-                target.get(i).location = instr.location;
-            }
-            if (instr.type == Type.NOP && instr.is(0, "try_break") && (instr.get(1) == null || instr.is(1, label))) {
-                target.set(i, Instruction.signal("jmp_" + (breakPoint - (Integer)instr.get(2))));
-                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
-    //         ))
-    //     );
-    // }
-}
+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.Instruction;
+import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.compilation.Instruction.Type;
+import me.topchetoeu.jscript.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/compilation/values/ArrayStatement.java

@@ -1,37 +1,41 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        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.compileWithPollution(target, scope);
-                target.add(Instruction.storeMember().locate(loc()));
-            }
-            i++;
-        }
-    }
-
-    public ArrayStatement(Location loc, Statement[] statements) {
-        super(loc);
-        this.statements = statements;
-    }
-}
+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 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/compilation/values/CallStatement.java

@@ -1,44 +1,51 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (func instanceof IndexStatement) {
-            ((IndexStatement)func).compile(target, scope, true);
-        }
-        else {
-            target.add(Instruction.loadValue(null).locate(loc()));
-            func.compileWithPollution(target, scope);
-        }
-
-        for (var arg : args) {
-            arg.compileWithPollution(target, scope);
-        }
-
-        target.add(Instruction.call(args.length).locate(loc()).setDebug(true));
-    }
-
-    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;
-    }
-}
+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.Instruction.BreakpointType;
+import me.topchetoeu.jscript.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/compilation/values/ChangeStatement.java

@@ -1,31 +1,32 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
-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 boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        value.toAssign(new ConstantStatement(loc(), -addAmount), Operation.SUBTRACT).compile(target, scope, postfix);
-    }
-
-    public ChangeStatement(Location loc, AssignableStatement value, double addAmount, boolean postfix) {
-        super(loc);
-        this.value = value;
-        this.addAmount = addAmount;
-        this.postfix = postfix;
-    }
-}
+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(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/compilation/values/CommaStatement.java

@@ -1,38 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class CommaStatement extends Statement {
-    public final Statement first;
-    public final Statement second;
-
-    @Override
-    public boolean pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return first.pure() && second.pure(); }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        first.compileNoPollution(target, scope);
-        second.compileWithPollution(target, scope);
-    }
-
-    @Override
-    public Statement optimize() {
-        var f = first.optimize();
-        var s = second.optimize();
-        if (f.pure()) return s;
-        else return new CommaStatement(loc(), f, s);
-    }
-
-    public CommaStatement(Location loc, Statement first, Statement second) {
-        super(loc);
-        this.first = first;
-        this.second = second;
-    }
-}

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

@@ -1,27 +1,23 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.loadValue(value).locate(loc()));
-    }
-
-    public ConstantStatement(Location loc, Object val) {
-        super(loc);
-        this.value = val;
-    }
-}
+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(loc(), value));
+    }
+
+    public ConstantStatement(Location loc, Object val) {
+        super(loc);
+        this.value = val;
+    }
+}

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

@@ -0,0 +1,24 @@
+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 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/compilation/values/FunctionStatement.java

@@ -1,108 +1,139 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
-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;
-
-    @Override
-    public boolean pure() { return name == null; }
-    @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void declare(ScopeRecord scope) {
-        if (name != null) scope.define(name);
-    }
-
-    public static void checkBreakAndCont(List<Instruction> 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") || target.get(i).is(0, "try_break")) {
-                    throw new SyntaxException(target.get(i).location, "Break was placed outside a loop.");
-                }
-                if (target.get(i).is(0, "cont") || target.get(i).is(0, "try_cont")) {
-                    throw new SyntaxException(target.get(i).location, "Continue was placed outside a loop.");
-                }
-            }
-        }
-    }
-
-    public void compile(List<Instruction> 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();
-
-        target.add(Instruction.nop());
-        subscope.define("this");
-        var argsVar = subscope.define("arguments");
-
-        if (args.length > 0) {
-            for (var i = 0; i < args.length; i++) {
-                target.add(Instruction.loadVar(argsVar).locate(loc()));
-                target.add(Instruction.loadMember(i).locate(loc()));
-                target.add(Instruction.storeVar(subscope.define(args[i])).locate(loc()));
-            }
-        }
-
-        if (!isStatement && this.name != null) {
-            target.add(Instruction.storeSelfFunc((int)subscope.define(this.name)));
-        }
-
-        body.declare(subscope);
-        target.add(Instruction.debugVarNames(subscope.locals()));
-        body.compile(target, subscope);
-
-        checkBreakAndCont(target, start);
-
-        if (!(body instanceof CompoundStatement)) target.add(Instruction.ret().locate(loc()));
-
-        target.set(start, Instruction.loadFunc(target.size() - start, subscope.localsCount(), args.length, subscope.getCaptures()).locate(loc()));
-
-        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), true).locate(loc()));
-        }
-    }
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        compile(target, scope, null, false);
-    }
-
-    public FunctionStatement(Location loc, String name, String[] args, CompoundStatement body) {
-        super(loc);
-        this.name = name;
-
-        this.args = args;
-        this.body = body;
-    }
-}
+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.BreakpointType;
+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 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/compilation/values/GlobalThisStatement.java

@@ -1,24 +1,20 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class GlobalThisStatement extends Statement {
-    @Override
-    public boolean pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.loadGlob().locate(loc()));
-    }
-
-    public GlobalThisStatement(Location loc) {
-        super(loc);
-    }
-}
+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(loc()));
+    }
+
+    public GlobalThisStatement(Location loc) {
+        super(loc);
+    }
+}

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

@@ -1,58 +1,48 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignStatement;
-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 AssignStatement {
-    public final Statement object;
-    public final Statement index;
-    public final Statement value;
-    public final Operation operation;
-
-    @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope, boolean retPrevValue) {
-        int start = 0;
-
-        if (operation != null) {
-            object.compileWithPollution(target, scope);
-            index.compileWithPollution(target, scope);
-            target.add(Instruction.dup(2, 0).locate(loc()));
-
-            target.add(Instruction.loadMember().locate(loc()));
-            if (retPrevValue) {
-                target.add(Instruction.dup().locate(loc()));
-                target.add(Instruction.move(3, 1).locate(loc()));
-            }
-            value.compileWithPollution(target, scope);
-            target.add(Instruction.operation(operation).locate(loc()));
-
-            target.add(Instruction.storeMember(!retPrevValue).locate(loc()).setDebug(true));
-        }
-        else {
-            object.compileWithPollution(target, scope);
-            if (retPrevValue) target.add(Instruction.dup().locate(loc()));
-            index.compileWithPollution(target, scope);
-            value.compileWithPollution(target, scope);
-
-            target.add(Instruction.storeMember(!retPrevValue).locate(loc()).setDebug(true));
-        }
-        target.get(start);
-    }
-
-    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.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.Instruction.BreakpointType;
+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(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/compilation/values/IndexStatement.java

@@ -1,54 +1,49 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignStatement;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public AssignStatement toAssign(Statement val, Operation operation) {
-        return new IndexAssignStatement(loc(), object, index, val, operation);
-    }
-    public void compile(List<Instruction> target, ScopeRecord scope, boolean dupObj) {
-        int start = 0;
-        object.compileWithPollution(target, scope);
-        if (dupObj) target.add(Instruction.dup().locate(loc()));
-        if (index instanceof ConstantStatement) {
-            target.add(Instruction.loadMember(((ConstantStatement)index).value).locate(loc()));
-            return;
-        }
-
-        index.compileWithPollution(target, scope);
-        target.add(Instruction.loadMember().locate(loc()));
-        target.get(start).setDebug(true);
-    }
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        compile(target, scope, false);
-    }
-
-    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.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.compilation.Instruction.BreakpointType;
+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 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/compilation/values/LazyAndStatement.java

@@ -1,45 +1,39 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() {
-        return first.pure() && second.pure();
-    }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (first instanceof ConstantStatement) {
-            if (Values.not(((ConstantStatement)first).value)) {
-                first.compileWithPollution(target, scope);
-            }
-            else second.compileWithPollution(target, scope);
-            return;
-        }
-
-        first.compileWithPollution(target, scope);
-        target.add(Instruction.dup().locate(loc()));
-        int start = target.size();
-        target.add(Instruction.nop());
-        target.add(Instruction.discard().locate(loc()));
-        second.compileWithPollution(target, scope);
-        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.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(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/compilation/values/LazyOrStatement.java

@@ -1,45 +1,39 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() {
-        return first.pure() && second.pure();
-    }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (first instanceof ConstantStatement) {
-            if (Values.not(((ConstantStatement)first).value)) {
-                second.compileWithPollution(target, scope);
-            }
-            else first.compileWithPollution(target, scope);
-            return;
-        }
-
-        first.compileWithPollution(target, scope);
-        target.add(Instruction.dup().locate(loc()));
-        int start = target.size();
-        target.add(Instruction.nop());
-        target.add(Instruction.discard().locate(loc()));
-        second.compileWithPollution(target, scope);
-        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.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(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/compilation/values/NewStatement.java

@@ -1,32 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        func.compileWithPollution(target, scope);
-        for (var arg : args) {
-            arg.compileWithPollution(target, scope);
-        }
-
-        target.add(Instruction.callNew(args.length).locate(loc()).setDebug(true));
-    }
-
-    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,57 +1,63 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import me.topchetoeu.jscript.Location;
-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 boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        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.compileWithPollution(target, scope);
-            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).compileWithPollution(target, scope);
-            else target.add(Instruction.loadValue(null).locate(loc()));
-
-            if (setters.containsKey(key)) setters.get(key).compileWithPollution(target, scope);
-            else target.add(Instruction.loadValue(null).locate(loc()));
-
-            target.add(Instruction.defProp().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;
-    }
-}
+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 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/compilation/values/OperationStatement.java

@@ -1,105 +1,37 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.control.ThrowStatement;
-import me.topchetoeu.jscript.engine.CallContext;
-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(List<Instruction> target, ScopeRecord scope) {
-        for (var arg : args) {
-            arg.compileWithPollution(target, scope);
-        }
-        target.add(Instruction.operation(operation).locate(loc()));
-    }
-
-    @Override
-    public boolean pollutesStack() { return true; }
-    @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 {
-                var ctx = new CallContext(null);
-    
-                switch (operation) {
-                    case ADD: return new ConstantStatement(loc(), Values.add(ctx, vals[0], vals[1]));
-                    case SUBTRACT: return new ConstantStatement(loc(), Values.subtract(ctx, vals[0], vals[1]));
-                    case DIVIDE: return new ConstantStatement(loc(), Values.divide(ctx, vals[0], vals[1]));
-                    case MULTIPLY: return new ConstantStatement(loc(), Values.multiply(ctx, vals[0], vals[1]));
-                    case MODULO: return new ConstantStatement(loc(), Values.modulo(ctx, vals[0], vals[1]));
-
-                    case AND: return new ConstantStatement(loc(), Values.and(ctx, vals[0], vals[1]));
-                    case OR: return new ConstantStatement(loc(), Values.or(ctx, vals[0], vals[1]));
-                    case XOR: return new ConstantStatement(loc(), Values.xor(ctx, vals[0], vals[1]));
-
-                    case EQUALS: return new ConstantStatement(loc(), Values.strictEquals(vals[0], vals[1]));
-                    case NOT_EQUALS: return new ConstantStatement(loc(), !Values.strictEquals(vals[0], vals[1]));
-                    case LOOSE_EQUALS: return new ConstantStatement(loc(), Values.looseEqual(ctx, vals[0], vals[1]));
-                    case LOOSE_NOT_EQUALS: return new ConstantStatement(loc(), !Values.looseEqual(ctx, vals[0], vals[1]));
-
-                    case GREATER: return new ConstantStatement(loc(), Values.compare(ctx, vals[0], vals[1]) < 0);
-                    case GREATER_EQUALS: return new ConstantStatement(loc(), Values.compare(ctx, vals[0], vals[1]) <= 0);
-                    case LESS: return new ConstantStatement(loc(), Values.compare(ctx, vals[0], vals[1]) > 0);
-                    case LESS_EQUALS: return new ConstantStatement(loc(), Values.compare(ctx, vals[0], vals[1]) >= 0);
-
-                    case INVERSE: return new ConstantStatement(loc(), Values.bitwiseNot(ctx, vals[0]));
-                    case NOT: return new ConstantStatement(loc(), Values.not(vals[0]));
-                    case POS: return new ConstantStatement(loc(), Values.toNumber(ctx, vals[0]));
-                    case NEG: return new ConstantStatement(loc(), Values.negative(ctx, vals[0]));
-
-                    case SHIFT_LEFT: return new ConstantStatement(loc(), Values.shiftLeft(ctx, vals[0], vals[1]));
-                    case SHIFT_RIGHT: return new ConstantStatement(loc(), Values.shiftRight(ctx, vals[0], vals[1]));
-                    case USHIFT_RIGHT: return new ConstantStatement(loc(), Values.unsignedShiftRight(ctx, vals[0], vals[1]));
-
-                    default: break;
-                }
-            }
-            catch (EngineException e) {
-                return new ThrowStatement(loc(), new ConstantStatement(loc(), e.value));
-            }
-            catch (InterruptedException e) { return null; }
-        }
-
-        return new OperationStatement(loc(), operation, args);
-
-    }
-
-    public OperationStatement(Location loc, Operation operation, Statement... args) {
-        super(loc);
-        this.operation = operation;
-        this.args = args;
-    }
-}
+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 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/compilation/values/RegexStatement.java

@@ -1,28 +1,26 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.loadRegex(pattern, flags).locate(loc()));
-    }
-
-    public RegexStatement(Location loc, String pattern, String flags) {
-        super(loc);
-        this.pattern = pattern;
-        this.flags = flags;
-    }
-}
+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;
+
+    // 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/compilation/values/TernaryStatement.java

@@ -1,58 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 TernaryStatement extends Statement {
-    public final Statement condition;
-    public final Statement first;
-    public final Statement second;
-
-    @Override
-    public boolean pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (condition instanceof ConstantStatement) {
-            if (!Values.toBoolean(((ConstantStatement)condition).value)) {
-                second.compileWithPollution(target, scope);
-            }
-            else first.compileWithPollution(target, scope);
-            return;
-        }
-
-        condition.compileWithPollution(target, scope);
-        int start = target.size();
-        target.add(Instruction.nop());
-        first.compileWithPollution(target, scope);
-        int mid = target.size();
-        target.add(Instruction.nop());
-        second.compileWithPollution(target, scope);
-        int end = target.size();
-
-        target.set(start, Instruction.jmpIfNot(mid - start + 1).locate(loc()));
-        target.set(mid, Instruction.jmp(end - mid).locate(loc()));
-    }
-
-    @Override
-    public Statement optimize() {
-        var cond = condition.optimize();
-        var f = first.optimize();
-        var s = second.optimize();
-        return new TernaryStatement(loc(), cond, f, s);
-    }
-
-    public TernaryStatement(Location loc, Statement condition, Statement first, Statement second) {
-        super(loc);
-        this.condition = condition;
-        this.first = first;
-        this.second = second;
-    }
-}

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

@@ -1,53 +1,33 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-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 TypeofStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public boolean pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        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.compileWithPollution(target, scope);
-        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;
-    }
-}
+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 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/compilation/values/VariableAssignStatement.java

@@ -1,45 +1,38 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.compilation.AssignStatement;
-import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-
-public class VariableAssignStatement extends AssignStatement {
-    public final String name;
-    public final Statement value;
-    public final Operation operation;
-
-    @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope, boolean retPrevValue) {
-        var i = scope.getKey(name);
-        if (operation != null) {
-            target.add(Instruction.loadVar(i).locate(loc()));
-            if (retPrevValue) target.add(Instruction.dup().locate(loc()));
-            if (value instanceof FunctionStatement) ((FunctionStatement)value).compile(target, scope, name, false);
-            else value.compileWithPollution(target, scope);
-            target.add(Instruction.operation(operation).locate(loc()));
-            target.add(Instruction.storeVar(i, !retPrevValue).locate(loc()));
-        }
-        else {
-            if (retPrevValue) target.add(Instruction.loadVar(i).locate(loc()));
-            if (value instanceof FunctionStatement) ((FunctionStatement)value).compile(target, scope, name, false);
-            else value.compileWithPollution(target, scope);
-            target.add(Instruction.storeVar(i, !retPrevValue).locate(loc()));
-        }
-    }
-
-    public VariableAssignStatement(Location loc, String name, Statement val, Operation operation) {
-        super(loc);
-        this.name = name;
-        this.value = val;
-        this.operation = operation;
-    }
-}
+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 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/compilation/values/VariableIndexStatement.java

@@ -1,27 +1,23 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        target.add(Instruction.loadVar(index).locate(loc()));
-    }
-
-    public VariableIndexStatement(Location loc, int i) {
-        super(loc);
-        this.index = i;
-    }
-}
+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(loc(), index));
+    }
+
+    public VariableIndexStatement(Location loc, int i) {
+        super(loc);
+        this.index = i;
+    }
+}

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

@@ -1,36 +1,32 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.AssignStatement;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
-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 pollutesStack() { return true; }
-    @Override
-    public boolean pure() { return true; }
-
-    @Override
-    public AssignStatement toAssign(Statement val, Operation operation) {
-        return new VariableAssignStatement(loc(), name, val, operation);
-    }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        var i = scope.getKey(name);
-        target.add(Instruction.loadVar(i).locate(loc()));
-    }
-
-    public VariableStatement(Location loc, String name) {
-        super(loc);
-        this.name = name;
-    }
-}
+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 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/compilation/values/VoidStatement.java

@@ -1,34 +0,0 @@
-package me.topchetoeu.jscript.compilation.values;
-
-import java.util.List;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.compilation.Instruction;
-
-public class VoidStatement extends Statement {
-    public final Statement value;
-
-    @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        if (value != null) value.compileNoPollution(target, scope);
-        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/engine/BreakpointData.java

@@ -1,13 +0,0 @@
-package me.topchetoeu.jscript.engine;
-
-import me.topchetoeu.jscript.Location;
-
-public class BreakpointData {
-    public final Location loc;
-    public final CallContext ctx;
-
-    public BreakpointData(Location loc, CallContext ctx) {
-        this.loc = loc;
-        this.ctx = ctx;
-    }
-}

src/me/topchetoeu/jscript/engine/CallContext.java

@@ -1,60 +0,0 @@
-package me.topchetoeu.jscript.engine;
-
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Map;
-
-public class CallContext {
-    public static final class DataKey<T> {}
-
-    public final Engine engine;
-    private final Map<DataKey<?>, Object> data = new Hashtable<>();
-
-    public Engine engine() { return engine; }
-    public Map<DataKey<?>, Object> data() { return Collections.unmodifiableMap(data); }
-
-    public CallContext copy() {
-        return new CallContext(engine).mergeData(data);
-    }
-    public CallContext mergeData(Map<DataKey<?>, Object> objs) {
-        data.putAll(objs);
-        return this;
-    }
-    public <T> CallContext setData(DataKey<T> key, T val) {
-        if (val == null) data.remove(key);
-        else data.put(key, val);
-        return this;
-    }
-    @SuppressWarnings("unchecked")
-    public <T> T addData(DataKey<T> key, T val) {
-        if (data.containsKey(key)) return (T)data.get(key);
-        else {
-            if (val == null) data.remove(key);
-            else data.put(key, val);
-            return val;
-        }
-    }
-    public boolean hasData(DataKey<?> key) { return data.containsKey(key); }
-    public <T> T getData(DataKey<T> key) {
-        return getData(key, null);
-    }
-    @SuppressWarnings("unchecked")
-    public <T> T getData(DataKey<T> key, T defaultVal) {
-        if (!hasData(key)) return defaultVal;
-        else return (T)data.get(key);
-    }
-
-    public CallContext changeData(DataKey<Integer> key, int n, int start) {
-        return setData(key, getData(key, start) + n);
-    }
-    public CallContext changeData(DataKey<Integer> key, int n) {
-        return changeData(key, n, 0);
-    }
-    public CallContext changeData(DataKey<Integer> key) {
-        return changeData(key, 1, 0);
-    }
-
-    public CallContext(Engine engine) {
-        this.engine = engine;
-    }
-}

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

@@ -0,0 +1,164 @@
+package me.topchetoeu.jscript.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.Filename;
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.engine.debug.DebugContext;
+import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.lib.EnvironmentLib;
+import me.topchetoeu.jscript.mapping.SourceMap;
+
+public class Context implements Extensions {
+    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/engine/DebugCommand.java

@@ -1,8 +0,0 @@
-package me.topchetoeu.jscript.engine;
-
-public enum DebugCommand {
-    NORMAL,
-    STEP_OVER,
-    STEP_OUT,
-    STEP_INTO,
-}

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

@@ -1,205 +1,57 @@
-package me.topchetoeu.jscript.engine;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-
-import me.topchetoeu.jscript.engine.CallContext.DataKey;
-import me.topchetoeu.jscript.engine.debug.DebugState;
-import me.topchetoeu.jscript.engine.modules.ModuleManager;
-import me.topchetoeu.jscript.engine.scope.GlobalScope;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.ObjectValue.PlaceholderProto;
-import me.topchetoeu.jscript.events.Awaitable;
-import me.topchetoeu.jscript.events.DataNotifier;
-import me.topchetoeu.jscript.exceptions.EngineException;
-import me.topchetoeu.jscript.interop.NativeTypeRegister;
-import me.topchetoeu.jscript.parsing.Parsing;
-
-public class Engine {
-    private static class RawFunction {
-        public final GlobalScope scope;
-        public final String filename;
-        public final String raw;
-
-        public RawFunction(GlobalScope scope, String filename, String raw) {
-            this.scope = scope;
-            this.filename = filename;
-            this.raw = raw;
-        }
-    }
-
-    private static class Task {
-        public final Object func;
-        public final Object thisArg;
-        public final Object[] args;
-        public final Map<DataKey<?>, Object> data;
-        public final DataNotifier<Object> notifier = new DataNotifier<>();
-
-        public Task(Object func, Map<DataKey<?>, Object> data, Object thisArg, Object[] args) {
-            this.func = func;
-            this.data = data;
-            this.thisArg = thisArg;
-            this.args = args;
-        }
-    }
-
-    public static final DataKey<DebugState> DEBUG_STATE_KEY = new DataKey<>();
-    private static int nextId = 0;
-
-    private Map<DataKey<?>, Object> callCtxVals = new HashMap<>();
-    private GlobalScope global = new GlobalScope();
-    private ObjectValue arrayProto = new ObjectValue();
-    private ObjectValue boolProto = new ObjectValue();
-    private ObjectValue funcProto = new ObjectValue();
-    private ObjectValue numProto = new ObjectValue();
-    private ObjectValue objProto = new ObjectValue(PlaceholderProto.NONE);
-    private ObjectValue strProto = new ObjectValue();
-    private ObjectValue symProto = new ObjectValue();
-    private ObjectValue errProto = new ObjectValue();
-    private ObjectValue syntaxErrProto = new ObjectValue(PlaceholderProto.ERROR);
-    private ObjectValue typeErrProto = new ObjectValue(PlaceholderProto.ERROR);
-    private ObjectValue rangeErrProto = new ObjectValue(PlaceholderProto.ERROR);
-    private NativeTypeRegister typeRegister;
-    private Thread thread;
-
-    private LinkedBlockingDeque<Task> macroTasks = new LinkedBlockingDeque<>();
-    private LinkedBlockingDeque<Task> microTasks = new LinkedBlockingDeque<>();
-
-    public final int id = ++nextId;
-    public final DebugState debugState = new DebugState();
-
-    public ObjectValue arrayProto() { return arrayProto; }
-    public ObjectValue booleanProto() { return boolProto; }
-    public ObjectValue functionProto() { return funcProto; }
-    public ObjectValue numberProto() { return numProto; }
-    public ObjectValue objectProto() { return objProto; }
-    public ObjectValue stringProto() { return strProto; }
-    public ObjectValue symbolProto() { return symProto; }
-    public ObjectValue errorProto() { return errProto; }
-    public ObjectValue syntaxErrorProto() { return syntaxErrProto; }
-    public ObjectValue typeErrorProto() { return typeErrProto; }
-    public ObjectValue rangeErrorProto() { return rangeErrProto; }
-
-    public GlobalScope global() { return global; }
-    public NativeTypeRegister typeRegister() { return typeRegister; }
-
-    public void copyFrom(Engine other) {
-        global = other.global;
-        typeRegister = other.typeRegister;
-        arrayProto = other.arrayProto;
-        boolProto = other.boolProto;
-        funcProto = other.funcProto;
-        numProto = other.numProto;
-        objProto = other.objProto;
-        strProto = other.strProto;
-        symProto = other.symProto;
-        errProto = other.errProto;
-        syntaxErrProto = other.syntaxErrProto;
-        typeErrProto = other.typeErrProto;
-        rangeErrProto = other.rangeErrProto;
-    }
-
-    private void runTask(Task task) throws InterruptedException {
-        try {
-            FunctionValue func;
-            if (task.func instanceof FunctionValue) func = (FunctionValue)task.func;
-            else {
-                var raw = (RawFunction)task.func;
-                func = compile(raw.scope, raw.filename, raw.raw);
-            }
-
-            task.notifier.next(func.call(context().mergeData(task.data), task.thisArg, task.args));
-        }
-        catch (InterruptedException e) {
-            task.notifier.error(new RuntimeException(e));
-            throw e;
-        }
-        catch (EngineException e) {
-            task.notifier.error(e);
-        }
-        catch (RuntimeException e) {
-            task.notifier.error(e);
-            e.printStackTrace();
-        }
-    }
-    private void run() {
-        while (true) {
-            try {
-                runTask(macroTasks.take());
-
-                while (!microTasks.isEmpty()) {
-                    runTask(microTasks.take());
-                }
-            }
-            catch (InterruptedException e) {
-                for (var msg : macroTasks) {
-                    msg.notifier.error(new RuntimeException(e));
-                }
-                break;
-            }
-        }
-    }
-
-    public void exposeClass(String name, Class<?> clazz) {
-        global.define(name, true, typeRegister.getConstr(clazz));
-    }
-    public void exposeNamespace(String name, Class<?> clazz) {
-        global.define(name, true, NativeTypeRegister.makeNamespace(clazz));
-    }
-
-    public Thread start() {
-        if (this.thread == null) {
-            this.thread = new Thread(this::run, "JavaScript Runner #" + id);
-            this.thread.start();
-        }
-        return this.thread;
-    }
-    public void stop() {
-        thread.interrupt();
-        thread = null;
-    }
-    public boolean inExecThread() {
-        return Thread.currentThread() == thread;
-    }
-    public boolean isRunning() {
-        return this.thread != null;
-    }
-
-    public Object makeRegex(String pattern, String flags) {
-        throw EngineException.ofError("Regular expressions not supported.");
-    }
-    public ModuleManager modules() {
-        return null;
-    }
-    public ObjectValue getPrototype(Class<?> clazz) {
-        return typeRegister.getProto(clazz);
-    }
-    public CallContext context() { return new CallContext(this).mergeData(callCtxVals); }
-
-    public Awaitable<Object> pushMsg(boolean micro, FunctionValue func, Map<DataKey<?>, Object> data, Object thisArg, Object... args) {
-        var msg = new Task(func, data, thisArg, args);
-        if (micro) microTasks.addLast(msg);
-        else macroTasks.addLast(msg);
-        return msg.notifier;
-    }
-    public Awaitable<Object> pushMsg(boolean micro, GlobalScope scope, Map<DataKey<?>, Object> data, String filename, String raw, Object thisArg, Object... args) {
-        var msg = new Task(new RawFunction(scope, filename, raw), data, thisArg, args);
-        if (micro) microTasks.addLast(msg);
-        else macroTasks.addLast(msg);
-        return msg.notifier;
-    }
-
-    public FunctionValue compile(GlobalScope scope, String filename, String raw) throws InterruptedException {
-        return Parsing.compile(scope, filename, raw);
-    }
-
-    public Engine(NativeTypeRegister register) {
-        this.typeRegister = register;
-        this.callCtxVals.put(DEBUG_STATE_KEY, debugState);
-    }
-    public Engine() {
-        this(new NativeTypeRegister());
-    }
-}
+package me.topchetoeu.jscript.engine;
+
+import java.util.HashMap;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.compilation.FunctionBody;
+import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.events.Awaitable;
+
+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/engine/Environment.java

@@ -0,0 +1,128 @@
+package me.topchetoeu.jscript.engine;
+
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.engine.debug.DebugContext;
+import me.topchetoeu.jscript.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.engine.values.NativeFunction;
+import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.interop.NativeWrapperProvider;
+import me.topchetoeu.jscript.parsing.Parsing;
+
+@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 WrappersProvider 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(args.convert(2, ObjectValue.class).getMember(args.ctx, 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(WrappersProvider 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/engine/EventLoop.java

@@ -0,0 +1,81 @@
+package me.topchetoeu.jscript.engine;
+
+import java.util.concurrent.PriorityBlockingQueue;
+
+import me.topchetoeu.jscript.ResultRunnable;
+import me.topchetoeu.jscript.events.Awaitable;
+import me.topchetoeu.jscript.events.DataNotifier;
+import me.topchetoeu.jscript.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/engine/ExtensionStack.java

@@ -0,0 +1,39 @@
+package me.topchetoeu.jscript.engine;
+
+import me.topchetoeu.jscript.engine.values.Symbol;
+
+public abstract class ExtensionStack implements Extensions {
+    protected abstract Extensions[] extensionStack();
+
+    @Override public <T> void add(Symbol key, T obj) {
+        for (var el : extensionStack()) {
+            if (el != null) {
+                el.add(key, obj);
+                return;
+            }
+        }
+    }
+    @Override public <T> T get(Symbol key) {
+        for (var el : extensionStack()) {
+            if (el != null && el.has(key)) return el.get(key);
+        }
+
+        return null;
+    }
+    @Override public boolean has(Symbol key) {
+        for (var el : extensionStack()) {
+            if (el != null && el.has(key)) return true;
+        }
+
+        return false;
+    }
+    @Override public boolean remove(Symbol key) {
+        var anyRemoved = false;
+
+        for (var el : extensionStack()) {
+            if (el != null) anyRemoved &= el.remove(key);
+        }
+
+        return anyRemoved;
+    }
+}

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

@@ -0,0 +1,34 @@
+package me.topchetoeu.jscript.engine;
+
+import me.topchetoeu.jscript.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));
+        }
+    }
+}

src/me/topchetoeu/jscript/engine/WrappersProvider.java

@@ -0,0 +1,12 @@
+package me.topchetoeu.jscript.engine;
+
+import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.engine.values.ObjectValue;
+
+public interface WrappersProvider {
+    public ObjectValue getProto(Class<?> obj);
+    public ObjectValue getNamespace(Class<?> obj);
+    public FunctionValue getConstr(Class<?> obj);
+
+    public WrappersProvider fork(Environment env);
+}

src/me/topchetoeu/jscript/engine/debug/DebugContext.java

@@ -0,0 +1,100 @@
+package me.topchetoeu.jscript.engine.debug;
+
+import java.util.HashMap;
+import java.util.TreeSet;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.engine.Extensions;
+import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.mapping.SourceMap;
+
+public class DebugContext implements DebugController {
+    public static final Symbol ENV_KEY = Symbol.get("Engine.debug");
+    public static final Symbol IGNORE = Symbol.get("Engine.ignoreDebug");
+
+    private HashMap<Filename, String> sources;
+    private HashMap<Filename, TreeSet<Location>> bpts;
+    private HashMap<Filename, SourceMap> maps;
+    private DebugController debugger;
+
+    public boolean attachDebugger(DebugController debugger) {
+        if (this.debugger != null) return false;
+
+        if (sources != null) {
+            for (var source : sources.entrySet()) debugger.onSource(
+                source.getKey(), source.getValue(),
+                bpts.get(source.getKey()),
+                maps.get(source.getKey())
+            );
+        }
+
+        this.debugger = debugger;
+        return true;
+    }
+    public boolean detachDebugger() {
+        this.debugger = null;
+        return true;
+    }
+
+    public DebugController debugger() {
+        if (debugger == null) return DebugController.empty();
+        else return debugger;
+    }
+
+    @Override public void onFramePop(Context ctx, CodeFrame frame) {
+        if (debugger != null) debugger.onFramePop(ctx, frame);
+    }
+    @Override public void onFramePush(Context ctx, CodeFrame frame) {
+        if (debugger != null) debugger.onFramePush(ctx, frame);
+    }
+    @Override public boolean onInstruction(Context ctx, CodeFrame frame, Instruction instruction, Object returnVal, EngineException error, boolean caught) {
+        if (debugger != null) return debugger.onInstruction(ctx, frame, instruction, returnVal, error, caught);
+        else return false;
+    }
+    @Override public void onSource(Filename filename, String source, TreeSet<Location> breakpoints, SourceMap map) {
+        if (debugger != null) debugger.onSource(filename, source, breakpoints, map);
+        if (sources != null) sources.put(filename, source);
+        if (bpts != null) bpts.put(filename, breakpoints);
+        if (maps != null) maps.put(filename, map);
+    }
+
+    public Location mapToCompiled(Location location) {
+        if (maps == null) return location;
+
+        var map = maps.get(location.filename());
+        if (map == null) return location;
+        return map.toCompiled(location);
+    }
+    public Location mapToOriginal(Location location) {
+        if (maps == null) return location;
+
+        var map = maps.get(location.filename());
+        if (map == null) return location;
+        return map.toOriginal(location);
+    }
+
+    private DebugContext(boolean enabled) {
+        if (enabled) {
+            sources = new HashMap<>();
+            bpts = new HashMap<>();
+            maps = new HashMap<>();
+        }
+    }
+
+    public DebugContext() {
+        this(true);
+    }
+
+    public static boolean enabled(Extensions exts) {
+        return exts.hasNotNull(ENV_KEY) && !exts.has(IGNORE);
+    }
+    public static DebugContext get(Extensions exts) {
+        if (enabled(exts)) return exts.get(ENV_KEY);
+        else return new DebugContext(false);
+    }
+}

src/me/topchetoeu/jscript/engine/debug/DebugController.java

@@ -0,0 +1,62 @@
+package me.topchetoeu.jscript.engine.debug;
+
+import java.util.TreeSet;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.mapping.SourceMap;
+
+public interface DebugController {
+    /**
+     * Called when a script has been loaded
+     * @param filename The name of the source
+     * @param source The name of the source
+     * @param breakpoints A set of all the breakpointable locations in this source
+     * @param map The source map associated with this file. null if this source map isn't mapped
+     */
+    void onSource(Filename filename, String source, TreeSet<Location> breakpoints, SourceMap map);
+
+    /**
+     * Called immediatly before an instruction is executed, as well as after an instruction, if it has threw or returned.
+     * This function might pause in order to await debugging commands.
+     * @param ctx The context of execution
+     * @param frame The frame in which execution is occuring
+     * @param instruction The instruction which was or will be executed
+     * @param loc The most recent location the code frame has been at
+     * @param returnVal The return value of the instruction, Values.NO_RETURN if none
+     * @param error The error that the instruction threw, null if none
+     * @param caught Whether or not the error has been caught
+     * @return Whether or not the frame should restart
+     */
+    boolean onInstruction(Context ctx, CodeFrame frame, Instruction instruction, Object returnVal, EngineException error, boolean caught);
+
+    /**
+     * Called immediatly before a frame has been pushed on the frame stack.
+     * This function might pause in order to await debugging commands.
+     * @param ctx The context of execution
+     * @param frame The code frame which was pushed
+     */
+    void onFramePush(Context ctx, CodeFrame frame);
+    /**
+     * Called immediatly after a frame has been popped out of the frame stack.
+     * This function might pause in order to await debugging commands.
+     * @param ctx The context of execution
+     * @param frame The code frame which was popped out
+     */
+    void onFramePop(Context ctx, CodeFrame frame);
+
+    public static DebugController empty() {
+        return new DebugController () {
+            @Override public void onFramePop(Context ctx, CodeFrame frame) { }
+            @Override public void onFramePush(Context ctx, CodeFrame frame) { }
+            @Override public boolean onInstruction(Context ctx, CodeFrame frame, Instruction instruction, Object returnVal, EngineException error, boolean caught) {
+                return false;
+            }
+            @Override public void onSource(Filename filename, String source, TreeSet<Location> breakpoints, SourceMap map) { }
+        };
+    }
+}

src/me/topchetoeu/jscript/engine/debug/DebugHandler.java

@@ -0,0 +1,33 @@
+package me.topchetoeu.jscript.engine.debug;
+
+import java.io.IOException;
+
+public interface DebugHandler {
+    void enable(V8Message msg) throws IOException;
+    void disable(V8Message msg) throws IOException;
+
+    void setBreakpointByUrl(V8Message msg) throws IOException;
+    void removeBreakpoint(V8Message msg) throws IOException;
+    void continueToLocation(V8Message msg) throws IOException;
+
+    void getScriptSource(V8Message msg) throws IOException;
+    void getPossibleBreakpoints(V8Message msg) throws IOException;
+
+    void resume(V8Message msg) throws IOException;
+    void pause(V8Message msg) throws IOException;
+
+    void stepInto(V8Message msg) throws IOException;
+    void stepOut(V8Message msg) throws IOException;
+    void stepOver(V8Message msg) throws IOException;
+
+    void setPauseOnExceptions(V8Message msg) throws IOException;
+
+    void evaluateOnCallFrame(V8Message msg) throws IOException;
+
+    void getProperties(V8Message msg) throws IOException;
+    void releaseObjectGroup(V8Message msg) throws IOException;
+    void releaseObject(V8Message msg) throws IOException;
+    void callFunctionOn(V8Message msg) throws IOException;
+
+    void runtimeEnable(V8Message msg) throws IOException;
+}

src/me/topchetoeu/jscript/engine/debug/DebugServer.java

@@ -1,154 +1,241 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.security.MessageDigest;
-import java.util.Base64;
-
-import me.topchetoeu.jscript.engine.Engine;
-import me.topchetoeu.jscript.engine.debug.WebSocketMessage.Type;
-import me.topchetoeu.jscript.engine.debug.handlers.DebuggerHandles;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
-
-public class DebugServer {
-    public static String browserDisplayName = "jscript";
-    public static String targetName = "target";
-
-    public final Engine engine;
-
-    private static void send(Socket socket, String val) throws IOException {
-        Http.writeResponse(socket.getOutputStream(), 200, "OK", "application/json", val.getBytes());
-    }
-
-    // SILENCE JAVA
-    private MessageDigest getDigestInstance() {
-        try {
-            return MessageDigest.getInstance("sha1");
-        }
-        catch (Throwable a) { return null; }
-    }
-
-    private static Thread runAsync(Runnable func, String name) {
-        var res = new Thread(func);
-        res.setName(name);
-        res.start();
-        return res;
-    }
-
-    private void handle(WebSocket ws) throws InterruptedException, IOException {
-        WebSocketMessage raw;
-
-        while ((raw = ws.receive()) != null) {
-            if (raw.type != Type.Text) {
-                ws.send(new V8Error("Expected a text message."));
-                continue;
-            }
-
-            V8Message msg;
-
-            try {
-                msg = new V8Message(raw.textData());
-            }
-            catch (SyntaxException e) {
-                ws.send(new V8Error(e.getMessage()));
-                return;
-            }
-
-            switch (msg.name) {
-                case "Debugger.enable": DebuggerHandles.enable(msg, engine, ws); continue;
-                case "Debugger.disable": DebuggerHandles.disable(msg, engine, ws); continue;
-                case "Debugger.stepInto": DebuggerHandles.stepInto(msg, engine, ws); continue;
-            }
-        }
-    }
-    private void onWsConnect(HttpRequest req, Socket socket) throws IOException {
-        var key = req.headers.get("sec-websocket-key");
-
-        if (key == null) {
-            Http.writeResponse(
-                socket.getOutputStream(), 426, "Upgrade Required", "text/txt",
-                "Expected a WS upgrade".getBytes()
-            );
-            return;
-        }
-
-        var resKey = Base64.getEncoder().encodeToString(getDigestInstance().digest(
-            (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes()
-        ));
-
-        Http.writeCode(socket.getOutputStream(), 101, "Switching Protocols");
-        Http.writeHeader(socket.getOutputStream(), "Connection", "Upgrade");
-        Http.writeHeader(socket.getOutputStream(), "Sec-WebSocket-Accept", resKey);
-        Http.writeLastHeader(socket.getOutputStream(), "Upgrade", "WebSocket");
-
-        var ws = new WebSocket(socket);
-
-        runAsync(() -> {
-            try {
-                handle(ws);
-            }
-            catch (InterruptedException e) { return; }
-            catch (IOException e) { e.printStackTrace(); }
-            finally { ws.close(); }
-        }, "Debug Server Message Reader");
-        runAsync(() -> {
-            try {
-                handle(ws);
-            }
-            catch (InterruptedException e) { return; }
-            catch (IOException e) { e.printStackTrace(); }
-            finally { ws.close(); }
-        }, "Debug Server Event Writer");
-    }
-
-    public void open(InetSocketAddress address) throws IOException {
-        ServerSocket server = new ServerSocket();
-        server.bind(address);
-
-        try {
-            while (true) {
-                var socket = server.accept();
-                var req = Http.readRequest(socket.getInputStream());
-
-                switch (req.path) {
-                    case "/json/version":
-                        send(socket, "{\"Browser\":\"" + browserDisplayName + "\",\"Protocol-Version\":\"1.2\"}");
-                        break;
-                    case "/json/list":
-                    case "/json":
-                        var addr = "ws://" + address.getHostString() + ":" + address.getPort() + "/devtools/page/" + targetName;
-                        send(socket, "{\"id\":\"" + browserDisplayName + "\",\"webSocketDebuggerUrl\":\"" + addr + "\"}");
-                        break;
-                    case "/json/new":
-                    case "/json/activate":
-                    case "/json/protocol":
-                    case "/json/close":
-                    case "/devtools/inspector.html":
-                        Http.writeResponse(
-                            socket.getOutputStream(),
-                            501, "Not Implemented", "text/txt",
-                            "This feature isn't (and won't be) implemented.".getBytes()
-                        );
-                        break;
-                    default:
-                        if (req.path.equals("/devtools/page/" + targetName)) onWsConnect(req, socket);
-                        else {
-                            Http.writeResponse(
-                                socket.getOutputStream(),
-                                404, "Not Found", "text/txt",
-                                "Not found :/".getBytes()
-                            );
-                        }
-                        break;
-                }
-            }
-        }
-        finally { server.close(); }
-    }
-
-    public DebugServer(Engine engine) {
-        this.engine = engine;
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.security.MessageDigest;
+import java.util.Base64;
+import java.util.HashMap;
+
+import me.topchetoeu.jscript.Metadata;
+import me.topchetoeu.jscript.Reading;
+import me.topchetoeu.jscript.engine.debug.WebSocketMessage.Type;
+import me.topchetoeu.jscript.events.Notifier;
+import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.json.JSONList;
+import me.topchetoeu.jscript.json.JSONMap;
+
+public class DebugServer {
+    public static String browserDisplayName = Metadata.name() + "/" + Metadata.version();
+
+    public final HashMap<String, DebuggerProvider> targets = new HashMap<>();
+
+    private final byte[] favicon, index, protocol;
+    private final Notifier connNotifier = new Notifier();
+
+    private static void send(HttpRequest req, String val) throws IOException {
+        req.writeResponse(200, "OK", "application/json", val.getBytes());
+    }
+
+    // SILENCE JAVA
+    private MessageDigest getDigestInstance() {
+        try {
+            return MessageDigest.getInstance("sha1");
+        }
+        catch (Throwable e) { throw new RuntimeException(e); }
+    }
+
+    private static Thread runAsync(Runnable func, String name) {
+        var res = new Thread(func);
+        res.setName(name);
+        res.start();
+        return res;
+    }
+
+    private void handle(WebSocket ws, Debugger debugger) throws IOException {
+        WebSocketMessage raw;
+
+        while ((raw = ws.receive()) != null) {
+            if (raw.type != Type.Text) {
+                ws.send(new V8Error("Expected a text message."));
+                continue;
+            }
+
+            V8Message msg;
+
+            try {
+                msg = new V8Message(raw.textData());
+            }
+            catch (SyntaxException e) {
+                ws.send(new V8Error(e.getMessage()));
+                return;
+            }
+
+            switch (msg.name) {
+                case "Debugger.enable":
+                    connNotifier.next();
+                    debugger.enable(msg);
+                    continue;
+                case "Debugger.disable": debugger.close(); continue;
+
+                case "Debugger.setBreakpointByUrl": debugger.setBreakpointByUrl(msg); continue;
+                case "Debugger.removeBreakpoint": debugger.removeBreakpoint(msg); continue;
+                case "Debugger.continueToLocation": debugger.continueToLocation(msg); continue;
+
+                case "Debugger.getScriptSource": debugger.getScriptSource(msg); continue;
+                case "Debugger.getPossibleBreakpoints": debugger.getPossibleBreakpoints(msg); continue;
+
+                case "Debugger.resume": debugger.resume(msg); continue;
+                case "Debugger.pause": debugger.pause(msg); continue;
+
+                case "Debugger.stepInto": debugger.stepInto(msg); continue;
+                case "Debugger.stepOut": debugger.stepOut(msg); continue;
+                case "Debugger.stepOver": debugger.stepOver(msg); continue;
+
+                case "Debugger.setPauseOnExceptions": debugger.setPauseOnExceptions(msg); continue;
+                case "Debugger.evaluateOnCallFrame": debugger.evaluateOnCallFrame(msg); continue;
+
+                case "Runtime.releaseObjectGroup": debugger.releaseObjectGroup(msg); continue;
+                case "Runtime.releaseObject": debugger.releaseObject(msg); continue;
+                case "Runtime.getProperties": debugger.getProperties(msg); continue;
+                case "Runtime.callFunctionOn": debugger.callFunctionOn(msg); continue;
+                // case "NodeWorker.enable": debugger.nodeWorkerEnable(msg); continue;
+                case "Runtime.enable": debugger.runtimeEnable(msg); continue;
+            }
+
+            if (
+                msg.name.startsWith("DOM.") ||
+                msg.name.startsWith("DOMDebugger.") ||
+                msg.name.startsWith("Emulation.") ||
+                msg.name.startsWith("Input.") ||
+                msg.name.startsWith("Network.") ||
+                msg.name.startsWith("Page.")
+            ) ws.send(new V8Error("This isn't a browser..."));
+            else ws.send(new V8Error("This API is not supported yet."));
+        }
+
+        debugger.close();
+    }
+    private void onWsConnect(HttpRequest req, Socket socket, DebuggerProvider debuggerProvider) {
+        var key = req.headers.get("sec-websocket-key");
+
+        if (key == null) {
+            req.writeResponse(
+                426, "Upgrade Required", "text/txt",
+                "Expected a WS upgrade".getBytes()
+            );
+            return;
+        }
+
+        var resKey = Base64.getEncoder().encodeToString(getDigestInstance().digest(
+            (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes()
+        ));
+
+        req.writeCode(101, "Switching Protocols");
+        req.writeHeader("Connection", "Upgrade");
+        req.writeHeader("Sec-WebSocket-Accept", resKey);
+        req.writeLastHeader("Upgrade", "WebSocket");
+
+        var ws = new WebSocket(socket);
+        var debugger = debuggerProvider.getDebugger(ws, req);
+
+        if (debugger == null) {
+            ws.close();
+            return;
+        }
+
+        runAsync(() -> {
+            try { handle(ws, debugger); }
+            catch (RuntimeException | IOException e) {
+                try {
+                    ws.send(new V8Error(e.getMessage()));
+                }
+                catch (IOException e2) { /* Shit outta luck */ }
+            }
+            finally { ws.close(); debugger.close(); }
+        }, "Debug Handler");
+    }
+
+    public void awaitConnection() {
+        connNotifier.await();
+    }
+
+    public void run(InetSocketAddress address) {
+        try {
+            ServerSocket server = new ServerSocket();
+            server.bind(address);
+
+            try {
+                while (true) {
+                    var socket = server.accept();
+                    var req = HttpRequest.read(socket);
+
+                    if (req == null) continue;
+    
+                    switch (req.path) {
+                        case "/json/version":
+                            send(req, "{\"Browser\":\"" + browserDisplayName + "\",\"Protocol-Version\":\"1.1\"}");
+                            break;
+                        case "/json/list":
+                        case "/json": {
+                            var res = new JSONList();
+
+                            for (var el : targets.entrySet()) {
+                                res.add(new JSONMap()
+                                    .set("description", "JScript debugger")
+                                    .set("favicon", "/favicon.ico")
+                                    .set("id", el.getKey())
+                                    .set("type", "node")
+                                    .set("webSocketDebuggerUrl", "ws://" + address.getHostString() + ":" + address.getPort() + "/" + el.getKey())
+                                );
+                            }
+                            send(req, JSON.stringify(res));
+                            break;
+                        }
+                        case "/json/protocol":
+                            req.writeResponse(200, "OK", "application/json", protocol);
+                            break;
+                        case "/json/new":
+                        case "/json/activate":
+                        case "/json/close":
+                        case "/devtools/inspector.html":
+                            req.writeResponse(
+                                501, "Not Implemented", "text/txt",
+                                "This feature isn't (and probably won't be) implemented.".getBytes()
+                            );
+                            break;
+                        case "/":
+                        case "/index.html":
+                            req.writeResponse(200, "OK", "text/html", index);
+                            break;
+                        case "/favicon.ico":
+                            req.writeResponse(200, "OK", "image/png", favicon);
+                            break;
+                        default:
+                            if (req.path.length() > 1 && targets.containsKey(req.path.substring(1))) {
+                                onWsConnect(req, socket, targets.get(req.path.substring(1)));
+                            }
+                            break;
+                    }
+                }
+            }
+            finally { server.close(); }
+        }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+
+    public Thread start(InetSocketAddress address, boolean daemon) {
+        var res = new Thread(() -> run(address), "Debug Server");
+        res.setDaemon(daemon);
+        res.start();
+        return res;
+    }
+
+    public DebugServer() {
+        try {
+            this.favicon = Reading.resourceToStream("assets/debugger/favicon.png").readAllBytes();
+            this.protocol = Reading.resourceToStream("assets/debugger/protocol.json").readAllBytes();
+            this.index = Reading.resourceToString("assets/debugger/index.html")
+                .replace("${NAME}", Metadata.name())
+                .replace("${VERSION}", Metadata.version())
+                .replace("${AUTHOR}", Metadata.author())
+                .getBytes();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}

src/me/topchetoeu/jscript/engine/debug/DebugState.java

@@ -1,52 +0,0 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.engine.BreakpointData;
-import me.topchetoeu.jscript.engine.DebugCommand;
-import me.topchetoeu.jscript.engine.frame.CodeFrame;
-import me.topchetoeu.jscript.events.Event;
-
-public class DebugState {
-    private boolean paused = false;
-
-    public final HashSet<Location> breakpoints = new HashSet<>();
-    public final List<CodeFrame> frames = new ArrayList<>();
-    public final Map<String, String> sources = new HashMap<>();
-
-    public final Event<BreakpointData> breakpointNotifier = new Event<>();
-    public final Event<DebugCommand> commandNotifier = new Event<>();
-    public final Event<String> sourceAdded = new Event<>();
-
-    public DebugState pushFrame(CodeFrame frame) {
-        frames.add(frame);
-        return this;
-    }
-    public DebugState popFrame() {
-        if (frames.size() > 0) frames.remove(frames.size() - 1);
-        return this;
-    }
-
-    public DebugCommand pause(BreakpointData data) throws InterruptedException {
-        paused = true;
-        breakpointNotifier.next(data);
-        return commandNotifier.toAwaitable().await();
-    }
-    public void resume(DebugCommand command) {
-        paused = false;
-        commandNotifier.next(command);
-    }
-
-    // public void addSource()?
-
-    public boolean paused() { return paused; }
-
-    public boolean isBreakpoint(Location loc) {
-        return breakpoints.contains(loc);
-    }
-}

src/me/topchetoeu/jscript/engine/debug/Debugger.java

@@ -0,0 +1,5 @@
+package me.topchetoeu.jscript.engine.debug;
+
+public interface Debugger extends DebugHandler, DebugController {
+    void close();
+}

src/me/topchetoeu/jscript/engine/debug/DebuggerProvider.java

@@ -0,0 +1,5 @@
+package me.topchetoeu.jscript.engine.debug;
+
+public interface DebuggerProvider {
+    Debugger getDebugger(WebSocket socket, HttpRequest req);
+}

src/me/topchetoeu/jscript/engine/debug/Http.java

@@ -1,65 +0,0 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.IllegalFormatException;
-
-// We dont need no http library
-public class Http {
-    public static void writeCode(OutputStream str, int code, String name) throws IOException {
-        str.write(("HTTP/1.1 " + code + " " + name + "\r\n").getBytes());
-    }
-    public static void writeHeader(OutputStream str, String name, String value) throws IOException {
-        str.write((name + ": " + value + "\r\n").getBytes());
-    }
-    public static void writeLastHeader(OutputStream str, String name, String value) throws IOException {
-        str.write((name + ": " + value + "\r\n").getBytes());
-        writeHeadersEnd(str);
-    }
-    public static void writeHeadersEnd(OutputStream str) throws IOException {
-        str.write("\n".getBytes());
-    }
-
-    public static void writeResponse(OutputStream str, int code, String name, String type, byte[] data) throws IOException {
-        writeCode(str, code, name);
-        writeHeader(str, "Content-Type", type);
-        writeLastHeader(str, "Content-Length", data.length + "");
-        str.write(data);
-        str.close();
-    }
-
-    public static HttpRequest readRequest(InputStream str) throws IOException {
-        var lines = new BufferedReader(new InputStreamReader(str));
-        var line = lines.readLine();
-        var i1 = line.indexOf(" ");
-        var i2 = line.lastIndexOf(" ");
-
-        var method = line.substring(0, i1).trim().toUpperCase();
-        var path = line.substring(i1 + 1, i2).trim();
-        var headers = new HashMap<String, String>();
-
-        while (!(line = lines.readLine()).isEmpty()) {
-            var i = line.indexOf(":");
-            if (i < 0) continue;
-            var name = line.substring(0, i).trim().toLowerCase();
-            var value = line.substring(i + 1).trim();
-
-            if (name.length() == 0) continue;
-            headers.put(name, value);
-        }
-
-        if (headers.containsKey("content-length")) {
-            try {
-                var i = Integer.parseInt(headers.get("content-length"));
-                str.skip(i);
-            }
-            catch (IllegalFormatException e) { /* ¯\_(ツ)_/¯ */ }
-        }
-
-        return new HttpRequest(method, path, headers);
-    }
-}

src/me/topchetoeu/jscript/engine/debug/HttpRequest.java

@@ -1,16 +1,102 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import java.util.Map;
-
-public class HttpRequest {
-    public final String method;
-    public final String path;
-    public final Map<String, String> headers;
-
-    public HttpRequest(String method, String path, Map<String, String> headers) {
-        this.method = method;
-        this.path = path;
-        this.headers = headers;
-    }
-}
-
+package me.topchetoeu.jscript.engine.debug;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.IllegalFormatException;
+import java.util.Map;
+
+public class HttpRequest {
+    public final String method;
+    public final String path;
+    public final Map<String, String> headers;
+    public final OutputStream out;
+
+
+    public void writeCode(int code, String name) {
+        try { out.write(("HTTP/1.1 " + code + " " + name + "\r\n").getBytes()); }
+        catch (IOException e) { }
+    }
+    public void writeHeader(String name, String value) {
+        try { out.write((name + ": " + value + "\r\n").getBytes()); }
+        catch (IOException e) { }
+    }
+    public void writeLastHeader(String name, String value) {
+        try { out.write((name + ": " + value + "\r\n\r\n").getBytes()); }
+        catch (IOException e) { }
+    }
+    public void writeHeadersEnd() {
+        try { out.write("\n".getBytes()); }
+        catch (IOException e) { }
+    }
+
+    public void writeResponse(int code, String name, String type, byte[] data) {
+        writeCode(code, name);
+        writeHeader("Content-Type", type);
+        writeLastHeader("Content-Length", data.length + "");
+        try {
+            out.write(data);
+            out.close();
+        }
+        catch (IOException e) { }
+    }
+    public void writeResponse(int code, String name, String type, InputStream data) {
+        try {
+            writeResponse(code, name, type, data.readAllBytes());
+        }
+        catch (IOException e) { }
+    }
+
+    public HttpRequest(String method, String path, Map<String, String> headers, OutputStream out) {
+        this.method = method;
+        this.path = path;
+        this.headers = headers;
+        this.out = out;
+    }
+
+    // We dont need no http library
+    public static HttpRequest read(Socket socket) {
+        try {
+            var str = socket.getInputStream();
+            var lines = new BufferedReader(new InputStreamReader(str));
+            var line = lines.readLine();
+            var i1 = line.indexOf(" ");
+            var i2 = line.indexOf(" ", i1 + 1);
+
+            if (i1 < 0 || i2 < 0) {
+                socket.close();
+                return null;
+            }
+
+            var method = line.substring(0, i1).trim().toUpperCase();
+            var path = line.substring(i1 + 1, i2).trim();
+            var headers = new HashMap<String, String>();
+
+            while (!(line = lines.readLine()).isEmpty()) {
+                var i = line.indexOf(":");
+                if (i < 0) continue;
+                var name = line.substring(0, i).trim().toLowerCase();
+                var value = line.substring(i + 1).trim();
+
+                if (name.length() == 0) continue;
+                headers.put(name, value);
+            }
+
+            if (headers.containsKey("content-length")) {
+                try {
+                    var i = Integer.parseInt(headers.get("content-length"));
+                    str.skip(i);
+                }
+                catch (IllegalFormatException e) { /* ¯\_(ツ)_/¯ */ }
+            }
+
+            return new HttpRequest(method, path, headers, socket.getOutputStream());
+        }
+        catch (IOException | NullPointerException e) { return null; }
+    }
+}
+