refactor: split up code in 4 modules

.gitignore

@@ -2,12 +2,15 @@
 
 !/src
 !/src/**/*
-
 /src/assets/js/ts.js
 
+!/doc
+!/doc/**/*
+
 !/tests
 !/tests/**/*
 
+
 !/.github
 !/.github/**/*
 

build.js

@@ -118,7 +118,7 @@ The following is a minified version of the unmodified Typescript 5.2
 }
 async function compileJava(conf) {
     try {
-        await fs.writeFile('Metadata.java', (await fs.readFile('src/me/topchetoeu/jscript/Metadata.java')).toString()
+        await fs.writeFile('Metadata.java', (await fs.readFile('src/me/topchetoeu/jscript/common/Metadata.java')).toString()
             .replace('${VERSION}', conf.version)
             .replace('${NAME}', conf.name)
             .replace('${AUTHOR}', conf.author)
@@ -136,11 +136,22 @@ async function compileJava(conf) {
         await fs.rm('Metadata.java');
     }
 }
+async function jar(conf, project, mainClass) {
+    const args = [
+        'jar', '-c',
+        '-f', `dst/${project}-v${conf.version}.jar`,
+    ];
+    if (mainClass) args.push('-e', mainClass);
+    args.push('-C', 'dst/classes', project.replaceAll('.', '/'));
+    console.log(args.join(' '));
+
+    await run(true, ...args);
+}
 
 (async () => {
     try {
         if (argv[2] === 'init-ts') {
-            await downloadTypescript('src/assets/js/ts.js');
+            await downloadTypescript('src/me/topchetoeu/jscript/utils/assets/js/ts.js');
         }
         else {
             const conf = {
@@ -156,12 +167,21 @@ async function compileJava(conf) {
             try { await fs.rm('dst', { recursive: true }); } catch {}
 
             await Promise.all([
-                downloadTypescript('dst/classes/assets/js/ts.js'),
+                (async () => {
-                copy('src', 'dst/classes', v => !v.endsWith('.java')),
+                    await copy('src', 'dst/classes', v => !v.endsWith('.java'));
+                    // await downloadTypescript('dst/classes/me/topchetoeu/jscript/utils/assets/js/ts.js');
+                })(),
                 compileJava(conf),
             ]);
 
-            await run(true, 'jar', '-c', '-f', 'dst/jscript.jar', '-e', 'me.topchetoeu.jscript.Main', '-C', 'dst/classes', '.');
+            await Promise.all([
+                jar(conf, 'me.topchetoeu.jscript.common'),
+                jar(conf, 'me.topchetoeu.jscript.core'),
+                jar(conf, 'me.topchetoeu.jscript.lib'),
+                jar(conf, 'me.topchetoeu.jscript.utils'),
+                jar(conf, 'me.topchetoeu.jscript', 'me.topchetoeu.jscript.utils.JScriptRepl'),
+            ]);
+
             console.log('Done!');
         }
     }

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 public class Buffer {
     private byte[] data;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 import java.io.File;
 import java.nio.file.Path;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 public class Location implements Comparable<Location> {
     public static final Location INTERNAL = new Location(0, 0, new Filename("jscript", "native"));

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 public class Metadata {
     private static final String VERSION = "${VERSION}";

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript;
+package me.topchetoeu.jscript.common;
 
 import java.io.BufferedReader;
 import java.io.IOException;

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

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

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.events;
+package me.topchetoeu.jscript.common.events;
 
 public interface Awaitable<T> {
     public static interface ResultHandler<T> {

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.events;
+package me.topchetoeu.jscript.common.events;
 
 public class DataNotifier<T> implements Awaitable<T> {
     private Notifier notifier = new Notifier();

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

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.events;
+package me.topchetoeu.jscript.common.events;
 
-import me.topchetoeu.jscript.exceptions.InterruptException;
+import me.topchetoeu.jscript.core.exceptions.InterruptException;
 
 public class Notifier {
     private boolean ok = false;

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

@@ -1,20 +1,20 @@
-package me.topchetoeu.jscript.json;
+package me.topchetoeu.jscript.common.json;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
-import me.topchetoeu.jscript.parsing.Operator;
+import me.topchetoeu.jscript.core.parsing.Operator;
-import me.topchetoeu.jscript.parsing.ParseRes;
+import me.topchetoeu.jscript.core.parsing.ParseRes;
-import me.topchetoeu.jscript.parsing.Parsing;
+import me.topchetoeu.jscript.core.parsing.Parsing;
-import me.topchetoeu.jscript.parsing.Token;
+import me.topchetoeu.jscript.core.parsing.Token;
 
 public class JSON {
     public static Object toJs(JSONElement val) {

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.json;
+package me.topchetoeu.jscript.common.json;
 
 public class JSONElement {
     public static enum Type {

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.json;
+package me.topchetoeu.jscript.common.json;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.json;
+package me.topchetoeu.jscript.common.json;
 
 import java.util.Collection;
 import java.util.HashMap;

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

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

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

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
 
 public final class CalculateResult {
     public final boolean exists;

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

@@ -1,14 +1,14 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeSet;
 import java.util.Vector;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.core.engine.Environment;
-import me.topchetoeu.jscript.engine.values.CodeFunction;
+import me.topchetoeu.jscript.core.engine.values.CodeFunction;
 
 public class CompileTarget {
     public final Vector<Instruction> target = new Vector<>();

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
 import java.util.List;
 import java.util.Vector;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.compilation.values.FunctionStatement;
+import me.topchetoeu.jscript.core.compilation.values.FunctionStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class CompoundStatement extends Statement {
     public final Statement[] statements;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
 public class FunctionBody {
     public final Instruction[] instructions;

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

@@ -1,8 +1,8 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
 
 public class Instruction {
     public static enum Type {

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

@@ -1,8 +1,8 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public abstract class Statement {
     private Location _loc;

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

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
 
 public class ThrowSyntaxStatement extends Statement {
     public final String name;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.jscript.core.compilation;
 
 import java.util.List;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.compilation.values.FunctionStatement;
+import me.topchetoeu.jscript.core.compilation.values.FunctionStatement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class VariableDeclareStatement extends Statement {
     public static class Pair {

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class BreakStatement extends Statement {
     public final String label;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ContinueStatement extends Statement {
     public final String label;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class DebugStatement extends Statement {
     @Override

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class DeleteStatement extends Statement {
     public final Statement key;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class DoWhileStatement extends Statement {
     public final Statement condition, body;

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ForInStatement extends Statement {
     public final String varName;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ForStatement extends Statement {
     public final Statement declaration, assignment, condition, body;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class IfStatement extends Statement {
     public final Statement condition, body, elseBody;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ReturnStatement extends Statement {
     public final Statement value;

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

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
 import java.util.HashMap;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class SwitchStatement extends Statement {
     public static class SwitchCase {

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ThrowStatement extends Statement {
     public final Statement value;

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

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.core.engine.scope.GlobalScope;
-import me.topchetoeu.jscript.engine.scope.LocalScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.LocalScopeRecord;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class TryStatement extends Statement {
     public final Statement tryBody;

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.jscript.core.compilation.control;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class WhileStatement extends Statement {
     public final Statement condition, body;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ArrayStatement extends Statement {
     public final Statement[] statements;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class CallStatement extends Statement {
     public final Statement func;

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
+import me.topchetoeu.jscript.core.compilation.AssignableStatement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ChangeStatement extends Statement {
     public final AssignableStatement value;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ConstantStatement extends Statement {
     public final Object value;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class DiscardStatement extends Statement {
     public final Statement value;

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

@@ -1,17 +1,17 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
 import java.util.Random;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompoundStatement;
+import me.topchetoeu.jscript.core.compilation.CompoundStatement;
-import me.topchetoeu.jscript.compilation.FunctionBody;
+import me.topchetoeu.jscript.core.compilation.FunctionBody;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
 
 public class FunctionStatement extends Statement {
     public final CompoundStatement body;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class GlobalThisStatement extends Statement {
     @Override public boolean pure() { return true; }

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class IndexAssignStatement extends Statement {
     public final Statement object;

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

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
+import me.topchetoeu.jscript.core.compilation.AssignableStatement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.compilation.Instruction.BreakpointType;
+import me.topchetoeu.jscript.core.compilation.Instruction.BreakpointType;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class IndexStatement extends AssignableStatement {
     public final Statement object;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
 
 public class LazyAndStatement extends Statement {
     public final Statement first, second;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
 
 public class LazyOrStatement extends Statement {
     public final Statement first, second;

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

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
 import java.util.ArrayList;
 import java.util.Map;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class ObjectStatement extends Statement {
     public final Map<Object, Statement> map;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class OperationStatement extends Statement {
     public final Statement[] args;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class RegexStatement extends Statement {
     public final String pattern, flags;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class TypeofStatement extends Statement {
     public final Statement value;

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class VariableAssignStatement extends Statement {
     public final String name;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class VariableIndexStatement extends Statement {
     public final int index;

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.jscript.core.compilation.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.AssignableStatement;
+import me.topchetoeu.jscript.core.compilation.AssignableStatement;
-import me.topchetoeu.jscript.compilation.CompileTarget;
+import me.topchetoeu.jscript.core.compilation.CompileTarget;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.compilation.Statement;
+import me.topchetoeu.jscript.core.compilation.Statement;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ScopeRecord;
+import me.topchetoeu.jscript.core.engine.scope.ScopeRecord;
 
 public class VariableStatement extends AssignableStatement {
     public final String name;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine;
+package me.topchetoeu.jscript.core.engine;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,17 +9,17 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.engine.debug.DebugContext;
+import me.topchetoeu.jscript.core.engine.debug.DebugContext;
-import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.core.engine.frame.CodeFrame;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
 import me.topchetoeu.jscript.lib.EnvironmentLib;
-import me.topchetoeu.jscript.mapping.SourceMap;
+import me.topchetoeu.jscript.utils.mapping.SourceMap;
 
 public class Context implements Extensions {
     public static final Context NULL = new Context(null);

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

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.engine;
+package me.topchetoeu.jscript.core.engine;
 
 import java.util.HashMap;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.compilation.FunctionBody;
+import me.topchetoeu.jscript.common.events.Awaitable;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.compilation.FunctionBody;
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
-import me.topchetoeu.jscript.events.Awaitable;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
 
 public class Engine extends EventLoop implements Extensions {
     public static final HashMap<Long, FunctionBody> functions = new HashMap<>();

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

@@ -1,21 +1,21 @@
-package me.topchetoeu.jscript.engine;
+package me.topchetoeu.jscript.core.engine;
 
 import java.util.HashMap;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.engine.debug.DebugContext;
+import me.topchetoeu.jscript.core.engine.debug.DebugContext;
-import me.topchetoeu.jscript.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.core.engine.scope.GlobalScope;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
-import me.topchetoeu.jscript.engine.values.NativeFunction;
+import me.topchetoeu.jscript.core.engine.values.NativeFunction;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.interop.NativeWrapperProvider;
+import me.topchetoeu.jscript.core.parsing.Parsing;
-import me.topchetoeu.jscript.parsing.Parsing;
+import me.topchetoeu.jscript.utils.interop.NativeWrapperProvider;
 
 @SuppressWarnings("unchecked")
 public class Environment implements Extensions {
@@ -45,7 +45,7 @@ public class Environment implements Extensions {
     private HashMap<Symbol, Object> data = new HashMap<>();
 
     public GlobalScope global;
-    public WrappersProvider wrappers;
+    public WrapperProvider wrappers;
 
     @Override public <T> void add(Symbol key, T obj) {
         data.put(key, obj);
@@ -115,7 +115,7 @@ public class Environment implements Extensions {
         return new Context(engine, this);
     }
 
-    public Environment(WrappersProvider nativeConverter, GlobalScope global) {
+    public Environment(WrapperProvider nativeConverter, GlobalScope global) {
         if (nativeConverter == null) nativeConverter = new NativeWrapperProvider(this);
         if (global == null) global = new GlobalScope();
 

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

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.engine;
+package me.topchetoeu.jscript.core.engine;
 
 import java.util.concurrent.PriorityBlockingQueue;
 
-import me.topchetoeu.jscript.ResultRunnable;
+import me.topchetoeu.jscript.common.ResultRunnable;
-import me.topchetoeu.jscript.events.Awaitable;
+import me.topchetoeu.jscript.common.events.Awaitable;
-import me.topchetoeu.jscript.events.DataNotifier;
+import me.topchetoeu.jscript.common.events.DataNotifier;
-import me.topchetoeu.jscript.exceptions.InterruptException;
+import me.topchetoeu.jscript.core.exceptions.InterruptException;
 
 public class EventLoop {
     private static class Task implements Comparable<Task> {

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

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.engine;
+package me.topchetoeu.jscript.core.engine;
 
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
 
 public interface Extensions {
     <T> T get(Symbol key);

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine;
+package me.topchetoeu.jscript.core.engine;
 
 public enum Operation {
     INSTANCEOF(2, false),

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

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

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

@@ -1,17 +1,17 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.util.HashMap;
 import java.util.TreeSet;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.Extensions;
+import me.topchetoeu.jscript.core.engine.Extensions;
-import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.core.engine.frame.CodeFrame;
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.mapping.SourceMap;
+import me.topchetoeu.jscript.utils.mapping.SourceMap;
 
 public class DebugContext implements DebugController {
     public static final Symbol ENV_KEY = Symbol.get("Engine.debug");

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

@@ -1,14 +1,14 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.util.TreeSet;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.core.engine.frame.CodeFrame;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.mapping.SourceMap;
+import me.topchetoeu.jscript.utils.mapping.SourceMap;
 
 public interface DebugController {
     /**

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.io.IOException;
 

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -9,14 +9,14 @@ import java.security.MessageDigest;
 import java.util.Base64;
 import java.util.HashMap;
 
-import me.topchetoeu.jscript.Metadata;
+import me.topchetoeu.jscript.common.Metadata;
-import me.topchetoeu.jscript.Reading;
+import me.topchetoeu.jscript.common.Reading;
-import me.topchetoeu.jscript.engine.debug.WebSocketMessage.Type;
+import me.topchetoeu.jscript.common.events.Notifier;
-import me.topchetoeu.jscript.events.Notifier;
+import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.common.json.JSONList;
-import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.common.json.JSONMap;
-import me.topchetoeu.jscript.json.JSONList;
+import me.topchetoeu.jscript.core.engine.debug.WebSocketMessage.Type;
-import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
 
 public class DebugServer {
     public static String browserDisplayName = Metadata.name() + "/" + Metadata.version();
@@ -226,9 +226,9 @@ public class DebugServer {
 
     public DebugServer() {
         try {
-            this.favicon = Reading.resourceToStream("assets/debugger/favicon.png").readAllBytes();
+            this.favicon = Reading.resourceToStream("me/topchetoeu/jscript/utils/assets/debugger/favicon.png").readAllBytes();
-            this.protocol = Reading.resourceToStream("assets/debugger/protocol.json").readAllBytes();
+            this.protocol = Reading.resourceToStream("me/topchetoeu/jscript/utils/assets/debugger/protocol.json").readAllBytes();
-            this.index = Reading.resourceToString("assets/debugger/index.html")
+            this.index = Reading.resourceToString("me/topchetoeu/jscript/utils/assets/debugger/index.html")
                 .replace("${NAME}", Metadata.name())
                 .replace("${VERSION}", Metadata.version())
                 .replace("${AUTHOR}", Metadata.author())

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

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

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

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

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.io.BufferedReader;
 import java.io.IOException;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -10,29 +10,29 @@ import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.Filename;
+import me.topchetoeu.jscript.common.Filename;
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.common.events.Notifier;
-import me.topchetoeu.jscript.compilation.Instruction.Type;
+import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.common.json.JSONElement;
-import me.topchetoeu.jscript.engine.Engine;
+import me.topchetoeu.jscript.common.json.JSONList;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.common.json.JSONMap;
-import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.engine.scope.GlobalScope;
+import me.topchetoeu.jscript.core.compilation.Instruction.Type;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.values.CodeFunction;
+import me.topchetoeu.jscript.core.engine.Engine;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.Environment;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.frame.CodeFrame;
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.scope.GlobalScope;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
-import me.topchetoeu.jscript.events.Notifier;
+import me.topchetoeu.jscript.core.engine.values.CodeFunction;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
-import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.json.JSONElement;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
-import me.topchetoeu.jscript.json.JSONList;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.mapping.SourceMap;
+import me.topchetoeu.jscript.core.parsing.Parsing;
-import me.topchetoeu.jscript.parsing.Parsing;
+import me.topchetoeu.jscript.utils.mapping.SourceMap;
 
 // very simple indeed
 public class SimpleDebugger implements Debugger {

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

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
-import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.common.json.JSONMap;
 
 public class V8Error {
     public final String message;

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

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
-import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.common.json.JSONMap;
 
 public class V8Event {
     public final String name;

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

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.util.Map;
 
-import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.json.JSONElement;
+import me.topchetoeu.jscript.common.json.JSONElement;
-import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.common.json.JSONMap;
 
 public class V8Message {
     public final String name;

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

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
-import me.topchetoeu.jscript.json.JSON;
+import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.json.JSONMap;
+import me.topchetoeu.jscript.common.json.JSONMap;
 
 public class V8Result {
     public final int id;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -6,7 +6,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 
-import me.topchetoeu.jscript.engine.debug.WebSocketMessage.Type;
+import me.topchetoeu.jscript.core.engine.debug.WebSocketMessage.Type;
 
 public class WebSocket implements AutoCloseable {
     public long maxLength = 1 << 20;

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

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.debug;
+package me.topchetoeu.jscript.core.engine.debug;
 
 public class WebSocketMessage {
     public static enum Type {

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

@@ -1,21 +1,21 @@
-package me.topchetoeu.jscript.engine.frame;
+package me.topchetoeu.jscript.core.engine.frame;
 
 import java.util.List;
 import java.util.Stack;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.debug.DebugContext;
+import me.topchetoeu.jscript.core.engine.debug.DebugContext;
-import me.topchetoeu.jscript.engine.scope.LocalScope;
+import me.topchetoeu.jscript.core.engine.scope.LocalScope;
-import me.topchetoeu.jscript.engine.scope.ValueVariable;
+import me.topchetoeu.jscript.core.engine.scope.ValueVariable;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.CodeFunction;
+import me.topchetoeu.jscript.core.engine.values.CodeFunction;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.ScopeValue;
+import me.topchetoeu.jscript.core.engine.values.ScopeValue;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.InterruptException;
+import me.topchetoeu.jscript.core.exceptions.InterruptException;
 
 public class CodeFrame {
     public static enum TryState {

src/me/topchetoeu/jscript/core/engine/frame/ConvertHint.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.frame;
+package me.topchetoeu.jscript.core.engine.frame;
 
 public enum ConvertHint {
     TOSTRING,

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

@@ -1,20 +1,20 @@
-package me.topchetoeu.jscript.engine.frame;
+package me.topchetoeu.jscript.core.engine.frame;
 
 import java.util.Collections;
 
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.Engine;
+import me.topchetoeu.jscript.core.engine.Engine;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.core.engine.Environment;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.scope.ValueVariable;
+import me.topchetoeu.jscript.core.engine.scope.ValueVariable;
-import me.topchetoeu.jscript.engine.values.ArrayValue;
+import me.topchetoeu.jscript.core.engine.values.ArrayValue;
-import me.topchetoeu.jscript.engine.values.CodeFunction;
+import me.topchetoeu.jscript.core.engine.values.CodeFunction;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Symbol;
+import me.topchetoeu.jscript.core.engine.values.Symbol;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
 
 public class Runners {
     public static Object execReturn(Context ctx, Instruction instr, CodeFrame frame) {

src/me/topchetoeu/jscript/core/engine/scope/GlobalScope.java

@@ -1,14 +1,14 @@
-package me.topchetoeu.jscript.engine.scope;
+package me.topchetoeu.jscript.core.engine.scope;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.values.FunctionValue;
+import me.topchetoeu.jscript.core.engine.values.FunctionValue;
-import me.topchetoeu.jscript.engine.values.NativeFunction;
+import me.topchetoeu.jscript.core.engine.values.NativeFunction;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
 
 public class GlobalScope implements ScopeRecord {
     public final ObjectValue obj;

src/me/topchetoeu/jscript/core/engine/scope/LocalScope.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.scope;
+package me.topchetoeu.jscript.core.engine.scope;
 
 import java.util.ArrayList;
 

src/me/topchetoeu/jscript/core/engine/scope/LocalScopeRecord.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.scope;
+package me.topchetoeu.jscript.core.engine.scope;
 
 import java.util.ArrayList;
 

src/me/topchetoeu/jscript/core/engine/scope/ScopeRecord.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.scope;
+package me.topchetoeu.jscript.core.engine.scope;
 
 public interface ScopeRecord {
     public Object getKey(String name);

src/me/topchetoeu/jscript/core/engine/scope/ValueVariable.java

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.engine.scope;
+package me.topchetoeu.jscript.core.engine.scope;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
 
 public class ValueVariable implements Variable {
     public boolean readonly;

src/me/topchetoeu/jscript/core/engine/scope/Variable.java

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.engine.scope;
+package me.topchetoeu.jscript.core.engine.scope;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
 
 public interface Variable {
     Object get(Context ctx);

src/me/topchetoeu/jscript/core/engine/values/ArrayValue.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -6,7 +6,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
 
 // TODO: Make methods generic
 public class ArrayValue extends ObjectValue implements Iterable<Object> {

src/me/topchetoeu/jscript/core/engine/values/CodeFunction.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.compilation.FunctionBody;
+import me.topchetoeu.jscript.core.compilation.FunctionBody;
-import me.topchetoeu.jscript.compilation.Instruction;
+import me.topchetoeu.jscript.core.compilation.Instruction;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.core.engine.Environment;
-import me.topchetoeu.jscript.engine.frame.CodeFrame;
+import me.topchetoeu.jscript.core.engine.frame.CodeFrame;
-import me.topchetoeu.jscript.engine.scope.ValueVariable;
+import me.topchetoeu.jscript.core.engine.scope.ValueVariable;
 
 public class CodeFunction extends FunctionValue {
     public final int localsN;

src/me/topchetoeu/jscript/core/engine/values/FunctionValue.java

@@ -1,8 +1,8 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
 import java.util.List;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
 
 public abstract class FunctionValue extends ObjectValue {
     public String name = "";

src/me/topchetoeu/jscript/core/engine/values/NativeFunction.java

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.interop.Arguments;
+import me.topchetoeu.jscript.utils.interop.Arguments;
 
 public class NativeFunction extends FunctionValue {
     public static interface NativeFunctionRunner {

src/me/topchetoeu/jscript/core/engine/values/NativeWrapper.java

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
 
 public class NativeWrapper extends ObjectValue {
     private static final Object NATIVE_PROTO = new Object();

src/me/topchetoeu/jscript/core/engine/values/ObjectValue.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -6,8 +6,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.core.engine.Environment;
 
 public class ObjectValue {
     public static enum PlaceholderProto {

src/me/topchetoeu/jscript/core/engine/values/ScopeValue.java

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
 import java.util.HashMap;
 import java.util.List;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.scope.ValueVariable;
+import me.topchetoeu.jscript.core.engine.scope.ValueVariable;
 
 public class ScopeValue extends ObjectValue {
     public final ValueVariable[] variables;
@@ -23,7 +23,7 @@ public class ScopeValue extends ObjectValue {
         }
 
         var proto = getPrototype(ctx);
-        if (proto != null && proto.hasField(ctx, key) && proto.setField(ctx, key, val)) return true;
+        if (proto != null && proto.hasMember(ctx, key, false) && proto.setField(ctx, key, val)) return true;
 
         return super.setField(ctx, key, val);
     }

src/me/topchetoeu/jscript/core/engine/values/Symbol.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
 import java.util.HashMap;
 

src/me/topchetoeu/jscript/core/engine/values/Values.java

@@ -1,5 +1,7 @@
-package me.topchetoeu.jscript.engine.values;
+package me.topchetoeu.jscript.core.engine.values;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -10,13 +12,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.core.engine.Environment;
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
-import me.topchetoeu.jscript.engine.frame.ConvertHint;
+import me.topchetoeu.jscript.core.engine.frame.ConvertHint;
-import me.topchetoeu.jscript.exceptions.ConvertException;
+import me.topchetoeu.jscript.core.exceptions.ConvertException;
-import me.topchetoeu.jscript.exceptions.EngineException;
+import me.topchetoeu.jscript.core.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.SyntaxException;
+import me.topchetoeu.jscript.core.exceptions.SyntaxException;
 import me.topchetoeu.jscript.lib.PromiseLib;
 
 public class Values {
@@ -663,104 +665,107 @@ public class Values {
         if (protoObj.values.size() + protoObj.properties.size() != 1) return false;
         return true;
     }
-    private static void printValue(Context ctx, Object val, HashSet<Object> passed, int tab) {
+    private static String toReadable(Context ctx, Object val, HashSet<Object> passed, int tab) {
-        if (tab == 0 && val instanceof String) {
+        if (tab == 0 && val instanceof String) return (String)val;
-            System.out.print(val);
-            return;
-        }
 
-        if (passed.contains(val)) {
+        if (passed.contains(val)) return "[circular]";
-            System.out.print("[circular]");
-            return;
-        }
 
         var printed = true;
+        var res = new StringBuilder();
 
         if (val instanceof FunctionValue) {
-            System.out.print(val.toString());
+            res.append(val.toString());
             var loc = val instanceof CodeFunction ? ((CodeFunction)val).loc() : null;
 
-            if (loc != null) System.out.print(" @ " + loc);
+            if (loc != null) res.append(" @ " + loc);
         }
         else if (val instanceof ArrayValue) {
-            System.out.print("[");
+            res.append("[");
             var obj = ((ArrayValue)val);
             for (int i = 0; i < obj.size(); i++) {
-                if (i != 0) System.out.print(", ");
+                if (i != 0) res.append(", ");
-                else System.out.print(" ");
+                else res.append(" ");
-                if (obj.has(i)) printValue(ctx, obj.get(i), passed, tab);
+                if (obj.has(i)) res.append(toReadable(ctx, obj.get(i), passed, tab));
-                else System.out.print("<empty>");
+                else res.append("<empty>");
             }
-            System.out.print(" ] ");
+            res.append(" ] ");
         }
         else if (val instanceof NativeWrapper) {
             var obj = ((NativeWrapper)val).wrapped;
-            System.out.print("Native " + obj.toString() + " ");
+            res.append("Native " + obj.toString() + " ");
         }
         else printed = false;
 
         if (val instanceof ObjectValue) {
             if (tab > 3) {
-                System.out.print("{...}");
+                return "{...}";
-                return;
             }
+
             passed.add(val);
 
             var obj = (ObjectValue)val;
             if (obj.values.size() + obj.properties.size() == 0 || isEmptyFunc(obj)) {
-                if (!printed) System.out.println("{}");
+                if (!printed) res.append("{}\n");
             }
             else {
-                System.out.println("{");
+                res.append("{\n");
 
                 for (var el : obj.values.entrySet()) {
                     for (int i = 0; i < tab + 1; i++) System.out.print("    ");
-                    printValue(ctx, el.getKey(), passed, tab + 1);
+                    res.append(toReadable(ctx, el.getKey(), passed, tab + 1));
-                    System.out.print(": ");
+                    res.append(": ");
-                    printValue(ctx, el.getValue(), passed, tab + 1);
+                    res.append(toReadable(ctx, el.getValue(), passed, tab + 1));
-                    System.out.println(",");
+                    res.append(",\n");
                 }
                 for (var el : obj.properties.entrySet()) {
                     for (int i = 0; i < tab + 1; i++) System.out.print("    ");
-                    printValue(ctx, el.getKey(), passed, tab + 1);
+                    res.append(toReadable(ctx, el.getKey(), passed, tab + 1));
-                    System.out.println(": [prop],");
+                    res.append(": [prop],\n");
                 }
 
-                for (int i = 0; i < tab; i++) System.out.print("    ");
+                for (int i = 0; i < tab; i++) res.append("    ");
-                System.out.print("}");
+                res.append("}");
-
             }
 
             passed.remove(val);
         }
-        else if (val == null) System.out.print("undefined");
+        else if (val == null) return "undefined";
-        else if (val == Values.NULL) System.out.print("null");
+        else if (val == Values.NULL) return "null";
-        else if (val instanceof String) System.out.print("'" + val + "'");
+        else if (val instanceof String) return "'" + val + "'";
-        else System.out.print(Values.toString(ctx, val));
+        else return Values.toString(ctx, val);
+
+        return res.toString();
+    }
+
+    public static String toReadable(Context ctx, Object val) {
+        return toReadable(ctx, val, new HashSet<>(), 0);
+    }
+    public static String errorToReadable(RuntimeException err, String prefix) {
+        prefix = prefix == null ? "Uncaught" : "Uncaught " + prefix;
+        if (err instanceof EngineException) {
+            var ee = ((EngineException)err);
+            try {
+                return prefix + " " + ee.toString(new Context(ee.engine, ee.env));
+            }
+            catch (EngineException ex) {
+                return prefix + " " + toReadable(new Context(ee.engine, ee.env), ee.value);
+            }
+        }
+        else if (err instanceof SyntaxException) {
+            return prefix + " SyntaxError " + ((SyntaxException)err).msg;
+        }
+        else if (err.getCause() instanceof InterruptedException) return "";
+        else {
+            var str = new ByteArrayOutputStream();
+            err.printStackTrace(new PrintStream(str));
+
+            return prefix + " internal error " + str.toString();
+        }
     }
     public static void printValue(Context ctx, Object val) {
-        printValue(ctx, val, new HashSet<>(), 0);
+        System.out.print(toReadable(ctx, val));
     }
     public static void printError(RuntimeException err, String prefix) {
-        prefix = prefix == null ? "Uncaught" : "Uncaught " + prefix;
+        System.out.println(errorToReadable(err, prefix));
-        try {
-            if (err instanceof EngineException) {
-                var ee = ((EngineException)err);
-                System.out.println(prefix + " " + ee.toString(new Context(ee.engine, ee.env)));
-            }
-            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 ");
-            Values.printValue(null, ((EngineException)err).value);
-            System.out.println();
-        }
     }
 }

src/me/topchetoeu/jscript/core/exceptions/ConvertException.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.exceptions;
+package me.topchetoeu.jscript.core.exceptions;
 
 public class ConvertException extends RuntimeException {
     public final String source, target;

src/me/topchetoeu/jscript/core/exceptions/EngineException.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.exceptions;
+package me.topchetoeu.jscript.core.exceptions;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.engine.Context;
+import me.topchetoeu.jscript.core.engine.Context;
-import me.topchetoeu.jscript.engine.Engine;
+import me.topchetoeu.jscript.core.engine.Engine;
-import me.topchetoeu.jscript.engine.Environment;
+import me.topchetoeu.jscript.core.engine.Environment;
-import me.topchetoeu.jscript.engine.debug.DebugContext;
+import me.topchetoeu.jscript.core.engine.debug.DebugContext;
-import me.topchetoeu.jscript.engine.values.ObjectValue;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue;
-import me.topchetoeu.jscript.engine.values.Values;
+import me.topchetoeu.jscript.core.engine.values.Values;
-import me.topchetoeu.jscript.engine.values.ObjectValue.PlaceholderProto;
+import me.topchetoeu.jscript.core.engine.values.ObjectValue.PlaceholderProto;
 
 public class EngineException extends RuntimeException {
     public static class StackElement {

src/me/topchetoeu/jscript/core/exceptions/InterruptException.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.exceptions;
+package me.topchetoeu.jscript.core.exceptions;
 
 public class InterruptException extends RuntimeException {
     public InterruptException() { }

src/me/topchetoeu/jscript/core/exceptions/SyntaxException.java

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.exceptions;
+package me.topchetoeu.jscript.core.exceptions;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
 
 public class SyntaxException extends RuntimeException {
     public final Location loc;

src/me/topchetoeu/jscript/core/parsing/Operator.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.parsing;
+package me.topchetoeu.jscript.core.parsing;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import me.topchetoeu.jscript.engine.Operation;
+import me.topchetoeu.jscript.core.engine.Operation;
 
 public enum Operator {
     MULTIPLY("*", Operation.MULTIPLY, 13),

src/me/topchetoeu/jscript/core/parsing/ParseRes.java

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.parsing;
+package me.topchetoeu.jscript.core.parsing;
 
 import java.util.List;
 import java.util.Map;
 
-import me.topchetoeu.jscript.Location;
+import me.topchetoeu.jscript.common.Location;
-import me.topchetoeu.jscript.parsing.Parsing.Parser;
+import me.topchetoeu.jscript.core.parsing.Parsing.Parser;
 
 public class ParseRes<T> {
     public static enum State {