Merge pull request #7 from TopchetoEU/TopcehtoEU/debugging

Debugging support

.gitattributes

@@ -1,9 +0,0 @@
-#
-# 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
-

.github/workflows/tagged-release.yml

@@ -14,17 +14,12 @@ jobs:
       - 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,11 @@
 .vscode
 .gradle
 .ignore
-out
-build
-bin
-dst
-/*.js
+/out
+/build
+/bin
+/dst
+/*.js
+!/build.js
+/dead-code
+/Metadata.java

build.js

@@ -0,0 +1,81 @@
+const { spawn } = require('child_process');
+const fs = require('fs/promises');
+const pt = require('path');
+const { argv } = require('process');
+
+const conf = {
+    name: "java-jscript",
+    author: "TopchetoEU",
+    javahome: "",
+    version: argv[3]
+};
+
+console.log(conf)
+
+if (conf.version.startsWith('refs/tags/')) conf.version = conf.version.substring(10);
+if (conf.version.startsWith('v')) conf.version = conf.version.substring(1);
+
+async function* find(src, dst, wildcard) {
+    const stat = await fs.stat(src);
+
+    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(cmd, ...args) {
+    return new Promise((res, rej) => {
+        const proc = spawn(cmd, args, { stdio: 'inherit' });
+        proc.once('exit', code => {
+            if (code === 0) res(code);
+            else rej(new Error(`Process ${cmd} exited with code ${code}.`));
+        });
+    })
+}
+
+async function compileJava() {
+    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');
+    
+        for await (const path of find('src', undefined, v => v.endsWith('.java') && !v.endsWith('Metadata.java'))) args.push(path);
+        await run(conf.javahome + 'javac', ...args);
+    }
+    finally {
+        await fs.rm('Metadata.java');
+    }
+}
+
+(async () => {
+    try {
+        try { await fs.rm('dst', { recursive: true }); } catch {}
+        await copy('src', 'dst/classes', v => !v.endsWith('.java'));
+        await compileJava();
+        await run('jar', '-c', '-f', 'dst/jscript.jar', '-e', 'me.topchetoeu.jscript.Main', '-C', 'dst/classes', '.');
+    }
+    catch (e) {
+        if (argv[2] === 'debug') throw e;
+        else console.log(e.toString());
+    }
+})();

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/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/me/topchetoeu/jscript/Filename.java

@@ -0,0 +1,52 @@
+package me.topchetoeu.jscript;
+
+import java.io.File;
+
+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 static Filename fromFile(File file) {
+        return new Filename("file", file.getAbsolutePath());
+    }
+
+
+    public Filename(String protocol, String path) {
+        this.protocol = protocol;
+        this.path = path;
+    }
+}

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", "internal"));
     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,7 +55,18 @@ 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;

src/me/topchetoeu/jscript/Main.java

@@ -1,113 +1,104 @@
 package me.topchetoeu.jscript;
 
-import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Map;
 
+import me.topchetoeu.jscript.engine.Context;
 import me.topchetoeu.jscript.engine.Engine;
+import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.engine.debug.DebugServer;
+import me.topchetoeu.jscript.engine.debug.SimpleDebugger;
+import me.topchetoeu.jscript.engine.values.NativeFunction;
 import me.topchetoeu.jscript.engine.values.Values;
 import me.topchetoeu.jscript.events.Observer;
 import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.exceptions.InterruptException;
 import me.topchetoeu.jscript.exceptions.SyntaxException;
-import me.topchetoeu.jscript.polyfills.PolyfillEngine;
-import me.topchetoeu.jscript.polyfills.TypescriptEngine;
+import me.topchetoeu.jscript.exceptions.UncheckedException;
+import me.topchetoeu.jscript.lib.Internals;
 
 public class Main {
-    static Thread task;
+    static Thread engineTask, debugTask;
     static Engine engine;
+    static Environment env;
+    static int j = 0;
 
     private static Observer<Object> valuePrinter = new Observer<Object>() {
         public void next(Object data) {
-            try {
-                Values.printValue(engine.context(), data);
-            }
-            catch (InterruptedException e) { }
+            Values.printValue(null, data);
             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;
-            }
+            Values.printError(err, null);
+        }
+
+        @Override
+        public void finish() {
+            engineTask.interrupt();
         }
     };
 
     public static void main(String args[]) {
-        var in = new BufferedReader(new InputStreamReader(System.in));
-        engine = new TypescriptEngine(new File("."));
-        var scope = engine.global().globalChild();
+        System.out.println(String.format("Running %s v%s by %s", Metadata.NAME, Metadata.VERSION, Metadata.AUTHOR));
+        engine = new Engine();
+
+        env = new Environment(null, null, null);
         var exited = new boolean[1];
+        var server = new DebugServer();
+        server.targets.put("target", (ws, req) -> SimpleDebugger.get(ws, engine));
 
-        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");
-            }
-        });
+        engine.pushMsg(false, null, new NativeFunction((ctx, thisArg, _a) -> {
+            new Internals().apply(env);
+
+            env.global.define("exit", _ctx -> {
+                exited[0] = true;
+                throw new InterruptException();
+            });
+            env.global.define("go", _ctx -> {
+                try {
+                    var f = Path.of("do.js");
+                    var func = _ctx.compile(new Filename("do", "do/" + j++ + ".js"), new String(Files.readAllBytes(f)));
+                    return func.call(_ctx);
+                }
+                catch (IOException e) {
+                    throw new EngineException("Couldn't open do.js");
+                }
+            });
+
+            return null;
+        }), null);
+
+        engineTask = engine.start();
+        debugTask = server.start(new InetSocketAddress("127.0.0.1", 9229), true);
 
-        task = engine.start();
         var reader = new Thread(() -> {
             try {
-                while (true) {
+                for (var i = 0; ; i++) {
                     try {
-                        var raw = in.readLine();
+                        var raw = Reading.read();
 
                         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]");
-                        }
+                        valuePrinter.next(engine.pushMsg(false, new Context(engine).pushEnv(env), new Filename("jscript", "repl/" + i + ".js"), raw, null).await());
                     }
+                    catch (EngineException e) { Values.printError(e, ""); }
                 }
             }
-            catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
+            catch (IOException e) { 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();
+                if (!exited[0]) {
+                    System.out.println("Internal error ocurred:");
+                    ex.printStackTrace();
+                }
             }
-            catch (InterruptedException e) { return; }
-            if (exited[0]) return;
+            catch (Throwable e) { throw new UncheckedException(e); }
+            if (exited[0]) debugTask.interrupt();
         });
         reader.setDaemon(true);
         reader.setName("STD Reader");

src/me/topchetoeu/jscript/Metadata.java

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

src/me/topchetoeu/jscript/Reading.java

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

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

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

@@ -1,7 +1,6 @@
 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;
@@ -12,16 +11,7 @@ import me.topchetoeu.jscript.engine.scope.ScopeRecord;
 
 public class CompoundStatement extends Statement {
     public final Statement[] statements;
-
-    @Override
-    public boolean pollutesStack() {
-        for (var stm : statements) {
-            if (stm instanceof FunctionStatement) continue;
-            return true;
-        }
-
-        return false;
-    }
+    public Location end;
 
     @Override
     public void declare(ScopeRecord varsScope) {
@@ -31,28 +21,33 @@ public class CompoundStatement extends Statement {
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         for (var stm : statements) {
             if (stm instanceof FunctionStatement) {
                 int start = target.size();
                 ((FunctionStatement)stm).compile(target, scope, null, true);
-                target.get(start).setDebug(true);
+                target.setDebug(start);
                 target.add(Instruction.discard());
             }
         }
 
         for (var i = 0; i < statements.length; i++) {
             var stm = statements[i];
-            
+
             if (stm instanceof FunctionStatement) continue;
-            if (i != statements.length - 1) stm.compileNoPollution(target, scope, true);
-            else stm.compileWithPollution(target, scope);
+            if (i != statements.length - 1) stm.compileWithDebug(target, scope, false);
+            else stm.compileWithDebug(target, scope, pollute);
+        }
+
+        if (end != null) {
+            target.add(Instruction.nop().locate(end));
+            target.setDebug();
         }
     }
 
     @Override
     public Statement optimize() {
-        var res = new ArrayList<Statement>();
+        var res = new Vector<Statement>(statements.length);
 
         for (var i = 0; i < statements.length; i++) {
             var stm = statements[i].optimize();
@@ -70,7 +65,12 @@ public class CompoundStatement extends Statement {
         else return new CompoundStatement(loc(), res.toArray(Statement[]::new));
     }
 
-    public CompoundStatement(Location loc, Statement... statements) {
+    public CompoundStatement setEnd(Location loc) {
+        this.end = loc;
+        return this;
+    }
+
+    public CompoundStatement(Location loc, Statement ...statements) {
         super(loc);
         this.statements = statements;
     }

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

@@ -1,7 +1,5 @@
 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;
@@ -10,13 +8,9 @@ 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());
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.compile(target, scope, false);
+        
     }
     @Override
     public Statement optimize() {

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

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

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

@@ -7,7 +7,6 @@ import me.topchetoeu.jscript.exceptions.SyntaxException;
 public class Instruction {
     public static enum Type {
         RETURN,
-        SIGNAL,
         THROW,
         THROW_SYNTAX,
         DELETE,
@@ -91,16 +90,11 @@ public class Instruction {
     public final Type type;
     public final Object[] params;
     public Location location;
-    public boolean debugged;
 
     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,7 +123,7 @@ 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;
@@ -153,21 +147,7 @@ public class Instruction {
     public static Instruction debug() {
         return new Instruction(null, Type.NOP, "debug");
     }
-    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);
-    }
-
-    /**
-     * 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) {
         for (var param : params) {
             if (param instanceof String) continue;
@@ -221,9 +201,9 @@ public class Instruction {
     public static Instruction loadRegex(String pattern, String flags) {
         return new Instruction(null, Type.LOAD_REGEX, pattern, flags);
     }
-    public static Instruction loadFunc(int instrN, int varN, int len, int[] captures) {
+    public static Instruction loadFunc(long id, int varN, int len, int[] captures) {
         var args = new Object[3 + captures.length];
-        args[0] = instrN;
+        args[0] = id;
         args[1] = varN;
         args[2] = len;
         for (var i = 0; i < captures.length; i++) args[i + 3] = captures[i];

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

@@ -1,36 +1,20 @@
 package me.topchetoeu.jscript.compilation;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
 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 abstract void compile(CompileTarget target, ScopeRecord scope, boolean pollute);
     public void declare(ScopeRecord varsScope) { }
     public Statement optimize() { return this; }
 
-    public void compileNoPollution(List<Instruction> target, ScopeRecord scope, boolean debug) {
+    public void compileWithDebug(CompileTarget target, ScopeRecord scope, boolean pollute) {
         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()));
-    }
-    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);
+        compile(target, scope, pollute);
+        if (target.size() != start) target.setDebug(start);
     }
 
     public Location loc() { return _loc; }

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

@@ -10,17 +10,17 @@ 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) {
+        public Pair(String name, Statement value, Location location) {
             this.name = name;
             this.value = value;
+            this.location = location;
         }
     }
 
     public final List<Pair> values;
 
-    @Override
-    public boolean pollutesStack() { return false; }
     @Override
     public void declare(ScopeRecord varsScope) {
         for (var key : values) {
@@ -28,21 +28,27 @@ public class VariableDeclareStatement extends Statement {
         }
     }
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    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((String)key).locate(loc()));
+            int start = target.size();
+
+            if (key instanceof String) target.add(Instruction.makeVar((String)key).locate(entry.location));
 
             if (entry.value instanceof FunctionStatement) {
                 ((FunctionStatement)entry.value).compile(target, scope, entry.name, false);
-                target.add(Instruction.storeVar(key).locate(loc()));
+                target.add(Instruction.storeVar(key).locate(entry.location));
             }
             else if (entry.value != null) {
-                entry.value.compileWithPollution(target, scope);
-                target.add(Instruction.storeVar(key).locate(loc()));
+                entry.value.compile(target, scope, true);
+                target.add(Instruction.storeVar(key).locate(entry.location));
             }
+
+            if (target.size() != start) target.setDebug(start);
         }
+
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     public VariableDeclareStatement(Location loc, List<Pair> values) {

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

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

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 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;
@@ -11,11 +10,9 @@ public class BreakStatement extends Statement {
     public final String label;
 
     @Override
-    public boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         target.add(Instruction.nop("break", label).locate(loc()));
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     public BreakStatement(Location loc, String label) {

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 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;
@@ -11,11 +10,9 @@ public class ContinueStatement extends Statement {
     public final String label;
 
     @Override
-    public boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         target.add(Instruction.nop("cont", label).locate(loc()));
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     public ContinueStatement(Location loc, String label) {

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

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

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 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;
@@ -12,13 +11,12 @@ public class DeleteStatement extends Statement {
     public final Statement value;
 
     @Override
-    public boolean pollutesStack() { return true; }
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.compile(target, scope, true);
+        key.compile(target, scope, true);
 
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        value.compile(target, scope);
-        key.compile(target, scope);
         target.add(Instruction.delete().locate(loc()));
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
     public DeleteStatement(Location loc, Statement key, Statement value) {

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.CompoundStatement;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
@@ -14,19 +13,16 @@ 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) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (condition instanceof ConstantStatement) {
             int start = target.size();
-            body.compileNoPollution(target, scope);
+            body.compile(target, scope, false);
             int end = target.size();
             if (Values.toBoolean(((ConstantStatement)condition).value)) {
                 WhileStatement.replaceBreaks(target, label, start, end, end + 1, end + 1);
@@ -35,13 +31,14 @@ public class DoWhileStatement extends Statement {
                 target.add(Instruction.jmp(start - end).locate(loc()));
                 WhileStatement.replaceBreaks(target, label, start, end, start, end + 1);
             }
+            if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
             return;
         }
 
         int start = target.size();
-        body.compileNoPollution(target, scope, true);
+        body.compileWithDebug(target, scope, false);
         int mid = target.size();
-        condition.compileWithPollution(target, scope);
+        condition.compile(target, scope, true);
         int end = target.size();
 
         WhileStatement.replaceBreaks(target, label, start, mid - 1, mid, end + 1);

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 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;
@@ -14,9 +13,6 @@ public class ForInStatement extends Statement {
     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);
@@ -24,16 +20,16 @@ public class ForInStatement extends Statement {
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         var key = scope.getKey(varName);
         if (key instanceof String) target.add(Instruction.makeVar((String)key));
 
         if (varValue != null) {
-            varValue.compileWithPollution(target, scope);
+            varValue.compile(target, scope, true);
             target.add(Instruction.storeVar(scope.getKey(varName)));
         }
 
-        object.compileWithPollution(target, scope);
+        object.compile(target, scope, true);
         target.add(Instruction.keys());
         
         int start = target.size();
@@ -58,8 +54,7 @@ public class ForInStatement extends Statement {
 
         for (var i = start; i < target.size(); i++) target.get(i).locate(loc());
 
-        body.compileNoPollution(target, scope, true);
-
+        body.compileWithDebug(target, scope, false);
 
         int end = target.size();
 
@@ -68,6 +63,7 @@ public class ForInStatement extends Statement {
         target.add(Instruction.jmp(start - end).locate(loc()));
         target.add(Instruction.discard().locate(loc()));
         target.set(mid, Instruction.jmpIf(end - mid + 1).locate(loc()));
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     public ForInStatement(Location loc, String label, boolean isDecl, String varName, Statement varValue, Statement object, Statement body) {

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

@@ -1,9 +1,8 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.CompoundStatement;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.values.ConstantStatement;
@@ -14,44 +13,43 @@ 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);
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        declaration.compile(target, scope, false);
 
         if (condition instanceof ConstantStatement) {
             if (Values.toBoolean(((ConstantStatement)condition).value)) {
                 int start = target.size();
-                body.compileNoPollution(target, scope);
+                body.compile(target, scope, false);
                 int mid = target.size();
-                assignment.compileNoPollution(target, scope, true);
+                assignment.compileWithDebug(target, scope, false);
                 int end = target.size();
                 WhileStatement.replaceBreaks(target, label, start, mid, mid, end + 1);
                 target.add(Instruction.jmp(start - target.size()).locate(loc()));
-                return;
+                if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
             }
+            return;
         }
 
         int start = target.size();
-        condition.compileWithPollution(target, scope);
+        condition.compile(target, scope, true);
         int mid = target.size();
         target.add(Instruction.nop());
-        body.compileNoPollution(target, scope);
+        body.compile(target, scope, false);
         int beforeAssign = target.size();
-        assignment.compile(target, scope);
+        assignment.compileWithDebug(target, scope, false);
         int end = target.size();
 
         WhileStatement.replaceBreaks(target, label, mid + 1, end, beforeAssign, end + 1);
 
         target.add(Instruction.jmp(start - end).locate(loc()));
         target.set(mid, Instruction.jmpIfNot(end - mid + 1).locate(loc()));
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
     @Override
     public Statement optimize() {

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.CompoundStatement;
 import me.topchetoeu.jscript.compilation.DiscardStatement;
 import me.topchetoeu.jscript.compilation.Instruction;
@@ -14,9 +13,6 @@ 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);
@@ -24,33 +20,34 @@ public class IfStatement extends Statement {
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (condition instanceof ConstantStatement) {
             if (Values.not(((ConstantStatement)condition).value)) {
-                if (elseBody != null) elseBody.compileNoPollution(target, scope, true);
+                if (elseBody != null) elseBody.compileWithDebug(target, scope, pollute);
             }
             else {
-                body.compileNoPollution(target, scope, true);
+                body.compileWithDebug(target, scope, pollute);
             }
 
             return;
         }
 
-        condition.compileWithPollution(target, scope);
+        condition.compile(target, scope, true);
+
         if (elseBody == null) {
             int i = target.size();
             target.add(Instruction.nop());
-            body.compileNoPollution(target, scope, true);
+            body.compileWithDebug(target, scope, pollute);
             int endI = target.size();
             target.set(i, Instruction.jmpIfNot(endI - i).locate(loc()));
         }
         else {
             int start = target.size();
             target.add(Instruction.nop());
-            body.compileNoPollution(target, scope, true);
+            body.compileWithDebug(target, scope, pollute);
             target.add(Instruction.nop());
             int mid = target.size();
-            elseBody.compileNoPollution(target, scope, true);
+            elseBody.compileWithDebug(target, scope, pollute);
             int end = target.size();
 
             target.set(start, Instruction.jmpIfNot(mid - start).locate(loc()));

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 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;
@@ -11,12 +10,9 @@ public class ReturnStatement extends Statement {
     public final Statement value;
 
     @Override
-    public boolean pollutesStack() { return false; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (value == null) target.add(Instruction.loadValue(null).locate(loc()));
-        else value.compileWithPollution(target, scope);
+        else value.compile(target, scope, true);
         target.add(Instruction.ret().locate(loc()));
     }
 

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

@@ -1,9 +1,9 @@
 package me.topchetoeu.jscript.compilation.control;
 
 import java.util.HashMap;
-import java.util.List;
 
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.compilation.Instruction.Type;
@@ -21,9 +21,6 @@ public class SwitchStatement extends Statement {
         }
     }
 
-    @Override
-    public boolean pollutesStack() { return false; }
-
     public final Statement value;
     public final SwitchCase[] cases;
     public final Statement[] body;
@@ -35,15 +32,15 @@ public class SwitchStatement extends Statement {
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         var caseMap = new HashMap<Integer, Integer>();
         var stmIndexMap = new HashMap<Integer, Integer>();
 
-        value.compile(target, scope);
+        value.compile(target, scope, true);
 
         for (var ccase : cases) {
             target.add(Instruction.dup().locate(loc()));
-            ccase.value.compileWithPollution(target, scope);
+            ccase.value.compile(target, scope, true);
             target.add(Instruction.operation(Operation.EQUALS).locate(loc()));
             caseMap.put(target.size(), ccase.statementI);
             target.add(Instruction.nop());
@@ -55,7 +52,7 @@ public class SwitchStatement extends Statement {
 
         for (var stm : body) {
             stmIndexMap.put(stmIndexMap.size(), target.size());
-            stm.compileNoPollution(target, scope, true);
+            stm.compileWithDebug(target, scope, false);
         }
 
         if (defaultI < 0 || defaultI >= body.length) target.set(start, Instruction.jmp(target.size() - start).locate(loc()));
@@ -66,15 +63,13 @@ public class SwitchStatement extends Statement {
             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.set(el.getKey(), Instruction.jmpIf(i - el.getKey()).locate(loc));
+            target.setDebug(el.getKey());
         }
 
         target.add(Instruction.discard().locate(loc()));

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 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;
@@ -11,11 +10,8 @@ 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);
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        value.compile(target, scope, true);
         target.add(Instruction.throwInstr().locate(loc()));
     }
 

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.control;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.engine.scope.GlobalScope;
@@ -15,9 +14,6 @@ public class TryStatement extends Statement {
     public final Statement finallyBody;
     public final String name;
 
-    @Override
-    public boolean pollutesStack() { return false; }
-
     @Override
     public void declare(ScopeRecord globScope) {
         tryBody.declare(globScope);
@@ -26,42 +22,31 @@ public class TryStatement extends Statement {
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         target.add(Instruction.nop());
 
         int start = target.size(), tryN, catchN = -1, finN = -1;
 
-        tryBody.compileNoPollution(target, scope);
+        tryBody.compile(target, scope, false);
         tryN = target.size() - start;
 
         if (catchBody != null) {
             int tmp = target.size();
             var local = scope instanceof GlobalScope ? scope.child() : (LocalScopeRecord)scope;
             local.define(name, true);
-            catchBody.compileNoPollution(target, scope);
+            catchBody.compile(target, scope, false);
             local.undefine();
             catchN = target.size() - tmp;
         }
 
         if (finallyBody != null) {
             int tmp = target.size();
-            finallyBody.compileNoPollution(target, scope);
+            finallyBody.compile(target, scope, false);
             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()));
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     public TryStatement(Location loc, Statement tryBody, Statement catchBody, Statement finallyBody, String name) {

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

@@ -1,9 +1,8 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.CompoundStatement;
 import me.topchetoeu.jscript.compilation.DiscardStatement;
 import me.topchetoeu.jscript.compilation.Instruction;
@@ -16,19 +15,16 @@ 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) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (condition instanceof ConstantStatement) {
             if (Values.toBoolean(((ConstantStatement)condition).value)) {
                 int start = target.size();
-                body.compileNoPollution(target, scope);
+                body.compile(target, scope, false);
                 int end = target.size();
                 replaceBreaks(target, label, start, end, start, end + 1);
                 target.add(Instruction.jmp(start - target.size()).locate(loc()));
@@ -37,10 +33,10 @@ public class WhileStatement extends Statement {
         }
 
         int start = target.size();
-        condition.compileWithPollution(target, scope);
+        condition.compile(target, scope, true);
         int mid = target.size();
         target.add(Instruction.nop());
-        body.compileNoPollution(target, scope);
+        body.compile(target, scope, false);
 
         int end = target.size();
 
@@ -48,6 +44,7 @@ public class WhileStatement extends Statement {
 
         target.add(Instruction.jmp(start - end).locate(loc()));
         target.set(mid, Instruction.jmpIfNot(end - mid + 1).locate(loc()));
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
     @Override
     public Statement optimize() {
@@ -70,7 +67,7 @@ public class WhileStatement extends Statement {
         this.body = body;
     }
 
-    public static void replaceBreaks(List<Instruction> target, String label, int start, int end, int continuePoint, int breakPoint) {
+    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))) {
@@ -81,14 +78,6 @@ public class WhileStatement extends Statement {
                 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;
-            }
         }
     }
 

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 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;
@@ -12,31 +11,28 @@ public class CallStatement extends Statement {
     public final Statement[] args;
 
     @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (func instanceof IndexStatement) {
-            ((IndexStatement)func).compile(target, scope, true);
+            ((IndexStatement)func).compile(target, scope, true, true);
         }
         else {
             target.add(Instruction.loadValue(null).locate(loc()));
-            func.compileWithPollution(target, scope);
+            func.compile(target, scope, true);
         }
 
-        for (var arg : args) {
-            arg.compileWithPollution(target, scope);
-        }
+        for (var arg : args) arg.compile(target, scope, true);
 
-        target.add(Instruction.call(args.length).locate(loc()).setDebug(true));
+        target.add(Instruction.call(args.length).locate(loc()));
+        target.setDebug();
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
-    public CallStatement(Location loc, Statement func, Statement... args) {
+    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) {
+    public CallStatement(Location loc, Statement obj, Object key, Statement ...args) {
         super(loc);
         this.func = new IndexStatement(loc, obj, new ConstantStatement(loc, key));
         this.args = args;

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

@@ -1,9 +1,8 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.engine.Operation;
@@ -15,11 +14,9 @@ public class ChangeStatement extends Statement {
     public final boolean postfix;
 
     @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         value.toAssign(new ConstantStatement(loc(), -addAmount), Operation.SUBTRACT).compile(target, scope, postfix);
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
     public ChangeStatement(Location loc, AssignableStatement value, double addAmount, boolean 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,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 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;
@@ -10,14 +9,12 @@ 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 void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (pollute) target.add(Instruction.loadValue(value).locate(loc()));
     }
 
     public ConstantStatement(Location loc, Object val) {

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

@@ -1,9 +1,11 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
+import java.util.Random;
 
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.CompoundStatement;
+import me.topchetoeu.jscript.compilation.FunctionBody;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.compilation.Instruction.Type;
@@ -15,30 +17,30 @@ public class FunctionStatement extends Statement {
     public final String name;
     public final String[] args;
 
+    private static Random rand = new Random();
+
     @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) {
+    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") || target.get(i).is(0, "try_break")) {
+                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") || target.get(i).is(0, "try_cont")) {
+                if (target.get(i).is(0, "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) {
+    public void compile(CompileTarget target, ScopeRecord scope, String name, boolean isStatement) {
         for (var i = 0; i < args.length; i++) {
             for (var j = 0; j < i; j++) {
                 if (args[i].equals(args[j])){
@@ -50,32 +52,32 @@ public class FunctionStatement extends Statement {
         var subscope = scope.child();
 
         int start = target.size();
+        var funcTarget = new CompileTarget(target.functions, target.breakpoints);
 
-        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()));
+                funcTarget.add(Instruction.loadVar(argsVar).locate(loc()));
+                funcTarget.add(Instruction.loadMember(i).locate(loc()));
+                funcTarget.add(Instruction.storeVar(subscope.define(args[i])).locate(loc()));
             }
         }
 
         if (!isStatement && this.name != null) {
-            target.add(Instruction.storeSelfFunc((int)subscope.define(this.name)));
+            funcTarget.add(Instruction.storeSelfFunc((int)subscope.define(this.name)));
         }
 
         body.declare(subscope);
-        target.add(Instruction.debugVarNames(subscope.locals()));
-        body.compile(target, subscope);
+        body.compile(funcTarget, subscope, false);
+        funcTarget.add(Instruction.ret().locate(loc()));
+        checkBreakAndCont(funcTarget, start);
 
-        checkBreakAndCont(target, start);
+        var id = rand.nextLong();
 
-        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()));
+        target.add(Instruction.loadFunc(id, subscope.localsCount(), args.length, subscope.getCaptures()).locate(loc()));
+        target.functions.put(id, new FunctionBody(funcTarget.array(), subscope.captures(), subscope.locals()));
 
         if (name == null) name = this.name;
 
@@ -90,12 +92,14 @@ public class FunctionStatement extends Statement {
             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()));
+            target.add(Instruction.storeVar(scope.getKey(this.name), false).locate(loc()));
         }
+
     }
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         compile(target, scope, null, false);
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
     public FunctionStatement(Location loc, String name, String[] args, CompoundStatement body) {

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

@@ -1,21 +1,18 @@
 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.CompileTarget;
 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 void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (pollute) target.add(Instruction.loadGlob().locate(loc()));
     }
 
     public GlobalThisStatement(Location loc) {

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

@@ -1,51 +1,40 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.engine.Operation;
 import me.topchetoeu.jscript.engine.scope.ScopeRecord;
 
-public class IndexAssignStatement extends AssignStatement {
+public class IndexAssignStatement extends Statement {
     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;
-
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (operation != null) {
-            object.compileWithPollution(target, scope);
-            index.compileWithPollution(target, scope);
+            object.compile(target, scope, true);
+            index.compile(target, scope, true);
             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);
+            value.compile(target, scope, true);
             target.add(Instruction.operation(operation).locate(loc()));
 
-            target.add(Instruction.storeMember(!retPrevValue).locate(loc()).setDebug(true));
+            target.add(Instruction.storeMember(pollute).locate(loc()));
+            target.setDebug();
         }
         else {
-            object.compileWithPollution(target, scope);
-            if (retPrevValue) target.add(Instruction.dup().locate(loc()));
-            index.compileWithPollution(target, scope);
-            value.compileWithPollution(target, scope);
+            object.compile(target, scope, true);
+            index.compile(target, scope, true);
+            value.compile(target, scope, true);
 
-            target.add(Instruction.storeMember(!retPrevValue).locate(loc()).setDebug(true));
+            target.add(Instruction.storeMember(pollute).locate(loc()));
+            target.setDebug();
         }
-        target.get(start);
     }
 
     public IndexAssignStatement(Location loc, Statement object, Statement index, Statement value, Operation operation) {

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

@@ -1,10 +1,8 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.engine.Operation;
@@ -14,31 +12,30 @@ 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) {
+    public Statement 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);
+    public void compile(CompileTarget target, ScopeRecord scope, boolean dupObj, boolean pollute) {
+        object.compile(target, scope, true);
         if (dupObj) target.add(Instruction.dup().locate(loc()));
         if (index instanceof ConstantStatement) {
             target.add(Instruction.loadMember(((ConstantStatement)index).value).locate(loc()));
+            target.setDebug();
             return;
         }
 
-        index.compileWithPollution(target, scope);
+        index.compile(target, scope, true);
         target.add(Instruction.loadMember().locate(loc()));
-        target.get(start).setDebug(true);
+        target.setDebug();
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        compile(target, scope, false);
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        compile(target, scope, false, pollute);
     }
 
     public IndexStatement(Location loc, Statement object, Statement index) {

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 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;
@@ -11,29 +10,27 @@ 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) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (first instanceof ConstantStatement) {
             if (Values.not(((ConstantStatement)first).value)) {
-                first.compileWithPollution(target, scope);
+                first.compile(target, scope, pollute);
             }
-            else second.compileWithPollution(target, scope);
+            else second.compile(target, scope, pollute);
             return;
         }
 
-        first.compileWithPollution(target, scope);
-        target.add(Instruction.dup().locate(loc()));
+        first.compile(target, scope, true);
+        if (pollute) target.add(Instruction.dup().locate(loc()));
         int start = target.size();
         target.add(Instruction.nop());
         target.add(Instruction.discard().locate(loc()));
-        second.compileWithPollution(target, scope);
+        second.compile(target, scope, pollute);
         target.set(start, Instruction.jmpIfNot(target.size() - start).locate(loc()));
     }
 

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 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;
@@ -11,29 +10,27 @@ 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) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (first instanceof ConstantStatement) {
             if (Values.not(((ConstantStatement)first).value)) {
-                second.compileWithPollution(target, scope);
+                second.compile(target, scope, pollute);
             }
-            else first.compileWithPollution(target, scope);
+            else first.compile(target, scope, pollute);
             return;
         }
 
-        first.compileWithPollution(target, scope);
-        target.add(Instruction.dup().locate(loc()));
+        first.compile(target, scope, true);
+        if (pollute) target.add(Instruction.dup().locate(loc()));
         int start = target.size();
         target.add(Instruction.nop());
         target.add(Instruction.discard().locate(loc()));
-        second.compileWithPollution(target, scope);
+        second.compile(target, scope, pollute);
         target.set(start, Instruction.jmpIf(target.size() - start).locate(loc()));
     }
 

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

@@ -1,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 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;
@@ -12,19 +11,16 @@ public class NewStatement extends Statement {
     public final Statement[] args;
 
     @Override
-    public boolean pollutesStack() { return true; }
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        func.compile(target, scope, true);
 
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
-        func.compileWithPollution(target, scope);
-        for (var arg : args) {
-            arg.compileWithPollution(target, scope);
-        }
+        for (var arg : args) arg.compile(target, scope, true);
 
-        target.add(Instruction.callNew(args.length).locate(loc()).setDebug(true));
+        target.add(Instruction.callNew(args.length).locate(loc()));
+        target.setDebug();
     }
 
-    public NewStatement(Location loc, Statement func, Statement... args) {
+    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,10 +1,10 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.engine.scope.ScopeRecord;
@@ -15,10 +15,7 @@ public class ObjectStatement extends Statement {
     public final Map<Object, FunctionStatement> setters;
 
     @Override
-    public boolean pollutesStack() { return true; }
-
-    @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         target.add(Instruction.loadObj().locate(loc()));
 
         for (var el : map.entrySet()) {
@@ -26,7 +23,7 @@ public class ObjectStatement extends Statement {
             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);
+            else val.compile(target, scope, true);
             target.add(Instruction.storeMember().locate(loc()));
         }
 
@@ -38,14 +35,16 @@ public class ObjectStatement extends Statement {
             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);
+            if (getters.containsKey(key)) getters.get(key).compile(target, scope, true);
             else target.add(Instruction.loadValue(null).locate(loc()));
 
-            if (setters.containsKey(key)) setters.get(key).compileWithPollution(target, scope);
+            if (setters.containsKey(key)) setters.get(key).compile(target, scope, true);
             else target.add(Instruction.loadValue(null).locate(loc()));
 
             target.add(Instruction.defProp().locate(loc()));
         }
+
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
     public ObjectStatement(Location loc, Map<Object, Statement> map, Map<Object, FunctionStatement> getters, Map<Object, FunctionStatement> setters) {

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

@@ -1,12 +1,10 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.compilation.control.ThrowStatement;
-import me.topchetoeu.jscript.engine.CallContext;
 import me.topchetoeu.jscript.engine.Operation;
 import me.topchetoeu.jscript.engine.scope.ScopeRecord;
 import me.topchetoeu.jscript.engine.values.Values;
@@ -17,15 +15,15 @@ public class OperationStatement extends Statement {
     public final Operation operation;
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         for (var arg : args) {
-            arg.compileWithPollution(target, scope);
+            arg.compile(target, scope, true);
         }
-        target.add(Instruction.operation(operation).locate(loc()));
+
+        if (pollute) target.add(Instruction.operation(operation).locate(loc()));
+        else target.add(Instruction.discard().locate(loc()));
     }
 
-    @Override
-    public boolean pollutesStack() { return true; }
     @Override
     public boolean pure() {
         for (var arg : args) {
@@ -51,53 +49,15 @@ public class OperationStatement extends Statement {
                 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; }
+            try { return new ConstantStatement(loc(), Values.operation(null, operation, vals)); }
+            catch (EngineException e) { return new ThrowStatement(loc(), new ConstantStatement(loc(), e.value)); }
         }
 
         return new OperationStatement(loc(), operation, args);
 
     }
 
-    public OperationStatement(Location loc, Operation operation, Statement... args) {
+    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,8 +1,7 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 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;
@@ -10,14 +9,13 @@ 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) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         target.add(Instruction.loadRegex(pattern, flags).locate(loc()));
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
     public RegexStatement(Location loc, String pattern, String flags) {

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,23 +1,21 @@
 package me.topchetoeu.jscript.compilation.values;
 
-import java.util.List;
-
 import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.compilation.control.ArrayStatement;
 import me.topchetoeu.jscript.engine.scope.ScopeRecord;
 import me.topchetoeu.jscript.engine.values.Values;
 
 public class TypeofStatement extends Statement {
     public final Statement value;
 
-    @Override
-    public boolean pollutesStack() { return true; }
     @Override
     public boolean pure() { return true; }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         if (value instanceof VariableStatement) {
             var i = scope.getKey(((VariableStatement)value).name);
             if (i instanceof String) {
@@ -25,7 +23,7 @@ public class TypeofStatement extends Statement {
                 return;
             }
         }
-        value.compileWithPollution(target, scope);
+        value.compile(target, scope, pollute);
         target.add(Instruction.typeof().locate(loc()));
     }
 

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

@@ -1,39 +1,34 @@
 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.CompileTarget;
 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 class VariableAssignStatement extends Statement {
     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) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         var i = scope.getKey(name);
         if (operation != null) {
             target.add(Instruction.loadVar(i).locate(loc()));
-            if (retPrevValue) target.add(Instruction.dup().locate(loc()));
             if (value instanceof FunctionStatement) ((FunctionStatement)value).compile(target, scope, name, false);
-            else value.compileWithPollution(target, scope);
+            else value.compile(target, scope, true);
             target.add(Instruction.operation(operation).locate(loc()));
-            target.add(Instruction.storeVar(i, !retPrevValue).locate(loc()));
+            target.add(Instruction.storeVar(i, false).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()));
+            else value.compile(target, scope, true);
+            target.add(Instruction.storeVar(i, false).locate(loc()));
         }
+
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     public VariableAssignStatement(Location loc, String name, Statement val, Operation operation) {

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

@@ -1,23 +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.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 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 void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (pollute) target.add(Instruction.loadVar(index).locate(loc()));
     }
 
     public VariableIndexStatement(Location loc, int i) {

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

@@ -1,10 +1,8 @@
 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.CompileTarget;
 import me.topchetoeu.jscript.compilation.Instruction;
 import me.topchetoeu.jscript.compilation.Statement;
 import me.topchetoeu.jscript.engine.Operation;
@@ -13,20 +11,19 @@ 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) {
+    public Statement toAssign(Statement val, Operation operation) {
         return new VariableAssignStatement(loc(), name, val, operation);
     }
 
     @Override
-    public void compile(List<Instruction> target, ScopeRecord scope) {
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
         var i = scope.getKey(name);
         target.add(Instruction.loadVar(i).locate(loc()));
+        if (!pollute) target.add(Instruction.discard().locate(loc()));
     }
 
     public VariableStatement(Location loc, String name) {

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

@@ -1,22 +1,18 @@
 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.CompileTarget;
 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()));
+    public void compile(CompileTarget target, ScopeRecord scope, boolean pollute) {
+        if (value != null) value.compile(target, scope, false);
+        if (pollute) target.add(Instruction.loadValue(null).locate(loc()));
     }
 
     @Override

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,46 @@
+package me.topchetoeu.jscript.engine;
+
+import java.util.Stack;
+import java.util.TreeSet;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.parsing.Parsing;
+
+public class Context {
+    private final Stack<Environment> env = new Stack<>();
+    public final Data data;
+    public final Engine engine;
+
+    public Environment environment() {
+        return env.empty() ? null : env.peek();
+    }
+
+    public Context pushEnv(Environment env) {
+        this.env.push(env);
+        return this;
+    }
+    public void popEnv() {
+        if (!env.empty()) this.env.pop();
+    }
+
+    public FunctionValue compile(Filename filename, String raw) {
+        var src = Values.toString(this, environment().compile.call(this, null, raw, filename));
+        var debugger = StackData.getDebugger(this);
+        var breakpoints = new TreeSet<Location>();
+        var res = Parsing.compile(engine.functions, breakpoints, environment(), filename, src);
+        if (debugger != null) debugger.onSource(filename, src, breakpoints);
+        return res;
+    }
+
+    public Context(Engine engine, Data data) {
+        this.data = new Data(engine.data);
+        if (data != null) this.data.addAll(data);
+        this.engine = engine;
+    }
+    public Context(Engine engine) {
+        this(engine, null);
+    }
+}

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

@@ -0,0 +1,71 @@
+package me.topchetoeu.jscript.engine;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@SuppressWarnings("unchecked")
+public class Data {
+    public final Data parent;
+    private HashMap<DataKey<Object>, Object> data = new HashMap<>();
+
+    public Data copy() {
+        return new Data().addAll(this);
+    }
+
+    public Data addAll(Map<DataKey<?>, ?> data) {
+        for (var el : data.entrySet()) {
+            get((DataKey<Object>)el.getKey(), (Object)el.getValue());
+        }
+        return this;
+    }
+    public Data addAll(Data data) {
+        for (var el : data.data.entrySet()) {
+            get((DataKey<Object>)el.getKey(), (Object)el.getValue());
+        }
+        return this;
+    }
+
+    public <T> T remove(DataKey<T> key) {
+        return (T)data.remove(key);
+    }
+    public <T> Data set(DataKey<T> key, T val) {
+        data.put((DataKey<Object>)key, (Object)val);
+        return this;
+    }
+    public <T> T get(DataKey<T> key, T val) {
+        for (var it = this; it != null; it = it.parent) {
+            if (it.data.containsKey(key)) {
+                return (T)it.data.get((DataKey<Object>)key);
+            }
+        }
+
+        set(key, val);
+        return val;
+    }
+    public <T> T get(DataKey<T> key) {
+        for (var it = this; it != null; it = it.parent) {
+            if (it.data.containsKey(key)) return (T)it.data.get((DataKey<Object>)key);
+        }
+        return null;
+    }
+    public boolean has(DataKey<?> key) { return data.containsKey(key); }
+
+    public int increase(DataKey<Integer> key, int n, int start) {
+        int res;
+        set(key, res = get(key, start) + n);
+        return res;
+    }
+    public int increase(DataKey<Integer> key, int n) {
+        return increase(key, n, 0);
+    }
+    public int increase(DataKey<Integer> key) {
+        return increase(key, 1, 0);
+    }
+
+    public Data() {
+        this.parent = null;
+    }
+    public Data(Data parent) {
+        this.parent = parent;
+    }
+}

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

@@ -0,0 +1,3 @@
+package me.topchetoeu.jscript.engine;
+
+public class DataKey<T> { }

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,131 +1,70 @@
 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.Filename;
+import me.topchetoeu.jscript.compilation.FunctionBody;
 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;
+import me.topchetoeu.jscript.exceptions.InterruptException;
 
 public class Engine {
-    private static class RawFunction {
-        public final GlobalScope scope;
-        public final String filename;
+    private class UncompiledFunction extends FunctionValue {
+        public final Filename filename;
         public final String raw;
+        private FunctionValue compiled = null;
 
-        public RawFunction(GlobalScope scope, String filename, String raw) {
-            this.scope = scope;
+        @Override
+        public Object call(Context ctx, Object thisArg, Object ...args) {
+            if (compiled == null) compiled = ctx.compile(filename, raw);
+            return compiled.call(ctx, thisArg, args);
+        }
+
+        public UncompiledFunction(Filename filename, String raw) {
+            super(filename + "", 0);
             this.filename = filename;
             this.raw = raw;
         }
     }
 
     private static class Task {
-        public final Object func;
+        public final FunctionValue func;
         public final Object thisArg;
         public final Object[] args;
-        public final Map<DataKey<?>, Object> data;
         public final DataNotifier<Object> notifier = new DataNotifier<>();
+        public final Context ctx;
 
-        public Task(Object func, Map<DataKey<?>, Object> data, Object thisArg, Object[] args) {
+        public Task(Context ctx, FunctionValue func, Object thisArg, Object[] args) {
+            this.ctx = ctx;
             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 final HashMap<Long, FunctionBody> functions = new HashMap<>();
+    public final Data data = new Data().set(StackData.MAX_FRAMES, 10000);
 
-    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 {
+    private void runTask(Task task) {
         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);
+            task.notifier.next(task.func.call(task.ctx, task.thisArg, task.args));
         }
         catch (RuntimeException e) {
+            if (e instanceof InterruptException) throw e;
             task.notifier.error(e);
-            e.printStackTrace();
         }
     }
-    private void run() {
-        while (true) {
+    public void run(boolean untilEmpty) {
+        while (!untilEmpty || !macroTasks.isEmpty()) {
             try {
                 runTask(macroTasks.take());
 
@@ -133,25 +72,18 @@ public class Engine {
                     runTask(microTasks.take());
                 }
             }
-            catch (InterruptedException e) {
+            catch (InterruptedException | InterruptException e) {
                 for (var msg : macroTasks) {
-                    msg.notifier.error(new RuntimeException(e));
+                    msg.notifier.error(new InterruptException(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 = new Thread(() -> run(false), "JavaScript Runner #" + id);
             this.thread.start();
         }
         return this.thread;
@@ -167,39 +99,13 @@ public class Engine {
         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);
+    public Awaitable<Object> pushMsg(boolean micro, Context ctx, FunctionValue func, Object thisArg, Object ...args) {
+        var msg = new Task(ctx == null ? new Context(this) : ctx, func, 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());
+    public Awaitable<Object> pushMsg(boolean micro, Context ctx, Filename filename, String raw, Object thisArg, Object ...args) {
+        return pushMsg(micro, ctx, new UncompiledFunction(filename, raw), thisArg, args);
     }
 }

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

@@ -0,0 +1,87 @@
+package me.topchetoeu.jscript.engine;
+
+import java.util.HashMap;
+
+import me.topchetoeu.jscript.engine.scope.GlobalScope;
+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.exceptions.EngineException;
+import me.topchetoeu.jscript.interop.Native;
+import me.topchetoeu.jscript.interop.NativeGetter;
+import me.topchetoeu.jscript.interop.NativeSetter;
+import me.topchetoeu.jscript.interop.NativeWrapperProvider;
+
+public class Environment {
+    private HashMap<String, ObjectValue> prototypes = new HashMap<>();
+
+    public final Data data = new Data();
+    public final HashMap<String, Symbol> symbols = new HashMap<>();
+
+    public GlobalScope global;
+    public WrappersProvider wrappers;
+
+    @Native public FunctionValue compile;
+    @Native public FunctionValue regexConstructor = new NativeFunction("RegExp", (ctx, thisArg, args) -> {
+        throw EngineException.ofError("Regular expressions not supported.").setCtx(ctx.environment(), ctx.engine);
+    });
+
+    public Environment addData(Data data) {
+        this.data.addAll(data);
+        return this;
+    }
+
+    @Native public ObjectValue proto(String name) {
+        return prototypes.get(name);
+    }
+    @Native public void setProto(String name, ObjectValue val) {
+        prototypes.put(name, val);
+    }
+
+    @Native public Symbol symbol(String name) {
+        if (symbols.containsKey(name))
+            return symbols.get(name);
+        else {
+            var res = new Symbol(name);
+            symbols.put(name, res);
+            return res;
+        }
+    }
+
+    @NativeGetter("global") public ObjectValue getGlobal() {
+        return global.obj;
+    }
+    @NativeSetter("global") public void setGlobal(ObjectValue val) {
+        global = new GlobalScope(val);
+    }
+
+    @Native public Environment fork() {
+        var res = new Environment(compile, wrappers, global);
+        res.regexConstructor = regexConstructor;
+        res.prototypes = new HashMap<>(prototypes);
+        return res;
+    }
+    @Native public Environment child() {
+        var res = fork();
+        res.global = res.global.globalChild();
+        return res;
+    }
+
+    public Context context(Engine engine, Data data) {
+        return new Context(engine, data).pushEnv(this);
+    }
+    public Context context(Engine engine) {
+        return new Context(engine).pushEnv(this);
+    }
+
+    public Environment(FunctionValue compile, WrappersProvider nativeConverter, GlobalScope global) {
+        if (compile == null) compile = new NativeFunction("compile", (ctx, thisArg, args) -> args.length == 0 ? "" : args[0]);
+        if (nativeConverter == null) nativeConverter = new NativeWrapperProvider(this);
+        if (global == null) global = new GlobalScope();
+
+        this.wrappers = nativeConverter;
+        this.compile = compile;
+        this.global = global;
+    }
+}

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

@@ -0,0 +1,65 @@
+package me.topchetoeu.jscript.engine;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import me.topchetoeu.jscript.engine.debug.Debugger;
+import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.exceptions.EngineException;
+
+public class StackData {
+    public static final DataKey<ArrayList<CodeFrame>> FRAMES = new DataKey<>();
+    public static final DataKey<Integer> MAX_FRAMES = new DataKey<>();
+    public static final DataKey<Debugger> DEBUGGER = new DataKey<>();
+
+    public static void pushFrame(Context ctx, CodeFrame frame) {
+        var frames = ctx.data.get(FRAMES, new ArrayList<>());
+        frames.add(frame);
+        if (frames.size() > ctx.data.get(MAX_FRAMES, 10000)) throw EngineException.ofRange("Stack overflow!");
+        ctx.pushEnv(frame.function.environment);
+    }
+    public static boolean popFrame(Context ctx, CodeFrame frame) {
+        var frames = ctx.data.get(FRAMES, new ArrayList<>());
+        if (frames.size() == 0) return false;
+        if (frames.get(frames.size() - 1) != frame) return false;
+        frames.remove(frames.size() - 1);
+        ctx.popEnv();
+        var dbg = getDebugger(ctx);
+        if (dbg != null) dbg.onFramePop(ctx, frame);
+        return true;
+    }
+    public static CodeFrame peekFrame(Context ctx) {
+        var frames = ctx.data.get(FRAMES, new ArrayList<>());
+        if (frames.size() == 0) return null;
+        return frames.get(frames.size() - 1);
+    }
+
+    public static List<CodeFrame> frames(Context ctx) {
+        return Collections.unmodifiableList(ctx.data.get(FRAMES, new ArrayList<>()));
+    }
+    public static List<String> stackTrace(Context ctx) {
+        var res = new ArrayList<String>();
+        var frames = frames(ctx);
+
+        for (var i = frames.size() - 1; i >= 0; i--) {
+            var el = frames.get(i);
+            var name = el.function.name;
+            var 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;
+    }
+
+    public static Debugger getDebugger(Context ctx) {
+        return ctx.data.get(DEBUGGER);
+    }
+}

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

@@ -0,0 +1,10 @@
+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);
+}

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

@@ -0,0 +1,43 @@
+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;
+
+public interface DebugController {
+    /**
+     * Called when a script has been loaded
+     * @param breakpoints 
+     */
+    void onSource(Filename filename, String source, TreeSet<Location> breakpoints);
+
+    /**
+     * 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, Runners.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 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);
+
+    void connect();
+    void disconnect();
+}

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

@@ -0,0 +1,35 @@
+package me.topchetoeu.jscript.engine.debug;
+
+public interface DebugHandler {
+    void enable(V8Message msg);
+    void disable(V8Message msg);
+
+    void setBreakpoint(V8Message msg);
+    void setBreakpointByUrl(V8Message msg);
+    void removeBreakpoint(V8Message msg);
+    void continueToLocation(V8Message msg);
+
+    void getScriptSource(V8Message msg);
+    void getPossibleBreakpoints(V8Message msg);
+
+    void resume(V8Message msg);
+    void pause(V8Message msg);
+
+    void stepInto(V8Message msg);
+    void stepOut(V8Message msg);
+    void stepOver(V8Message msg);
+
+    void setPauseOnExceptions(V8Message msg);
+
+    void evaluateOnCallFrame(V8Message msg);
+
+    void getProperties(V8Message msg);
+    void releaseObjectGroup(V8Message msg);
+    /**
+     * This method might not execute the actual code for well-known requests
+     */
+    void callFunctionOn(V8Message msg);
+
+    // void nodeWorkerEnable(V8Message msg);
+    void runtimeEnable(V8Message msg);
+}

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

@@ -1,154 +1,238 @@
-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.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.engine.debug.WebSocketMessage.Type;
+import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.exceptions.UncheckedException;
+import me.topchetoeu.jscript.exceptions.UncheckedIOException;
+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 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 UncheckedException(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) {
+        WebSocketMessage raw;
+
+        debugger.connect();
+
+        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());
+                // System.out.println(msg.name + ": " + JSON.stringify(msg.params));
+            }
+            catch (SyntaxException e) {
+                ws.send(new V8Error(e.getMessage()));
+                return;
+            }
+
+            try {
+                switch (msg.name) {
+                    case "Debugger.enable": debugger.enable(msg); continue;
+                    case "Debugger.disable": debugger.disable(msg); continue;
+
+                    case "Debugger.setBreakpoint": debugger.setBreakpoint(msg); 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.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."));
+            }
+            catch (Throwable e) {
+                e.printStackTrace();
+                throw new UncheckedException(e);
+            }
+        }
+
+        debugger.disconnect();
+    }
+    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 e) {
+                ws.send(new V8Error(e.getMessage()));
+            }
+            finally { ws.close(); debugger.disconnect(); }
+        }, "Debug Handler");
+    }
+
+    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 = getClass().getClassLoader().getResourceAsStream("assets/favicon.png").readAllBytes();
+            this.protocol = getClass().getClassLoader().getResourceAsStream("assets/protocol.json").readAllBytes();
+            var index = new String(getClass().getClassLoader().getResourceAsStream("assets/index.html").readAllBytes());
+            this.index = index
+                .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 {
+    
+}

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; }
+    }
+}
+

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

@@ -0,0 +1,788 @@
+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.Random;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.compilation.Instruction.Type;
+import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.engine.Engine;
+import me.topchetoeu.jscript.engine.StackData;
+import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.engine.frame.Runners;
+import me.topchetoeu.jscript.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.engine.values.CodeFunction;
+import me.topchetoeu.jscript.engine.values.FunctionValue;
+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.events.Notifier;
+import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.json.JSONElement;
+import me.topchetoeu.jscript.json.JSONList;
+import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.lib.DateLib;
+import me.topchetoeu.jscript.lib.MapLib;
+import me.topchetoeu.jscript.lib.PromiseLib;
+import me.topchetoeu.jscript.lib.RegExpLib;
+import me.topchetoeu.jscript.lib.SetLib;
+import me.topchetoeu.jscript.lib.GeneratorLib.Generator;
+
+public class SimpleDebugger implements Debugger {
+    public static final String CHROME_GET_PROP_FUNC = "function s(e){let t=this;const n=JSON.parse(e);for(let e=0,i=n.length;e<i;++e)t=t[n[e]];return t}";
+
+    private static enum State {
+        RESUMED,
+        STEPPING_IN,
+        STEPPING_OUT,
+        STEPPING_OVER,
+        PAUSED_NORMAL,
+        PAUSED_EXCEPTION,
+    }
+    private static enum CatchType {
+        NONE,
+        UNCAUGHT,
+        ALL,
+    }
+    private static class Source {
+        public final int id;
+        public final Filename filename;
+        public final String source;
+        public final TreeSet<Location> breakpoints;
+
+        public Source(int id, Filename filename, String source, TreeSet<Location> breakpoints) {
+            this.id = id;
+            this.filename = filename;
+            this.source = source;
+            this.breakpoints = breakpoints;
+        }
+    }
+    private static class Breakpoint {
+        public final int id;
+        public final Location location;
+        public final String condition;
+
+        public Breakpoint(int id, Location location, String condition) {
+            this.id = id;
+            this.location = location;
+            this.condition = condition;
+        }
+    }
+    private static class BreakpointCandidate {
+        public final int id;
+        public final String condition;
+        public final Pattern pattern;
+        public final int line, start;
+        public final HashSet<Breakpoint> resolvedBreakpoints = new HashSet<>();
+
+        public BreakpointCandidate(int id, Pattern pattern, int line, int start, String condition) {
+            this.id = id;
+            this.pattern = pattern;
+            this.line = line;
+            this.start = start;
+            if (condition != null && condition.trim().equals("")) condition = null;
+            this.condition = condition;
+        }
+    }
+    private class Frame {
+        public CodeFrame frame;
+        public CodeFunction func;
+        public int id;
+        public ObjectValue local, capture, global;
+        public JSONMap serialized;
+        public Location location;
+        public boolean debugData = false;
+
+        public void updateLoc(Location loc) {
+            serialized.set("location", serializeLocation(loc));
+            this.location = loc;
+        }
+
+        public Frame(Context ctx, CodeFrame frame, int id) {
+            this.frame = frame;
+            this.func = frame.function;
+            this.id = id;
+            this.local = new ObjectValue();
+            this.location = frame.function.loc();
+
+            this.global = frame.function.environment.global.obj;
+            this.local = frame.getLocalScope(ctx, true);
+            this.capture = frame.getCaptureScope(ctx, true);
+            this.local.setPrototype(ctx, capture);
+            this.capture.setPrototype(ctx, global);
+
+            if (location != null) {
+                debugData = true;
+                this.serialized = new JSONMap()
+                    .set("callFrameId", id + "")
+                    .set("functionName", func.name)
+                    .set("location", serializeLocation(location))
+                    .set("scopeChain", new JSONList()
+                        .add(new JSONMap().set("type", "local").set("name", "Local Scope").set("object", serializeObj(ctx, local)))
+                        .add(new JSONMap().set("type", "closure").set("name", "Closure").set("object", serializeObj(ctx, capture)))
+                        .add(new JSONMap().set("type", "global").set("name", "Global Scope").set("object", serializeObj(ctx, global)))
+                    )
+                    .setNull("this");
+            }
+        }
+    }
+
+    private class RunResult {
+        public final Context ctx;
+        public final Object result;
+        public final EngineException error;
+
+        public RunResult(Context ctx, Object result, EngineException error) {
+            this.ctx = ctx;
+            this.result = result;
+            this.error = error;
+        }
+    }
+
+    public boolean enabled = true;
+    public CatchType execptionType = CatchType.ALL; 
+    public State state = State.RESUMED;
+
+    public final WebSocket ws;
+    public final Engine target;
+
+    private HashMap<Integer, BreakpointCandidate> idToBptCand = new HashMap<>();
+
+    private HashMap<Integer, Breakpoint> idToBreakpoint = new HashMap<>();
+    private HashMap<Location, Breakpoint> locToBreakpoint = new HashMap<>();
+    private HashSet<Location> tmpBreakpts = new HashSet<>();
+
+    private HashMap<Filename, Integer> filenameToId = new HashMap<>();
+    private HashMap<Integer, Source> idToSource = new HashMap<>();
+    private ArrayList<Source> pendingSources = new ArrayList<>();
+
+    private HashMap<Integer, Frame> idToFrame = new HashMap<>();
+    private HashMap<CodeFrame, Frame> codeFrameToFrame = new HashMap<>();
+
+    private HashMap<Integer, ObjectValue> idToObject = new HashMap<>();
+    private HashMap<ObjectValue, Integer> objectToId = new HashMap<>();
+    private HashMap<ObjectValue, Context> objectToCtx = new HashMap<>();
+    private HashMap<String, ArrayList<ObjectValue>> objectGroups = new HashMap<>();
+
+    private Notifier updateNotifier = new Notifier(); 
+
+    private int nextId = new Random().nextInt() & 0x7FFFFFFF;
+    private Location prevLocation = null;
+    private Frame stepOutFrame = null, currFrame = null;
+
+    private int nextId() {
+        return nextId++ ^ 1630022591 /* big prime */;
+    }
+
+    private void updateFrames(Context ctx) {
+        var frame = StackData.peekFrame(ctx);
+        if (frame == null) return;
+
+        if (!codeFrameToFrame.containsKey(frame)) {
+            var id = nextId();
+            var fr = new Frame(ctx, frame, id);
+
+            idToFrame.put(id, fr);
+            codeFrameToFrame.put(frame, fr);
+        }
+
+        currFrame = codeFrameToFrame.get(frame);
+    }
+    private JSONList serializeFrames(Context ctx) {
+        var res = new JSONList();
+        var frames = StackData.frames(ctx);
+
+        for (var i = frames.size() - 1; i >= 0; i--) {
+            res.add(codeFrameToFrame.get(frames.get(i)).serialized);
+        }
+
+        return res;
+    }
+
+    private Location correctLocation(Source source, Location loc) {
+        var set = source.breakpoints;
+
+        if (set.contains(loc)) return loc;
+
+        var tail = set.tailSet(loc);
+        if (tail.isEmpty()) return null;
+
+        return tail.first();
+    }
+    private Location deserializeLocation(JSONElement el, boolean correct) {
+        if (!el.isMap()) throw new RuntimeException("Expected location to be a map.");
+        var id = Integer.parseInt(el.map().string("scriptId"));
+        var line = (int)el.map().number("lineNumber") + 1;
+        var column = (int)el.map().number("columnNumber") + 1;
+
+        if (!idToSource.containsKey(id)) throw new RuntimeException(String.format("The specified source %s doesn't exist.", id));
+
+        var res = new Location(line, column, idToSource.get(id).filename);
+        if (correct) res = correctLocation(idToSource.get(id), res);
+        return res;
+    }
+    private JSONMap serializeLocation(Location loc) {
+        var source = filenameToId.get(loc.filename());
+        return new JSONMap()
+            .set("scriptId", source + "")
+            .set("lineNumber", loc.line() - 1)
+            .set("columnNumber", loc.start() - 1);
+    }
+
+    private Integer objectId(Context ctx, ObjectValue obj) {
+        if (objectToId.containsKey(obj)) return objectToId.get(obj);
+        else {
+            int id = nextId();
+            objectToId.put(obj, id);
+            if (ctx != null) objectToCtx.put(obj, ctx);
+            idToObject.put(id, obj);
+            return id;
+        }
+    }
+    private JSONMap serializeObj(Context ctx, Object val, boolean recurse) {
+        val = Values.normalize(null, val);
+
+        if (val == Values.NULL) {
+            return new JSONMap()
+                .set("type", "object")
+                .set("subtype", "null")
+                .setNull("value")
+                .set("description", "null");
+        }
+
+        if (val instanceof ObjectValue) {
+            var obj = (ObjectValue)val;
+            var id = objectId(ctx, obj);
+            var type = "object";
+            String subtype = null;
+            String className = null;
+
+            if (obj instanceof FunctionValue) type = "function";
+            if (obj instanceof ArrayValue) subtype = "array";
+
+            if (Values.isWrapper(val, RegExpLib.class)) subtype = "regexp";
+            if (Values.isWrapper(val, DateLib.class)) subtype = "date";
+            if (Values.isWrapper(val, MapLib.class)) subtype = "map";
+            if (Values.isWrapper(val, SetLib.class)) subtype = "set";
+            if (Values.isWrapper(val, Generator.class)) subtype = "generator";
+            if (Values.isWrapper(val, PromiseLib.class)) subtype = "promise";
+
+            try { className = Values.toString(ctx, Values.getMember(ctx, obj.getMember(ctx, "constructor"), "name")); }
+            catch (Exception e) { }
+
+            var res = new JSONMap()
+                .set("type", type)
+                .set("objectId", id + "");
+
+            if (subtype != null) res.set("subtype", subtype);
+            if (className != null) {
+                res.set("className", className);
+                res.set("description", "{ " + className + " }");
+            }
+
+            return res;
+        }
+
+        if (val == null) return new JSONMap().set("type", "undefined");
+        if (val instanceof String) return new JSONMap().set("type", "string").set("value", (String)val);
+        if (val instanceof Boolean) return new JSONMap().set("type", "boolean").set("value", (Boolean)val);
+        if (val instanceof Symbol) return new JSONMap().set("type", "symbol").set("description", val.toString());
+        if (val instanceof Number) {
+            var num = (double)(Number)val;
+            var res = new JSONMap().set("type", "number");
+
+            if (Double.POSITIVE_INFINITY == num) res.set("unserializableValue", "Infinity");
+            else if (Double.NEGATIVE_INFINITY == num) res.set("unserializableValue", "-Infinity");
+            else if (Double.doubleToRawLongBits(num) == Double.doubleToRawLongBits(-0d)) res.set("unserializableValue", "-0");
+            else if (Double.isNaN(num)) res.set("unserializableValue", "NaN");
+            else res.set("value", num);
+
+            return res;
+        }
+
+        throw new IllegalArgumentException("Unexpected JS object.");
+    }
+    private JSONMap serializeObj(Context ctx, Object val) {
+        return serializeObj(ctx, val, true);
+    }
+    private void setObjectGroup(String name, Object val) {
+        if (val instanceof ObjectValue) {
+            var obj = (ObjectValue)val;
+
+            if (objectGroups.containsKey(name)) objectGroups.get(name).add(obj);
+            else objectGroups.put(name, new ArrayList<>(List.of(obj)));
+        }
+    }
+    private void releaseGroup(String name) {
+        var objs = objectGroups.remove(name);
+
+        if (objs != null) {
+            for (var obj : objs) {
+                var id = objectToId.remove(obj);
+                if (id != null) idToObject.remove(id);
+            }
+        }
+    }
+    private Object deserializeArgument(JSONMap val) {
+        if (val.isString("objectId")) return idToObject.get(Integer.parseInt(val.string("objectId")));
+        else if (val.isString("unserializableValue")) switch (val.string("unserializableValue")) {
+            case "NaN": return Double.NaN;
+            case "-Infinity": return Double.NEGATIVE_INFINITY;
+            case "Infinity": return Double.POSITIVE_INFINITY;
+            case "-0": return -0.;
+        }
+        return JSON.toJs(val.get("value"));
+    }
+
+    private JSONMap serializeException(Context ctx, EngineException err) {
+        String text = null;
+
+        try {
+            text = Values.toString(ctx, err.value);
+        }
+        catch (EngineException e) {
+            text = "[error while stringifying]";
+        }
+
+        var res = new JSONMap()
+            .set("exceptionId", nextId())
+            .set("exception", serializeObj(ctx, err.value))
+            .set("exception", serializeObj(ctx, err.value))
+            .set("text", text);
+
+        return res;
+    }
+
+    private void resume(State state) {
+        this.state = state;
+        ws.send(new V8Event("Debugger.resumed", new JSONMap()));
+        updateNotifier.next();
+    }
+    private void pauseDebug(Context ctx, Breakpoint bp) {
+        state = State.PAUSED_NORMAL;
+        var map = new JSONMap()
+            .set("callFrames", serializeFrames(ctx))
+            .set("reason", "debugCommand");
+
+        if (bp != null) map.set("hitBreakpoints", new JSONList().add(bp.id + ""));
+        ws.send(new V8Event("Debugger.paused", map));
+    }
+    private void pauseException(Context ctx) {
+        state = State.PAUSED_EXCEPTION;
+        var map = new JSONMap()
+            .set("callFrames", serializeFrames(ctx))
+            .set("reason", "exception");
+
+        ws.send(new V8Event("Debugger.paused", map));
+    }
+
+    private void sendSource(Source src) {
+        ws.send(new V8Event("Debugger.scriptParsed", new JSONMap()
+            .set("scriptId", src.id + "")
+            .set("hash", src.source.hashCode())
+            .set("url", src.filename + "")
+        ));
+    }
+
+    private void addBreakpoint(Breakpoint bpt) {
+        idToBreakpoint.put(bpt.id, bpt);
+        locToBreakpoint.put(bpt.location, bpt);
+
+        ws.send(new V8Event("Debugger.breakpointResolved", new JSONMap()
+            .set("breakpointId", bpt.id)
+            .set("location", serializeLocation(bpt.location))
+        ));
+    }
+
+    private RunResult run(Frame codeFrame, String code) {
+        var engine = new Engine();
+        var env = codeFrame.func.environment.fork();
+
+        ObjectValue global = env.global.obj,
+            capture = codeFrame.frame.getCaptureScope(null, enabled),
+            local = codeFrame.frame.getLocalScope(null, enabled);
+
+        capture.setPrototype(null, global);
+        local.setPrototype(null, capture);
+        env.global = new GlobalScope(local);
+
+        var ctx = new Context(engine).pushEnv(env);
+        var awaiter = engine.pushMsg(false, ctx, new Filename("temp", "exec"), code, codeFrame.frame.thisArg, codeFrame.frame.args);
+
+        engine.run(true);
+
+        try { return new RunResult(ctx, awaiter.await(), null); }
+        catch (EngineException e) { return new RunResult(ctx, null, e); }
+    }
+
+    @Override public void enable(V8Message msg) {
+        enabled = true;
+        ws.send(msg.respond());
+
+        for (var el : pendingSources) sendSource(el);
+        pendingSources.clear();
+
+        updateNotifier.next();
+    }
+    @Override public void disable(V8Message msg) {
+        enabled = false;
+        ws.send(msg.respond());
+        updateNotifier.next();
+    }
+
+    @Override public void getScriptSource(V8Message msg) {
+        int id = Integer.parseInt(msg.params.string("scriptId"));
+        ws.send(msg.respond(new JSONMap().set("scriptSource", idToSource.get(id).source)));
+    }
+    @Override public void getPossibleBreakpoints(V8Message msg) {
+        var src = idToSource.get(Integer.parseInt(msg.params.map("start").string("scriptId")));
+        var start = deserializeLocation(msg.params.get("start"), false);
+        var end = msg.params.isMap("end") ? deserializeLocation(msg.params.get("end"), false) : null;
+
+        var res = new JSONList();
+
+        for (var loc : src.breakpoints.tailSet(start, true)) {
+            if (end != null && loc.compareTo(end) > 0) break;
+            res.add(serializeLocation(loc));
+        }
+
+        ws.send(msg.respond(new JSONMap().set("locations", res)));
+    }
+
+    @Override public void pause(V8Message msg) {
+    }
+
+    @Override public void resume(V8Message msg) {
+        resume(State.RESUMED);
+        ws.send(msg.respond(new JSONMap()));
+    }
+
+    @Override public void setBreakpoint(V8Message msg) {
+        // int id = nextId();
+        // var loc = deserializeLocation(msg.params.get("location"), true);
+        // var bpt = new Breakpoint(id, loc, null);
+        // breakpoints.put(loc, bpt);
+        // idToBrpt.put(id, bpt);
+        // ws.send(msg.respond(new JSONMap()
+        //     .set("breakpointId", id)
+        //     .set("actualLocation", serializeLocation(loc))
+        // ));
+    }
+    @Override public void setBreakpointByUrl(V8Message msg) {
+        var line = (int)msg.params.number("lineNumber") + 1;
+        var col = (int)msg.params.number("columnNumber", 0) + 1;
+
+        Pattern regex;
+
+        if (msg.params.isString("url")) regex = Pattern.compile(Pattern.quote(msg.params.string("url")));
+        else regex = Pattern.compile(msg.params.string("urlRegex"));
+
+        var bpcd = new BreakpointCandidate(nextId(), regex, line, col, null);
+        idToBptCand.put(bpcd.id, bpcd);
+
+        var locs = new JSONList();
+
+        for (var src : idToSource.values()) {
+            if (regex.matcher(src.filename.toString()).matches()) {
+                var loc = correctLocation(src, new Location(line, col, src.filename));
+                if (loc == null) continue;
+                var bp = new Breakpoint(nextId(), loc, bpcd.condition);
+
+                bpcd.resolvedBreakpoints.add(bp);
+                locs.add(serializeLocation(loc));
+                addBreakpoint(bp);
+            }
+        }
+
+        ws.send(msg.respond(new JSONMap()
+            .set("breakpointId", bpcd.id + "")
+            .set("locations", locs)
+        ));
+    }
+    @Override public void removeBreakpoint(V8Message msg) {
+        var id = Integer.parseInt(msg.params.string("breakpointId"));
+
+        if (idToBptCand.containsKey(id)) {
+            var bpcd = idToBptCand.get(id);
+            for (var bp : bpcd.resolvedBreakpoints) {
+                idToBreakpoint.remove(bp.id);
+                locToBreakpoint.remove(bp.location);
+            }
+            idToBptCand.remove(id);
+        }
+        else if (idToBreakpoint.containsKey(id)) {
+            var bp = idToBreakpoint.remove(id);
+            locToBreakpoint.remove(bp.location);
+        }
+        ws.send(msg.respond());
+    }
+    @Override public void continueToLocation(V8Message msg) {
+        var loc = deserializeLocation(msg.params.get("location"), true);
+
+        tmpBreakpts.add(loc);
+
+        resume(State.RESUMED);
+        ws.send(msg.respond());
+    }
+
+    @Override public void setPauseOnExceptions(V8Message msg) {
+        ws.send(new V8Error("i dont wanna to"));
+    }
+
+    @Override public void stepInto(V8Message msg) {
+        if (state == State.RESUMED) ws.send(new V8Error("Debugger is resumed."));
+        else {
+            prevLocation = currFrame.location;
+            stepOutFrame = currFrame;
+            resume(State.STEPPING_IN);
+            ws.send(msg.respond());
+        }
+    }
+    @Override public void stepOut(V8Message msg) {
+        if (state == State.RESUMED) ws.send(new V8Error("Debugger is resumed."));
+        else {
+            prevLocation = currFrame.location;
+            stepOutFrame = currFrame;
+            resume(State.STEPPING_OUT);
+            ws.send(msg.respond());
+        }
+    }
+    @Override public void stepOver(V8Message msg) {
+        if (state == State.RESUMED) ws.send(new V8Error("Debugger is resumed."));
+        else {
+            prevLocation = currFrame.location;
+            stepOutFrame = currFrame;
+            resume(State.STEPPING_OVER);
+            ws.send(msg.respond());
+        }
+    }
+
+    @Override public void evaluateOnCallFrame(V8Message msg) {
+        var cfId = Integer.parseInt(msg.params.string("callFrameId"));
+        var expr = msg.params.string("expression");
+        var group = msg.params.string("objectGroup", null);
+
+        var cf = idToFrame.get(cfId);
+        var res = run(cf, expr);
+
+        if (group != null) setObjectGroup(group, res.result);
+
+        if (res.error != null) ws.send(msg.respond(new JSONMap().set("exceptionDetails", serializeObj(res.ctx, res.result))));
+
+        ws.send(msg.respond(new JSONMap().set("result", serializeObj(res.ctx, res.result))));
+    }
+
+    @Override public void releaseObjectGroup(V8Message msg) {
+        var group = msg.params.string("objectGroup");
+        releaseGroup(group);
+        ws.send(msg.respond());
+    }
+    @Override public void getProperties(V8Message msg) {
+        var obj = idToObject.get(Integer.parseInt(msg.params.string("objectId")));
+        var own = msg.params.bool("ownProperties") || true;
+        var currOwn = true;
+
+        var res = new JSONList();
+
+        while (obj != null) {
+            var ctx = objectToCtx.get(obj);
+
+            for (var key : obj.keys(true)) {
+                var propDesc = new JSONMap();
+
+                if (obj.properties.containsKey(key)) {
+                    var prop = obj.properties.get(key);
+
+                    propDesc.set("name", Values.toString(ctx, key));
+                    if (prop.getter != null) propDesc.set("get", serializeObj(ctx, prop.getter));
+                    if (prop.setter != null) propDesc.set("set", serializeObj(ctx, prop.setter));
+                    propDesc.set("enumerable", obj.memberEnumerable(key));
+                    propDesc.set("configurable", obj.memberConfigurable(key));
+                    propDesc.set("isOwn", currOwn);
+                    res.add(propDesc);
+                }
+                else {
+                    propDesc.set("name", Values.toString(ctx, key));
+                    propDesc.set("value", serializeObj(ctx, obj.getMember(ctx, key)));
+                    propDesc.set("writable", obj.memberWritable(key));
+                    propDesc.set("enumerable", obj.memberEnumerable(key));
+                    propDesc.set("configurable", obj.memberConfigurable(key));
+                    propDesc.set("isOwn", currOwn);
+                    res.add(propDesc);
+                }
+            }
+
+            obj = obj.getPrototype(ctx);
+
+            var protoDesc = new JSONMap();
+            protoDesc.set("name", "__proto__");
+            protoDesc.set("value", serializeObj(ctx, obj == null ? Values.NULL : obj));
+            protoDesc.set("writable", true);
+            protoDesc.set("enumerable", false);
+            protoDesc.set("configurable", false);
+            protoDesc.set("isOwn", currOwn);
+            res.add(protoDesc);
+
+            currOwn = false;
+            if (own) break;
+        }
+
+        ws.send(msg.respond(new JSONMap().set("result", res)));
+    }
+    @Override public void callFunctionOn(V8Message msg) {
+        var src = msg.params.string("functionDeclaration");
+        var args = msg.params.list("arguments", new JSONList()).stream().map(v -> v.map()).map(this::deserializeArgument).collect(Collectors.toList());
+        var thisArg = idToObject.get(Integer.parseInt(msg.params.string("objectId")));
+        var ctx = objectToCtx.get(thisArg);
+
+        switch (src) {
+            case CHROME_GET_PROP_FUNC: {
+                var path = JSON.parse(new Filename("tmp", "json"), (String)args.get(0)).list();
+                Object res = thisArg;
+                for (var el : path) res = Values.getMember(ctx, res, JSON.toJs(el));
+                ws.send(msg.respond(new JSONMap().set("result", serializeObj(ctx, res))));
+                return;
+            }
+            default:
+                ws.send(new V8Error("A non well-known function was used with callFunctionOn."));
+                break;
+        }
+    }
+
+    @Override
+    public void runtimeEnable(V8Message msg) {
+        ws.send(msg.respond());
+    }
+
+    @Override public void onSource(Filename filename, String source, TreeSet<Location> locations) {
+        int id = nextId();
+        var src = new Source(id, filename, source, locations);
+
+        filenameToId.put(filename, id);
+        idToSource.put(id, src);
+
+        for (var bpcd : idToBptCand.values()) {
+            if (!bpcd.pattern.matcher(filename.toString()).matches()) continue;
+            var loc = correctLocation(src, new Location(bpcd.line, bpcd.start, filename));
+            var bp = new Breakpoint(nextId(), loc, bpcd.condition);
+            if (loc == null) continue;
+            bpcd.resolvedBreakpoints.add(bp);
+            addBreakpoint(bp);
+        }
+
+        if (!enabled) pendingSources.add(src);
+        else sendSource(src);
+    }
+    @Override public boolean onInstruction(Context ctx, CodeFrame cf, Instruction instruction, Object returnVal, EngineException error, boolean caught) {
+        if (!enabled) return false;
+
+        updateFrames(ctx);
+        var frame = codeFrameToFrame.get(cf);
+
+        if (!frame.debugData) return false;
+
+        if (instruction.location != null) frame.updateLoc(instruction.location);
+        var loc = frame.location;
+        var isBreakpointable = loc != null && (
+            idToSource.get(filenameToId.get(loc.filename())).breakpoints.contains(loc) ||
+            returnVal != Runners.NO_RETURN
+        );
+
+        if (error != null && !caught && StackData.frames(ctx).size() > 1) error = null;
+
+        if (error != null && (execptionType == CatchType.ALL || execptionType == CatchType.UNCAUGHT && !caught)) {
+            pauseException(ctx);
+        }
+        else if (isBreakpointable && locToBreakpoint.containsKey(loc)) {
+            var bp = locToBreakpoint.get(loc);
+            var ok = bp.condition == null ? true : Values.toBoolean(run(currFrame, bp.condition));
+            if (ok) pauseDebug(ctx, locToBreakpoint.get(loc));
+        }
+        else if (isBreakpointable && tmpBreakpts.remove(loc)) pauseDebug(ctx, null);
+        else if (instruction.type == Type.NOP && instruction.match("debug")) pauseDebug(ctx, null);
+
+        while (enabled) {
+            switch (state) {
+                case PAUSED_EXCEPTION:
+                case PAUSED_NORMAL: break;
+
+                case STEPPING_OUT:
+                case RESUMED: return false;
+                case STEPPING_IN:
+                    if (!prevLocation.equals(loc)) {
+                        if (isBreakpointable) pauseDebug(ctx, null);
+                        else if (returnVal != Runners.NO_RETURN) pauseDebug(ctx, null);
+                        else return false;
+                    }
+                    else return false;
+                    break;
+                case STEPPING_OVER:
+                    if (stepOutFrame.frame == frame.frame) {
+                        if (returnVal != Runners.NO_RETURN) {
+                            state = State.STEPPING_OUT;
+                            return false;
+                        }
+                        else if (isBreakpointable && (
+                            !loc.filename().equals(prevLocation.filename()) ||
+                            loc.line() != prevLocation.line()
+                        )) pauseDebug(ctx, null);
+                        else return false;
+                    }
+                    else return false;
+                    break;
+            }
+            updateNotifier.await();
+        }
+
+        return false;
+    }
+    @Override public void onFramePop(Context ctx, CodeFrame frame) {
+        updateFrames(ctx);
+
+        try { idToFrame.remove(codeFrameToFrame.remove(frame).id); }
+        catch (NullPointerException e) { }
+
+        if (StackData.frames(ctx).size() == 0) resume(State.RESUMED);
+        else if (stepOutFrame != null && stepOutFrame.frame == frame &&
+            (state == State.STEPPING_OUT || state == State.STEPPING_IN)
+        ) {
+            pauseDebug(ctx, null);
+            updateNotifier.await();
+        }
+    }
+
+    @Override public void connect() {
+        target.data.set(StackData.DEBUGGER, this);
+    }
+    @Override public void disconnect() {
+        target.data.remove(StackData.DEBUGGER);
+        enabled = false;
+        updateNotifier.next();
+    }
+
+    private SimpleDebugger(WebSocket ws, Engine target) {
+        this.ws = ws;
+        this.target = target;
+    }
+
+    public static SimpleDebugger get(WebSocket ws, Engine target) {
+        if (target.data.has(StackData.DEBUGGER)) {
+            ws.send(new V8Error("A debugger is already attached to this engine."));
+            return null;
+        }
+        else {
+            var res = new SimpleDebugger(ws, target);
+            return res;
+        }
+    }
+}

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

@@ -1,19 +1,19 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import me.topchetoeu.jscript.json.JSON;
-import me.topchetoeu.jscript.json.JSONMap;
-
-public class V8Error {
-    public final String message;
-
-    public V8Error(String message) {
-        this.message = message;
-    }
-
-    @Override
-    public String toString() {
-        return JSON.stringify(new JSONMap().set("error", new JSONMap()
-            .set("message", message)
-        ));
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.json.JSONMap;
+
+public class V8Error {
+    public final String message;
+
+    public V8Error(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.stringify(new JSONMap().set("error", new JSONMap()
+            .set("message", message)
+        ));
+    }
+}

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

@@ -1,22 +1,22 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import me.topchetoeu.jscript.json.JSON;
-import me.topchetoeu.jscript.json.JSONMap;
-
-public class V8Event {
-    public final String name;
-    public final JSONMap params;
-
-    public V8Event(String name, JSONMap params) {
-        this.name = name;
-        this.params = params;
-    }
-
-    @Override
-    public String toString() {
-        return JSON.stringify(new JSONMap()
-            .set("method", name)
-            .set("params", params)
-        );
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.json.JSONMap;
+
+public class V8Event {
+    public final String name;
+    public final JSONMap params;
+
+    public V8Event(String name, JSONMap params) {
+        this.name = name;
+        this.params = params;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.stringify(new JSONMap()
+            .set("method", name)
+            .set("params", params)
+        );
+    }
+}

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

@@ -1,50 +1,51 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import java.util.Map;
-
-import me.topchetoeu.jscript.json.JSON;
-import me.topchetoeu.jscript.json.JSONElement;
-import me.topchetoeu.jscript.json.JSONMap;
-
-public class V8Message {
-    public final String name;
-    public final int id;
-    public final JSONMap params;
-
-    public V8Message(String name, int id, Map<String, JSONElement> params) {
-        this.name = name;
-        this.params = new JSONMap(params);
-        this.id = id;
-    }
-    public V8Result respond(JSONMap result) {
-        return new V8Result(id, result);
-    }
-    public V8Result respond() {
-        return new V8Result(id, new JSONMap());
-    }
-
-    public V8Message(JSONMap raw) {
-        if (!raw.isNumber("id")) throw new IllegalArgumentException("Expected number property 'id'.");
-        if (!raw.isString("method")) throw new IllegalArgumentException("Expected string property 'method'.");
-
-        this.name = raw.string("method");
-        this.id = (int)raw.number("id");
-        this.params = raw.contains("params") ? raw.map("params") : new JSONMap();
-    }
-    public V8Message(String raw) {
-        this(JSON.parse("json", raw).map());
-    }
-
-    public JSONMap toMap() {
-        var res = new JSONMap();
-        return res;
-    }
-    @Override
-    public String toString() {
-        return JSON.stringify(new JSONMap()
-            .set("method", name)
-            .set("params", params)
-            .set("id", id)
-        );
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+import java.util.Map;
+
+import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.json.JSONElement;
+import me.topchetoeu.jscript.json.JSONMap;
+
+public class V8Message {
+    public final String name;
+    public final int id;
+    public final JSONMap params;
+
+    public V8Message(String name, int id, Map<String, JSONElement> params) {
+        this.name = name;
+        this.params = new JSONMap(params);
+        this.id = id;
+    }
+    public V8Result respond(JSONMap result) {
+        return new V8Result(id, result);
+    }
+    public V8Result respond() {
+        return new V8Result(id, new JSONMap());
+    }
+
+    public V8Message(JSONMap raw) {
+        if (!raw.isNumber("id")) throw new IllegalArgumentException("Expected number property 'id'.");
+        if (!raw.isString("method")) throw new IllegalArgumentException("Expected string property 'method'.");
+
+        this.name = raw.string("method");
+        this.id = (int)raw.number("id");
+        this.params = raw.contains("params") ? raw.map("params") : new JSONMap();
+    }
+    public V8Message(String raw) {
+        this(JSON.parse(new Filename("jscript", "json-msg"), raw).map());
+    }
+
+    public JSONMap toMap() {
+        var res = new JSONMap();
+        return res;
+    }
+    @Override
+    public String toString() {
+        return JSON.stringify(new JSONMap()
+            .set("method", name)
+            .set("params", params)
+            .set("id", id)
+        );
+    }
+}

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

@@ -1,22 +1,22 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import me.topchetoeu.jscript.json.JSON;
-import me.topchetoeu.jscript.json.JSONMap;
-
-public class V8Result {
-    public final int id;
-    public final JSONMap result;
-
-    public V8Result(int id, JSONMap result) {
-        this.id = id;
-        this.result = result;
-    }
-
-    @Override
-    public String toString() {
-        return JSON.stringify(new JSONMap()
-            .set("id", id)
-            .set("result", result)
-        );
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.json.JSONMap;
+
+public class V8Result {
+    public final int id;
+    public final JSONMap result;
+
+    public V8Result(int id, JSONMap result) {
+        this.id = id;
+        this.result = result;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.stringify(new JSONMap()
+            .set("id", id)
+            .set("result", result)
+        );
+    }
+}

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

@@ -1,185 +1,207 @@
-package me.topchetoeu.jscript.engine.debug;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-
-import me.topchetoeu.jscript.engine.debug.WebSocketMessage.Type;
-
-public class WebSocket implements AutoCloseable {
-    public long maxLength = 2000000;
-
-    private Socket socket;
-    private boolean closed = false;
-
-    private OutputStream out() throws IOException {
-        return socket.getOutputStream();
-    }
-    private InputStream in() throws IOException {
-        return socket.getInputStream();
-    }
-
-    private long readLen(int byteLen) throws IOException {
-        long res = 0;
-
-        if (byteLen == 126) {
-            res |= in().read() << 8;
-            res |= in().read();
-            return res;
-        }
-        else if (byteLen == 127) {
-            res |= in().read() << 56;
-            res |= in().read() << 48;
-            res |= in().read() << 40;
-            res |= in().read() << 32;
-            res |= in().read() << 24;
-            res |= in().read() << 16;
-            res |= in().read() << 8;
-            res |= in().read();
-            return res;
-        }
-        else return byteLen;
-    }
-    private byte[] readMask(boolean has) throws IOException {
-        if (has) {
-            return new byte[] {
-                (byte)in().read(),
-                (byte)in().read(),
-                (byte)in().read(),
-                (byte)in().read()
-            };
-        }
-        else return new byte[4];
-    }
-
-    private void writeLength(long len) throws IOException {
-        if (len < 126) {
-            out().write((int)len);
-        }
-        else if (len < 0xFFFF) {
-            out().write(126);
-            out().write((int)(len >> 8) & 0xFF);
-            out().write((int)len & 0xFF);
-        }
-        else {
-            out().write(127);
-            out().write((int)(len >> 56) & 0xFF);
-            out().write((int)(len >> 48) & 0xFF);
-            out().write((int)(len >> 40) & 0xFF);
-            out().write((int)(len >> 32) & 0xFF);
-            out().write((int)(len >> 24) & 0xFF);
-            out().write((int)(len >> 16) & 0xFF);
-            out().write((int)(len >> 8) & 0xFF);
-            out().write((int)len & 0xFF);
-        }
-    }
-    private synchronized void write(int type, byte[] data) throws IOException {
-        out().write(type | 0x80);
-        writeLength(data.length);
-        for (int i = 0; i < data.length; i++) {
-            out().write(data[i]);
-        }
-    }
-
-    public void send(String data) throws IOException {
-        if (closed) throw new IllegalStateException("Object is closed.");
-        write(1, data.getBytes());
-    }
-    public void send(byte[] data) throws IOException {
-        if (closed) throw new IllegalStateException("Object is closed.");
-        write(2, data);
-    }
-    public void send(WebSocketMessage msg) throws IOException {
-        if (msg.type == Type.Binary) send(msg.binaryData());
-        else send(msg.textData());
-    }
-    public void send(Object data) throws IOException {
-        if (closed) throw new IllegalStateException("Object is closed.");
-        write(1, data.toString().getBytes());
-    }
-
-    public void close(String reason) {
-        if (socket != null) {
-            try { write(8, reason.getBytes()); } catch (IOException e) { /* ¯\_(ツ)_/¯ */ }
-            try { socket.close(); } catch (IOException e) { e.printStackTrace(); }
-        }
-
-        socket = null;
-        closed = true;
-    }
-    public void close() {
-        close("");
-    }
-
-    private WebSocketMessage fail(String reason) {
-        System.out.println("WebSocket Error: " + reason);
-        close(reason);
-        return null;
-    }
-
-    private byte[] readData() throws IOException {
-        var maskLen = in().read();
-        var hasMask = (maskLen & 0x80) != 0;
-        var len = (int)readLen(maskLen & 0x7F);
-        var mask = readMask(hasMask);
-
-        if (len > maxLength) fail("WebSocket Error: client exceeded configured max message size");
-        else {
-            var buff = new byte[len];
-
-            if (in().read(buff) < len) fail("WebSocket Error: payload too short");
-            else {
-                for (int i = 0; i < len; i++) {
-                    buff[i] ^= mask[(int)(i % 4)];
-                }
-                return buff;
-            }
-        }
-
-        return null;
-    }
-
-    public WebSocketMessage receive() throws InterruptedException {
-        try {
-            var data = new ByteArrayOutputStream();
-            var type = 0;
-
-            while (socket != null && !closed) {
-                var finId = in().read();
-                var fin = (finId & 0x80) != 0;
-                int id = finId & 0x0F;
-
-                if (id == 0x8) { close(); return null; }
-                if (id >= 0x8) {
-                    if (!fin) return fail("WebSocket Error: client-sent control frame was fragmented");
-                    if (id == 0x9) write(0xA, data.toByteArray());
-                    continue;
-                }
-
-                if (type == 0) type = id;
-                if (type == 0) return fail("WebSocket Error: client used opcode 0x00 for first fragment");
-
-                var buff = readData();
-                if (buff == null) break;
-
-                if (data.size() + buff.length > maxLength) return fail("WebSocket Error: client exceeded configured max message size");
-                data.write(buff);
-
-                if (!fin) continue;
-                var raw = data.toByteArray();
-
-                if (type == 1) return new WebSocketMessage(new String(raw));
-                else return new WebSocketMessage(raw);
-            }
-        }
-        catch (IOException e) { close(); }
-
-        return null;
-    }
-
-    public WebSocket(Socket socket) {
-        this.socket = socket;
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import me.topchetoeu.jscript.engine.debug.WebSocketMessage.Type;
+import me.topchetoeu.jscript.exceptions.UncheckedIOException;
+
+public class WebSocket implements AutoCloseable {
+    public long maxLength = 2000000;
+
+    private Socket socket;
+    private boolean closed = false;
+
+    private OutputStream out() {
+        try { return socket.getOutputStream(); }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+    private InputStream in() {
+        try { return socket.getInputStream(); }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+
+    private long readLen(int byteLen) {
+        long res = 0;
+
+        try {
+            if (byteLen == 126) {
+                res |= in().read() << 8;
+                res |= in().read();
+                return res;
+            }
+            else if (byteLen == 127) {
+                res |= in().read() << 56;
+                res |= in().read() << 48;
+                res |= in().read() << 40;
+                res |= in().read() << 32;
+                res |= in().read() << 24;
+                res |= in().read() << 16;
+                res |= in().read() << 8;
+                res |= in().read();
+                return res;
+            }
+            else return byteLen;
+        }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+    private byte[] readMask(boolean has) {
+        if (has) {
+            try { return new byte[] {
+                (byte)in().read(),
+                (byte)in().read(),
+                (byte)in().read(),
+                (byte)in().read()
+            }; }
+            catch (IOException e) { throw new UncheckedIOException(e); }
+        }
+        else return new byte[4];
+    }
+
+    private void writeLength(long len) {
+        try {
+            if (len < 126) {
+                out().write((int)len);
+            }
+            else if (len < 0xFFFF) {
+                out().write(126);
+                out().write((int)(len >> 8) & 0xFF);
+                out().write((int)len & 0xFF);
+            }
+            else {
+                out().write(127);
+                out().write((int)(len >> 56) & 0xFF);
+                out().write((int)(len >> 48) & 0xFF);
+                out().write((int)(len >> 40) & 0xFF);
+                out().write((int)(len >> 32) & 0xFF);
+                out().write((int)(len >> 24) & 0xFF);
+                out().write((int)(len >> 16) & 0xFF);
+                out().write((int)(len >> 8) & 0xFF);
+                out().write((int)len & 0xFF);
+            }
+        }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+    private synchronized void write(int type, byte[] data) {
+        try {
+            out().write(type | 0x80);
+            writeLength(data.length);
+            for (int i = 0; i < data.length; i++) {
+                out().write(data[i]);
+            }
+        }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+
+    public void send(String data) {
+        if (closed) throw new IllegalStateException("Object is closed.");
+        write(1, data.getBytes());
+    }
+    public void send(byte[] data) {
+        if (closed) throw new IllegalStateException("Object is closed.");
+        write(2, data);
+    }
+    public void send(WebSocketMessage msg) {
+        if (msg.type == Type.Binary) send(msg.binaryData());
+        else send(msg.textData());
+    }
+    public void send(Object data) {
+        if (closed) throw new IllegalStateException("Object is closed.");
+        write(1, data.toString().getBytes());
+    }
+
+    public void close(String reason) {
+        if (socket != null) {
+            try {
+                write(8, reason.getBytes());
+                socket.close();
+            }
+            catch (Throwable e) { }
+        }
+
+        socket = null;
+        closed = true;
+    }
+    public void close() {
+        close("");
+    }
+
+    private WebSocketMessage fail(String reason) {
+        System.out.println("WebSocket Error: " + reason);
+        close(reason);
+        return null;
+    }
+
+    private byte[] readData() {
+        try {
+            var maskLen = in().read();
+            var hasMask = (maskLen & 0x80) != 0;
+            var len = (int)readLen(maskLen & 0x7F);
+            var mask = readMask(hasMask);
+    
+            if (len > maxLength) fail("WebSocket Error: client exceeded configured max message size");
+            else {
+                var buff = new byte[len];
+    
+                if (in().read(buff) < len) fail("WebSocket Error: payload too short");
+                else {
+                    for (int i = 0; i < len; i++) {
+                        buff[i] ^= mask[(int)(i % 4)];
+                    }
+                    return buff;
+                }
+            }
+
+            return null;
+        }
+        catch (IOException e) { throw new UncheckedIOException(e); }
+    }
+
+    public WebSocketMessage receive() {
+        try {
+            var data = new ByteArrayOutputStream();
+            var type = 0;
+
+            while (socket != null && !closed) {
+                var finId = in().read();
+                if (finId < 0) break;
+                var fin = (finId & 0x80) != 0;
+                int id = finId & 0x0F;
+
+                if (id == 0x8) { close(); return null; }
+                if (id >= 0x8) {
+                    if (!fin) return fail("WebSocket Error: client-sent control frame was fragmented");
+                    if (id == 0x9) write(0xA, data.toByteArray());
+                    continue;
+                }
+
+                if (type == 0) type = id;
+                if (type == 0) return fail("WebSocket Error: client used opcode 0x00 for first fragment");
+
+                var buff = readData();
+                if (buff == null) break;
+
+                if (data.size() + buff.length > maxLength) return fail("WebSocket Error: client exceeded configured max message size");
+                data.write(buff);
+
+                if (!fin) continue;
+                var raw = data.toByteArray();
+
+                if (type == 1) return new WebSocketMessage(new String(raw));
+                else return new WebSocketMessage(raw);
+            }
+        }
+        catch (IOException e) {
+            close();
+        }
+
+        return null;
+    }
+
+    public WebSocket(Socket socket) {
+        this.socket = socket;
+    }
+}

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

@@ -1,29 +1,29 @@
-package me.topchetoeu.jscript.engine.debug;
-
-public class WebSocketMessage {
-    public static enum Type {
-        Text,
-        Binary,
-    }
-
-    public final Type type;
-    private final Object data;
-
-    public final String textData() {
-        if (type != Type.Text) throw new IllegalStateException("Message is not text.");
-        return (String)data;
-    }
-    public final byte[] binaryData() {
-        if (type != Type.Binary) throw new IllegalStateException("Message is not binary.");
-        return (byte[])data;
-    }
-
-    public WebSocketMessage(String data) {
-        this.type = Type.Text;
-        this.data = data;
-    }
-    public WebSocketMessage(byte[] data) {
-        this.type = Type.Binary;
-        this.data = data;
-    }
-}
+package me.topchetoeu.jscript.engine.debug;
+
+public class WebSocketMessage {
+    public static enum Type {
+        Text,
+        Binary,
+    }
+
+    public final Type type;
+    private final Object data;
+
+    public final String textData() {
+        if (type != Type.Text) throw new IllegalStateException("Message is not text.");
+        return (String)data;
+    }
+    public final byte[] binaryData() {
+        if (type != Type.Binary) throw new IllegalStateException("Message is not binary.");
+        return (byte[])data;
+    }
+
+    public WebSocketMessage(String data) {
+        this.type = Type.Text;
+        this.data = data;
+    }
+    public WebSocketMessage(byte[] data) {
+        this.type = Type.Binary;
+        this.data = data;
+    }
+}

src/me/topchetoeu/jscript/engine/debug/handlers/DebuggerHandles.java

@@ -1,29 +0,0 @@
-package me.topchetoeu.jscript.engine.debug.handlers;
-
-import java.io.IOException;
-
-import me.topchetoeu.jscript.engine.DebugCommand;
-import me.topchetoeu.jscript.engine.Engine;
-import me.topchetoeu.jscript.engine.debug.V8Error;
-import me.topchetoeu.jscript.engine.debug.V8Message;
-import me.topchetoeu.jscript.engine.debug.WebSocket;
-import me.topchetoeu.jscript.json.JSONMap;
-
-public class DebuggerHandles {
-    public static void enable(V8Message msg, Engine engine, WebSocket ws) throws IOException {
-        if (engine.debugState == null) ws.send(new V8Error("Debugging is disabled for this engine."));
-        else ws.send(msg.respond(new JSONMap().set("debuggerId", 1)));
-    }
-    public static void disable(V8Message msg, Engine engine, WebSocket ws) throws IOException {
-        if (engine.debugState == null) ws.send(msg.respond());
-        else ws.send(new V8Error("Debugger may not be disabled."));
-    }
-    public static void stepInto(V8Message msg, Engine engine, WebSocket ws) throws IOException {
-        if (engine.debugState == null) ws.send(new V8Error("Debugging is disabled for this engine."));
-        else if (!engine.debugState.paused()) ws.send(new V8Error("Debugger is not paused."));
-        else {
-            engine.debugState.resume(DebugCommand.STEP_INTO);
-            ws.send(msg.respond());
-        }
-    }
-}

src/me/topchetoeu/jscript/engine/frame/CodeFrame.java

@@ -1,19 +1,20 @@
 package me.topchetoeu.jscript.engine.frame;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Stack;
 
 import me.topchetoeu.jscript.Location;
-import me.topchetoeu.jscript.engine.CallContext;
-import me.topchetoeu.jscript.engine.DebugCommand;
-import me.topchetoeu.jscript.engine.Engine;
-import me.topchetoeu.jscript.engine.CallContext.DataKey;
+import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.engine.StackData;
 import me.topchetoeu.jscript.engine.scope.LocalScope;
 import me.topchetoeu.jscript.engine.scope.ValueVariable;
 import me.topchetoeu.jscript.engine.values.ArrayValue;
 import me.topchetoeu.jscript.engine.values.CodeFunction;
+import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.engine.values.ScopeValue;
 import me.topchetoeu.jscript.engine.values.Values;
 import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.exceptions.InterruptException;
 
 public class CodeFrame {
     private class TryCtx {
@@ -27,8 +28,8 @@ public class CodeFrame {
         public final int tryStart, catchStart, finallyStart, end;
         public int state;
         public Object retVal;
-        public int jumpPtr;
         public EngineException err;
+        public int jumpPtr;
 
         public TryCtx(int tryStart, int tryN, int catchN, int finallyN) {
             hasCatch = catchN >= 0;
@@ -45,24 +46,45 @@ public class CodeFrame {
         }
     }
 
-    public static final DataKey<Integer> STACK_N_KEY = new DataKey<>();
-    public static final DataKey<Integer> MAX_STACK_KEY = new DataKey<>();
-    public static final DataKey<Boolean> STOP_AT_START_KEY = new DataKey<>();
-    public static final DataKey<Boolean> STEPPING_TROUGH_KEY = new DataKey<>();
-
     public final LocalScope scope;
     public final Object thisArg;
     public final Object[] args;
-    public final List<TryCtx> tryStack = new ArrayList<>();
+    public final Stack<TryCtx> tryStack = new Stack<>();
     public final CodeFunction function;
 
     public Object[] stack = new Object[32];
     public int stackPtr = 0;
     public int codePtr = 0;
     public boolean jumpFlag = false;
-    private DebugCommand debugCmd = null;
     private Location prevLoc = null;
 
+    public ObjectValue getLocalScope(Context ctx, boolean props) {
+        var names = new String[scope.locals.length];
+
+        for (int i = 0; i < scope.locals.length; i++) {
+            var name = "local_" + (i - 2);
+
+            if (i == 0) name = "this";
+            else if (i == 1) name = "arguments";
+            else if (i < function.localNames.length) name = function.localNames[i];
+
+            names[i] = name;
+        }
+
+        return new ScopeValue(scope.locals, names);
+    }
+    public ObjectValue getCaptureScope(Context ctx, boolean props) {
+        var names = new String[scope.captures.length];
+
+        for (int i = 0; i < scope.captures.length; i++) {
+            var name = "capture_" + (i - 2);
+            if (i < function.captureNames.length) name = function.captureNames[i];
+            names[i] = name;
+        }
+
+        return new ScopeValue(scope.captures, names);
+    }
+
     public void addTry(int n, int catchN, int finallyN) {
         var res = new TryCtx(codePtr + 1, n, catchN, finallyN);
 
@@ -93,227 +115,163 @@ public class CodeFrame {
 
         return res;
     }
-    public void push(Object val) {
+    public void push(Context ctx, Object val) {
         if (stack.length <= stackPtr) {
             var newStack = new Object[stack.length * 2];
             System.arraycopy(stack, 0, newStack, 0, stack.length);
             stack = newStack;
         }
-        stack[stackPtr++] = Values.normalize(val);
+        stack[stackPtr++] = Values.normalize(ctx, val);
     }
 
-    public void start(CallContext ctx) {
-        if (ctx.getData(STACK_N_KEY, 0) >= ctx.addData(MAX_STACK_KEY, 10000)) throw EngineException.ofRange("Stack overflow!");
-        ctx.changeData(STACK_N_KEY);
-
-        var debugState = ctx.getData(Engine.DEBUG_STATE_KEY);
-        if (debugState != null) debugState.pushFrame(this);
+    private void setCause(Context ctx, EngineException err, EngineException cause) {
+        err.cause = cause;
     }
-    public void end(CallContext ctx) {
-        var debugState = ctx.getData(Engine.DEBUG_STATE_KEY);
-
-        if (debugState != null) debugState.popFrame();
-        ctx.changeData(STACK_N_KEY, -1);
-    }
-
-    private Object nextNoTry(CallContext ctx) throws InterruptedException {
-        if (Thread.currentThread().isInterrupted()) throw new InterruptedException();
+    private Object nextNoTry(Context ctx, Instruction instr) {
+        if (Thread.currentThread().isInterrupted()) throw new InterruptException();
         if (codePtr < 0 || codePtr >= function.body.length) return null;
 
-        var instr = function.body[codePtr];
-
-        var loc = instr.location;
-        if (loc != null) prevLoc = loc;
-
-        // var debugState = ctx.getData(Engine.DEBUG_STATE_KEY);
-        // if (debugCmd == null) {
-        //     if (ctx.getData(STOP_AT_START_KEY, false)) debugCmd = DebugCommand.STEP_OVER;
-        //     else debugCmd = DebugCommand.NORMAL;
-
-        //     if (debugState != null) debugState.pushFrame(this);
-        // }
-
-        // if (debugState != null && loc != null) {
-        //     if (
-        //         instr.type == Type.NOP && instr.match("debug") || debugState.breakpoints.contains(loc) || (
-        //             ctx.getData(STEPPING_TROUGH_KEY, false) &&
-        //             (debugCmd == DebugCommand.STEP_INTO || debugCmd == DebugCommand.STEP_OVER)
-        //         )
-        //     ) {
-        //         ctx.setData(STEPPING_TROUGH_KEY, true);
-
-        //         debugState.breakpointNotifier.next(new BreakpointData(loc, ctx));
-        //         debugCmd = debugState.commandNotifier.toAwaitable().await();
-        //         if (debugCmd == DebugCommand.NORMAL) ctx.setData(STEPPING_TROUGH_KEY, false);
-        //     }
-        // }
-
         try {
             this.jumpFlag = false;
-            return Runners.exec(debugCmd, instr, this, ctx);
+            return Runners.exec(ctx, instr, this);
         }
         catch (EngineException e) {
-            throw e.add(function.name, prevLoc);
+            throw e.add(function.name, prevLoc).setCtx(function.environment, ctx.engine);
         }
     }
 
-    public Object next(CallContext ctx, Object prevReturn, Object prevError) throws InterruptedException {
-        TryCtx tryCtx = null;
-        if (prevError != Runners.NO_RETURN) prevReturn = Runners.NO_RETURN;
+    public Object next(Context ctx, Object value, Object returnValue, EngineException error) {
+        if (value != Runners.NO_RETURN) push(ctx, value);
+        var debugger = StackData.getDebugger(ctx);
 
-        while (!tryStack.isEmpty()) {
-            var tmp = tryStack.get(tryStack.size() - 1);
-            var remove = false;
+        if (returnValue == Runners.NO_RETURN && error == null) {
+            try {
+                var instr = function.body[codePtr];
 
-            if (prevError != Runners.NO_RETURN) {
-                remove = true;
-                if (tmp.state == TryCtx.STATE_TRY) {
-                    tmp.jumpPtr = tmp.end;
-
-                    if (tmp.hasCatch) {
-                        tmp.state = TryCtx.STATE_CATCH;
-                        scope.catchVars.add(new ValueVariable(false, prevError));
-                        prevError = Runners.NO_RETURN;
-                        codePtr = tmp.catchStart;
-                        remove = false;
-                    }
-                    else if (tmp.hasFinally) {
-                        tmp.state = TryCtx.STATE_FINALLY_THREW;
-                        tmp.err = new EngineException(prevError);
-                        prevError = Runners.NO_RETURN;
-                        codePtr = tmp.finallyStart;
-                        remove = false;
-                    }
-                }
-            }
-            else if (prevReturn != Runners.NO_RETURN) {
-                remove = true;
-                if (tmp.hasFinally && tmp.state <= TryCtx.STATE_CATCH) {
-                    tmp.state = TryCtx.STATE_FINALLY_RETURNED;
-                    tmp.retVal = prevReturn;
-                    prevReturn = Runners.NO_RETURN;
-                    codePtr = tmp.finallyStart;
-                    remove = false;
-                }
-            }
-            else if (tmp.state == TryCtx.STATE_TRY) {
-                if (codePtr < tmp.tryStart || codePtr >= tmp.catchStart) {
-                    if (jumpFlag) tmp.jumpPtr = codePtr;
-                    else tmp.jumpPtr = tmp.end;
-
-                    if (tmp.hasFinally) {
-                        tmp.state = TryCtx.STATE_FINALLY_JUMPED;
-                        codePtr = tmp.finallyStart;
-                    }
-                    else codePtr = tmp.jumpPtr;
-                    remove = !tmp.hasFinally;
-                }
-            }
-            else if (tmp.state == TryCtx.STATE_CATCH) {
-                if (codePtr < tmp.catchStart || codePtr >= tmp.finallyStart) {
-                    if (jumpFlag) tmp.jumpPtr = codePtr;
-                    else tmp.jumpPtr = tmp.end;
-                    scope.catchVars.remove(scope.catchVars.size() - 1);
-
-                    if (tmp.hasFinally) {
-                        tmp.state = TryCtx.STATE_FINALLY_JUMPED;
-                        codePtr = tmp.finallyStart;
-                    }
-                    else codePtr = tmp.jumpPtr;
-                    remove = !tmp.hasFinally;
-                }
-            }
-            else if (codePtr < tmp.finallyStart || codePtr >= tmp.end) {
-                if (!jumpFlag) {
-                    if (tmp.state == TryCtx.STATE_FINALLY_THREW) throw tmp.err;
-                    else if (tmp.state == TryCtx.STATE_FINALLY_RETURNED) return tmp.retVal;
-                    else if (tmp.state == TryCtx.STATE_FINALLY_JUMPED) codePtr = tmp.jumpPtr;
-                }
-                else codePtr = tmp.jumpPtr;
-                remove = true;
-            }
-
-            if (remove) tryStack.remove(tryStack.size() - 1);
-            else {
-                tryCtx = tmp;
-                break;
+                if (debugger != null) debugger.onInstruction(ctx, this, instr, Runners.NO_RETURN, null, false);
+                returnValue = nextNoTry(ctx, instr);
             }
+            catch (EngineException e) { error = e; }
         }
 
-        if (prevError != Runners.NO_RETURN) throw new EngineException(prevError);
-        if (prevReturn != Runners.NO_RETURN) return prevReturn;
+        while (!tryStack.empty()) {
+            var tryCtx = tryStack.peek();
+            var newState = -1;
 
-        if (tryCtx == null) return nextNoTry(ctx);
-        else if (tryCtx.state == TryCtx.STATE_TRY) {
-            try {
-                var res = nextNoTry(ctx);
-                if (res != Runners.NO_RETURN && tryCtx.hasFinally) {
-                    tryCtx.retVal = res;
-                    tryCtx.state = TryCtx.STATE_FINALLY_RETURNED;
-                }
+            switch (tryCtx.state) {
+                case TryCtx.STATE_TRY:
+                    if (error != null) {
+                        if (tryCtx.hasCatch) {
+                            tryCtx.err = error;
+                            newState = TryCtx.STATE_CATCH;
+                        }
+                        else if (tryCtx.hasFinally) {
+                            tryCtx.err = error;
+                            newState = TryCtx.STATE_FINALLY_THREW;
+                        }
+                        break;
+                    }
+                    else if (returnValue != Runners.NO_RETURN) {
+                        if (tryCtx.hasFinally) {
+                            tryCtx.retVal = returnValue;
+                            newState = TryCtx.STATE_FINALLY_RETURNED;
+                        }
+                        break;
+                    }
+                    else if (codePtr >= tryCtx.tryStart && codePtr < tryCtx.catchStart) return Runners.NO_RETURN;
 
-                else return res;
+                    if (tryCtx.hasFinally) {
+                        if (jumpFlag) tryCtx.jumpPtr = codePtr;
+                        else tryCtx.jumpPtr = tryCtx.end;
+                        newState = TryCtx.STATE_FINALLY_JUMPED;
+                    }
+                    else codePtr = tryCtx.end;
+                    break;
+                case TryCtx.STATE_CATCH:
+                    if (error != null) {
+                        if (tryCtx.hasFinally) {
+                            tryCtx.err = error;
+                            newState = TryCtx.STATE_FINALLY_THREW;
+                        }
+                        setCause(ctx, error, tryCtx.err);
+                        break;
+                    }
+                    else if (returnValue != Runners.NO_RETURN) {
+                        if (tryCtx.hasFinally) {
+                            tryCtx.retVal = returnValue;
+                            newState = TryCtx.STATE_FINALLY_RETURNED;
+                        }
+                        break;
+                    }
+                    else if (codePtr >= tryCtx.catchStart && codePtr < tryCtx.finallyStart) return Runners.NO_RETURN;
+
+                    if (tryCtx.hasFinally) {
+                        if (jumpFlag) tryCtx.jumpPtr = codePtr;
+                        else tryCtx.jumpPtr = tryCtx.end;
+                        newState = TryCtx.STATE_FINALLY_JUMPED;
+                    }
+                    else codePtr = tryCtx.end;
+                    break;
+                case TryCtx.STATE_FINALLY_THREW:
+                    if (error != null) setCause(ctx, error, tryCtx.err);
+                    else if (codePtr < tryCtx.finallyStart || codePtr >= tryCtx.end) error = tryCtx.err;
+                    else return Runners.NO_RETURN;
+                    break;
+                case TryCtx.STATE_FINALLY_RETURNED:
+                    if (returnValue == Runners.NO_RETURN) {
+                        if (codePtr < tryCtx.finallyStart || codePtr >= tryCtx.end) returnValue = tryCtx.retVal;
+                        else return Runners.NO_RETURN;
+                    }
+                    break;
+                case TryCtx.STATE_FINALLY_JUMPED:
+                    if (codePtr < tryCtx.finallyStart || codePtr >= tryCtx.end) {
+                        if (!jumpFlag) codePtr = tryCtx.jumpPtr;
+                        else codePtr = tryCtx.end;
+                    }
+                    else return Runners.NO_RETURN;
+                    break;
             }
-            catch (EngineException e) {
-                if (tryCtx.hasCatch) {
-                    tryCtx.state = TryCtx.STATE_CATCH;
+
+            if (tryCtx.state == TryCtx.STATE_CATCH) scope.catchVars.remove(scope.catchVars.size() - 1);
+
+            if (newState == -1) {
+                tryStack.pop();
+                continue;
+            }
+
+            tryCtx.state = newState;
+            switch (newState) {
+                case TryCtx.STATE_CATCH:
+                    scope.catchVars.add(new ValueVariable(false, tryCtx.err.value));
                     codePtr = tryCtx.catchStart;
-                    scope.catchVars.add(new ValueVariable(false, e.value));
-                    return Runners.NO_RETURN;
-                }
-                else if (tryCtx.hasFinally) {
-                    tryCtx.err = e;
-                    tryCtx.state = TryCtx.STATE_FINALLY_THREW;
-                }
-                else throw e;
+                    if (debugger != null) debugger.onInstruction(ctx, this, function.body[codePtr], null, error, true);
+                    break;
+                default:
+                    codePtr = tryCtx.finallyStart;
             }
 
-            codePtr = tryCtx.finallyStart;
             return Runners.NO_RETURN;
         }
-        else if (tryCtx.state == TryCtx.STATE_CATCH) {
-            try {
-                var res = nextNoTry(ctx);
-                if (res != Runners.NO_RETURN && tryCtx.hasFinally) {
-                    tryCtx.retVal = res;
-                    tryCtx.state = TryCtx.STATE_FINALLY_RETURNED;
-                }
-                else return res;
-            }
-            catch (EngineException e) {
-                if (tryCtx.hasFinally) {
-                    tryCtx.err = e;
-                    tryCtx.state = TryCtx.STATE_FINALLY_THREW;
-                }
-                else throw e;
-            }
-
-            codePtr = tryCtx.finallyStart;
-            return Runners.NO_RETURN;
+    
+        if (error != null) {
+            if (debugger != null) debugger.onInstruction(ctx, this, function.body[codePtr], null, error, false);
+            throw error;
         }
-        else return nextNoTry(ctx);
+        if (returnValue != Runners.NO_RETURN) {
+            if (debugger != null) debugger.onInstruction(ctx, this, function.body[codePtr], returnValue, null, false);
+            return returnValue;
+        }
+
+        return Runners.NO_RETURN;
     }
 
-    public Object run(CallContext ctx) throws InterruptedException {
-        try {
-            start(ctx);
-            while (true) {
-                var res = next(ctx, Runners.NO_RETURN, Runners.NO_RETURN);
-                if (res != Runners.NO_RETURN) return res;
-            }
-        }
-        finally {
-            end(ctx);
-        }
-    }
-
-    public CodeFrame(Object thisArg, Object[] args, CodeFunction func) {
+    public CodeFrame(Context ctx, Object thisArg, Object[] args, CodeFunction func) {
         this.args = args.clone();
         this.scope = new LocalScope(func.localsN, func.captures);
         this.scope.get(0).set(null, thisArg);
         var argsObj = new ArrayValue();
         for (var i = 0; i < args.length; i++) {
-            argsObj.set(i, args[i]);
+            argsObj.set(ctx, i, args[i]);
         }
         this.scope.get(1).value = argsObj;
 

src/me/topchetoeu/jscript/engine/frame/Runners.java

@@ -3,14 +3,12 @@ package me.topchetoeu.jscript.engine.frame;
 import java.util.Collections;
 
 import me.topchetoeu.jscript.compilation.Instruction;
-import me.topchetoeu.jscript.engine.CallContext;
-import me.topchetoeu.jscript.engine.DebugCommand;
+import me.topchetoeu.jscript.engine.Context;
 import me.topchetoeu.jscript.engine.Operation;
 import me.topchetoeu.jscript.engine.scope.ValueVariable;
 import me.topchetoeu.jscript.engine.values.ArrayValue;
 import me.topchetoeu.jscript.engine.values.CodeFunction;
 import me.topchetoeu.jscript.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.SignalValue;
 import me.topchetoeu.jscript.engine.values.Symbol;
 import me.topchetoeu.jscript.engine.values.Values;
 import me.topchetoeu.jscript.exceptions.EngineException;
@@ -18,62 +16,58 @@ import me.topchetoeu.jscript.exceptions.EngineException;
 public class Runners {
     public static final Object NO_RETURN = new Object();
 
-    public static Object execReturn(Instruction instr, CodeFrame frame, CallContext ctx) {
-        frame.codePtr++;
+    public static Object execReturn(Context ctx, Instruction instr, CodeFrame frame) {
         return frame.pop();
     }
-    public static Object execSignal(Instruction instr, CodeFrame frame, CallContext ctx) {
-        frame.codePtr++;
-        return new SignalValue(instr.get(0));
-    }
-    public static Object execThrow(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execThrow(Context ctx, Instruction instr, CodeFrame frame) {
         throw new EngineException(frame.pop());
     }
-    public static Object execThrowSyntax(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execThrowSyntax(Context ctx, Instruction instr, CodeFrame frame) {
         throw EngineException.ofSyntax((String)instr.get(0));
     }
 
-    private static Object call(DebugCommand state, CallContext ctx, Object func, Object thisArg, Object... args) throws InterruptedException {
-        ctx.setData(CodeFrame.STOP_AT_START_KEY, state == DebugCommand.STEP_INTO);
+    private static Object call(Context ctx, Object func, Object thisArg, Object ...args) {
         return Values.call(ctx, func, thisArg, args);
     }
 
-    public static Object execCall(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execCall(Context ctx, Instruction instr, CodeFrame frame) {
         var callArgs = frame.take(instr.get(0));
         var func = frame.pop();
         var thisArg = frame.pop();
 
-        frame.push(call(state, ctx, func, thisArg, callArgs));
+        frame.push(ctx, call(ctx, func, thisArg, callArgs));
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execCallNew(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execCallNew(Context ctx, Instruction instr, CodeFrame frame) {
         var callArgs = frame.take(instr.get(0));
         var funcObj = frame.pop();
 
-        if (Values.isFunction(funcObj) && Values.function(funcObj).special) {
-            frame.push(call(state, ctx, funcObj, null, callArgs));
-        }
-        else {
-            var proto = Values.getMember(ctx, funcObj, "prototype");
-            var obj = new ObjectValue();
-            obj.setPrototype(ctx, proto);
-            call(state, ctx, funcObj, obj, callArgs);
-            frame.push(obj);
-        }
+        frame.push(ctx, Values.callNew(ctx, funcObj, callArgs));
+
+        // if (Values.isFunction(funcObj) && Values.function(funcObj).special) {
+        //     frame.push(ctx, call(ctx, funcObj, null, callArgs));
+        // }
+        // else {
+        //     var proto = Values.getMember(ctx, funcObj, "prototype");
+        //     var obj = new ObjectValue();
+        //     obj.setPrototype(ctx, proto);
+        //     call(ctx, funcObj, obj, callArgs);
+        //     frame.push(ctx, obj);
+        // }
 
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object execMakeVar(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execMakeVar(Context ctx, Instruction instr, CodeFrame frame) {
         var name = (String)instr.get(0);
-        frame.function.globals.define(name);
+        ctx.environment().global.define(name);
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execDefProp(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execDefProp(Context ctx, Instruction instr, CodeFrame frame) {
         var setter = frame.pop();
         var getter = frame.pop();
         var name = frame.pop();
@@ -82,28 +76,28 @@ public class Runners {
         if (getter != null && !Values.isFunction(getter)) throw EngineException.ofType("Getter must be a function or undefined.");
         if (setter != null && !Values.isFunction(setter)) throw EngineException.ofType("Setter must be a function or undefined.");
         if (!Values.isObject(obj)) throw EngineException.ofType("Property apply target must be an object.");
-        Values.object(obj).defineProperty(name, Values.function(getter), Values.function(setter), false, false);
+        Values.object(obj).defineProperty(ctx, name, Values.function(getter), Values.function(setter), false, false);
 
-        frame.push(obj);
+        frame.push(ctx, obj);
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execInstanceof(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execInstanceof(Context ctx, Instruction instr, CodeFrame frame) {
         var type = frame.pop();
         var obj = frame.pop();
 
         if (!Values.isPrimitive(type)) {
             var proto = Values.getMember(ctx, type, "prototype");
-            frame.push(Values.isInstanceOf(ctx, obj, proto));
+            frame.push(ctx, Values.isInstanceOf(ctx, obj, proto));
         }
         else {
-            frame.push(false);
+            frame.push(ctx, false);
         }
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execKeys(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execKeys(Context ctx, Instruction instr, CodeFrame frame) {
         var val = frame.pop();
 
         var arr = new ObjectValue();
@@ -113,82 +107,82 @@ public class Runners {
         Collections.reverse(members);
         for (var el : members) {
             if (el instanceof Symbol) continue;
-            arr.defineProperty(i++, el);
+            arr.defineProperty(ctx, i++, el);
         }
 
-        arr.defineProperty("length", i);
+        arr.defineProperty(ctx, "length", i);
 
-        frame.push(arr);
+        frame.push(ctx, arr);
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object execTry(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execTry(Context ctx, Instruction instr, CodeFrame frame) {
         frame.addTry(instr.get(0), instr.get(1), instr.get(2));
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object execDup(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execDup(Context ctx, Instruction instr, CodeFrame frame) {
         int offset = instr.get(0), count = instr.get(1);
 
         for (var i = 0; i < count; i++) {
-            frame.push(frame.peek(offset + count - 1));
+            frame.push(ctx, frame.peek(offset + count - 1));
         }
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execMove(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execMove(Context ctx, Instruction instr, CodeFrame frame) {
         int offset = instr.get(0), count = instr.get(1);
 
         var tmp = frame.take(offset);
         var res = frame.take(count);
 
-        for (var i = 0; i < offset; i++) frame.push(tmp[i]);
-        for (var i = 0; i < count; i++) frame.push(res[i]);
+        for (var i = 0; i < offset; i++) frame.push(ctx, tmp[i]);
+        for (var i = 0; i < count; i++) frame.push(ctx, res[i]);
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadUndefined(Instruction instr, CodeFrame frame, CallContext ctx) {
-        frame.push(null);
+    public static Object execLoadUndefined(Context ctx, Instruction instr, CodeFrame frame) {
+        frame.push(ctx, null);
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadValue(Instruction instr, CodeFrame frame, CallContext ctx) {
-        frame.push(instr.get(0));
+    public static Object execLoadValue(Context ctx, Instruction instr, CodeFrame frame) {
+        frame.push(ctx, instr.get(0));
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadVar(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execLoadVar(Context ctx, Instruction instr, CodeFrame frame) {
         var i = instr.get(0);
 
-        if (i instanceof String) frame.push(frame.function.globals.get(ctx, (String)i));
-        else frame.push(frame.scope.get((int)i).get(ctx));
+        if (i instanceof String) frame.push(ctx, ctx.environment().global.get(ctx, (String)i));
+        else frame.push(ctx, frame.scope.get((int)i).get(ctx));
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadObj(Instruction instr, CodeFrame frame, CallContext ctx) {
-        frame.push(new ObjectValue());
+    public static Object execLoadObj(Context ctx, Instruction instr, CodeFrame frame) {
+        frame.push(ctx, new ObjectValue());
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadGlob(Instruction instr, CodeFrame frame, CallContext ctx) {
-        frame.push(frame.function.globals.obj);
+    public static Object execLoadGlob(Context ctx, Instruction instr, CodeFrame frame) {
+        frame.push(ctx, ctx.environment().global.obj);
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadArr(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execLoadArr(Context ctx, Instruction instr, CodeFrame frame) {
         var res = new ArrayValue();
         res.setSize(instr.get(0));
-        frame.push(res);
+        frame.push(ctx, res);
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadFunc(Instruction instr, CodeFrame frame, CallContext ctx) {
-        int n = (Integer)instr.get(0);
+    public static Object execLoadFunc(Context ctx, Instruction instr, CodeFrame frame) {
+        long id = (Long)instr.get(0);
         int localsN = (Integer)instr.get(1);
         int len = (Integer)instr.get(2);
         var captures = new ValueVariable[instr.params.length - 3];
@@ -197,24 +191,20 @@ public class Runners {
             captures[i - 3] = frame.scope.get(instr.get(i));
         }
 
-        var start = frame.codePtr + 1;
-        var end = start + n - 1;
-        var body = new Instruction[end - start];
-        System.arraycopy(frame.function.body, start, body, 0, end - start);
+        var body = ctx.engine.functions.get(id);
+        var func = new CodeFunction(ctx.environment(), "", localsN, len, captures, body);
 
-        var func = new CodeFunction("", localsN, len, frame.function.globals, captures, body);
-        frame.push(func);
+        frame.push(ctx, func);
 
-        frame.codePtr += n;
+        frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadMember(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execLoadMember(Context ctx, Instruction instr, CodeFrame frame) {
         var key = frame.pop();
         var obj = frame.pop();
 
         try {
-            ctx.setData(CodeFrame.STOP_AT_START_KEY, state == DebugCommand.STEP_INTO);
-            frame.push(Values.getMember(ctx, obj, key));
+            frame.push(ctx, Values.getMember(ctx, obj, key));
         }
         catch (IllegalArgumentException e) {
             throw EngineException.ofType(e.getMessage());
@@ -222,54 +212,53 @@ public class Runners {
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execLoadKeyMember(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
-        frame.push(instr.get(0));
-        return execLoadMember(state, instr, frame, ctx);
+    public static Object execLoadKeyMember(Context ctx, Instruction instr, CodeFrame frame) {
+        frame.push(ctx, instr.get(0));
+        return execLoadMember(ctx, instr, frame);
     }
-    public static Object execLoadRegEx(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
-        frame.push(ctx.engine().makeRegex(instr.get(0), instr.get(1)));
+    public static Object execLoadRegEx(Context ctx, Instruction instr, CodeFrame frame) {
+        frame.push(ctx, ctx.environment().regexConstructor.call(ctx, null, instr.get(0), instr.get(1)));
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object execDiscard(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execDiscard(Context ctx, Instruction instr, CodeFrame frame) {
         frame.pop();
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execStoreMember(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execStoreMember(Context ctx, Instruction instr, CodeFrame frame) {
         var val = frame.pop();
         var key = frame.pop();
         var obj = frame.pop();
 
-        ctx.setData(CodeFrame.STOP_AT_START_KEY, state == DebugCommand.STEP_INTO);
         if (!Values.setMember(ctx, obj, key, val)) throw EngineException.ofSyntax("Can't set member '" + key + "'.");
-        if ((boolean)instr.get(0)) frame.push(val);
+        if ((boolean)instr.get(0)) frame.push(ctx, val);
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execStoreVar(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execStoreVar(Context ctx, Instruction instr, CodeFrame frame) {
         var val = (boolean)instr.get(1) ? frame.peek() : frame.pop();
         var i = instr.get(0);
 
-        if (i instanceof String) frame.function.globals.set(ctx, (String)i, val);
+        if (i instanceof String) ctx.environment().global.set(ctx, (String)i, val);
         else frame.scope.get((int)i).set(ctx, val);
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execStoreSelfFunc(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execStoreSelfFunc(Context ctx, Instruction instr, CodeFrame frame) {
         frame.scope.locals[(int)instr.get(0)].set(ctx, frame.function);
         frame.codePtr++;
         return NO_RETURN;
     }
     
-    public static Object execJmp(Instruction instr, CodeFrame frame, CallContext ctx) {
+    public static Object execJmp(Context ctx, Instruction instr, CodeFrame frame) {
         frame.codePtr += (int)instr.get(0);
         frame.jumpFlag = true;
         return NO_RETURN;
     }
-    public static Object execJmpIf(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execJmpIf(Context ctx, Instruction instr, CodeFrame frame) {
         if (Values.toBoolean(frame.pop())) {
             frame.codePtr += (int)instr.get(0);
             frame.jumpFlag = true;
@@ -277,7 +266,7 @@ public class Runners {
         else frame.codePtr ++;
         return NO_RETURN;
     }
-    public static Object execJmpIfNot(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execJmpIfNot(Context ctx, Instruction instr, CodeFrame frame) {
         if (Values.not(frame.pop())) {
             frame.codePtr += (int)instr.get(0);
             frame.jumpFlag = true;
@@ -286,106 +275,95 @@ public class Runners {
         return NO_RETURN;
     }
 
-    public static Object execIn(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execIn(Context ctx, Instruction instr, CodeFrame frame) {
         var obj = frame.pop();
         var index = frame.pop();
 
-        frame.push(Values.hasMember(ctx, obj, index, false));
+        frame.push(ctx, Values.hasMember(ctx, obj, index, false));
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execTypeof(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execTypeof(Context ctx, Instruction instr, CodeFrame frame) {
         String name = instr.get(0);
         Object obj;
 
         if (name != null) {
-            if (frame.function.globals.has(ctx, name)) {
-                obj = frame.function.globals.get(ctx, name);
+            if (ctx.environment().global.has(ctx, name)) {
+                obj = ctx.environment().global.get(ctx, name);
             }
             else obj = null;
         }
         else obj = frame.pop();
 
-        frame.push(Values.type(obj));
+        frame.push(ctx, Values.type(obj));
 
         frame.codePtr++;
         return NO_RETURN;
     }
-    public static Object execNop(Instruction instr, CodeFrame frame, CallContext ctx) {
-        if (instr.is(0, "dbg_names")) {
-            var names = new String[instr.params.length - 1];
-            for (var i = 0; i < instr.params.length - 1; i++) {
-                if (!(instr.params[i + 1] instanceof String)) throw EngineException.ofSyntax("NOP dbg_names instruction must specify only string parameters.");
-                names[i] = (String)instr.params[i + 1];
-            }
-            frame.scope.setNames(names);
-        }
-
+    public static Object execNop(Context ctx, Instruction instr, CodeFrame frame) {
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object execDelete(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execDelete(Context ctx, Instruction instr, CodeFrame frame) {
         var key = frame.pop();
         var val = frame.pop();
 
         if (!Values.deleteMember(ctx, val, key)) throw EngineException.ofSyntax("Can't delete member '" + key + "'.");
-        frame.push(true);
+        frame.push(ctx, true);
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object execOperation(Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
+    public static Object execOperation(Context ctx, Instruction instr, CodeFrame frame) {
         Operation op = instr.get(0);
         var args = new Object[op.operands];
 
         for (var i = op.operands - 1; i >= 0; i--) args[i] = frame.pop();
 
-        frame.push(Values.operation(ctx, op, args));
+        frame.push(ctx, Values.operation(ctx, op, args));
         frame.codePtr++;
         return NO_RETURN;
     }
 
-    public static Object exec(DebugCommand state, Instruction instr, CodeFrame frame, CallContext ctx) throws InterruptedException {
-        // System.out.println(instr + "@" + instr.location);
+    public static Object exec(Context ctx, Instruction instr, CodeFrame frame) {
         switch (instr.type) {
-            case NOP: return execNop(instr, frame, ctx);
-            case RETURN: return execReturn(instr, frame, ctx);
-            case SIGNAL: return execSignal(instr, frame, ctx);
-            case THROW: return execThrow(instr, frame, ctx);
-            case THROW_SYNTAX: return execThrowSyntax(instr, frame, ctx);
-            case CALL: return execCall(state, instr, frame, ctx);
-            case CALL_NEW: return execCallNew(state, instr, frame, ctx);
-            case TRY: return execTry(state, instr, frame, ctx);
+            case NOP: return execNop(ctx, instr, frame);
+            case RETURN: return execReturn(ctx, instr, frame);
+            case THROW: return execThrow(ctx, instr, frame);
+            case THROW_SYNTAX: return execThrowSyntax(ctx, instr, frame);
+            case CALL: return execCall(ctx, instr, frame);
+            case CALL_NEW: return execCallNew(ctx, instr, frame);
+            case TRY: return execTry(ctx, instr, frame);
 
-            case DUP: return execDup(instr, frame, ctx);
-            case MOVE: return execMove(instr, frame, ctx);
-            case LOAD_VALUE: return execLoadValue(instr, frame, ctx);
-            case LOAD_VAR: return execLoadVar(instr, frame, ctx);
-            case LOAD_OBJ: return execLoadObj(instr, frame, ctx);
-            case LOAD_ARR: return execLoadArr(instr, frame, ctx);
-            case LOAD_FUNC: return execLoadFunc(instr, frame, ctx);
-            case LOAD_MEMBER: return execLoadMember(state, instr, frame, ctx);
-            case LOAD_VAL_MEMBER: return execLoadKeyMember(state, instr, frame, ctx);
-            case LOAD_REGEX: return execLoadRegEx(instr, frame, ctx);
-            case LOAD_GLOB: return execLoadGlob(instr, frame, ctx);
+            case DUP: return execDup(ctx, instr, frame);
+            case MOVE: return execMove(ctx, instr, frame);
+            case LOAD_VALUE: return execLoadValue(ctx, instr, frame);
+            case LOAD_VAR: return execLoadVar(ctx, instr, frame);
+            case LOAD_OBJ: return execLoadObj(ctx, instr, frame);
+            case LOAD_ARR: return execLoadArr(ctx, instr, frame);
+            case LOAD_FUNC: return execLoadFunc(ctx, instr, frame);
+            case LOAD_MEMBER: return execLoadMember(ctx, instr, frame);
+            case LOAD_VAL_MEMBER: return execLoadKeyMember(ctx, instr, frame);
+            case LOAD_REGEX: return execLoadRegEx(ctx, instr, frame);
+            case LOAD_GLOB: return execLoadGlob(ctx, instr, frame);
 
-            case DISCARD: return execDiscard(instr, frame, ctx);
-            case STORE_MEMBER: return execStoreMember(state, instr, frame, ctx);
-            case STORE_VAR: return execStoreVar(instr, frame, ctx);
-            case STORE_SELF_FUNC: return execStoreSelfFunc(instr, frame, ctx);
-            case MAKE_VAR: return execMakeVar(instr, frame, ctx);
+            case DISCARD: return execDiscard(ctx, instr, frame);
+            case STORE_MEMBER: return execStoreMember(ctx, instr, frame);
+            case STORE_VAR: return execStoreVar(ctx, instr, frame);
+            case STORE_SELF_FUNC: return execStoreSelfFunc(ctx, instr, frame);
+            case MAKE_VAR: return execMakeVar(ctx, instr, frame);
 
-            case KEYS: return execKeys(instr, frame, ctx);
-            case DEF_PROP: return execDefProp(instr, frame, ctx);
-            case TYPEOF: return execTypeof(instr, frame, ctx);
-            case DELETE: return execDelete(instr, frame, ctx);
+            case KEYS: return execKeys(ctx, instr, frame);
+            case DEF_PROP: return execDefProp(ctx, instr, frame);
+            case TYPEOF: return execTypeof(ctx, instr, frame);
+            case DELETE: return execDelete(ctx, instr, frame);
 
-            case JMP: return execJmp(instr, frame, ctx);
-            case JMP_IF: return execJmpIf(instr, frame, ctx);
-            case JMP_IFN: return execJmpIfNot(instr, frame, ctx);
+            case JMP: return execJmp(ctx, instr, frame);
+            case JMP_IF: return execJmpIf(ctx, instr, frame);
+            case JMP_IFN: return execJmpIfNot(ctx, instr, frame);
 
-            case OPERATION: return execOperation(instr, frame, ctx);
+            case OPERATION: return execOperation(ctx, instr, frame);
 
             default: throw EngineException.ofSyntax("Invalid instruction " + instr.type.name() + ".");
         }