bump

(only caused headaches)

README.md

@@ -1,10 +1,8 @@
-# JScript
-
-**NOTE: This had nothing to do with Microsoft's dialect of EcmaScript**
+# J2S (Java-JavaScript or Java to JavaScript)
 
 **WARNING: Currently, this code is undocumented. Proceed with caution and a psychiatrist.**
 
-JScript is an engine, capable of running EcmaScript 5, written entirely in Java. This engine has been developed with the goal of being easy to integrate with your preexisting codebase, **THE GOAL OF THIS ENGINE IS NOT PERFORMANCE**. My crude experiments show that this engine is 50x-100x slower than V8, which, although bad, is acceptable for most simple scripting purposes. Note that although the codebase has a Main class, this isn't meant to be a standalone program, but instead a library for running JavaScript code.
+J2S is an engine, capable of running EcmaScript 5, written entirely in Java. This engine has been developed with the goal of being easy to integrate with your preexisting codebase, **THE GOAL OF THIS ENGINE IS NOT PERFORMANCE**. My crude experiments show that this engine is 50x-100x slower than V8, which, although bad, is acceptable for most simple scripting purposes. Note that although the codebase has a Main class, this isn't meant to be a standalone program, but instead a library for running JavaScript code.
 
 ## Example
 

gradle.properties

@@ -1,4 +1,4 @@
 project_group = me.topchetoeu
-project_name = jscript
-project_version = 0.10.0-beta
-main_class = me.topchetoeu.jscript.repl.SimpleRepl
+project_name = j2s
+project_version = 0.10.2-beta
+main_class = me.topchetoeu.j2s.repl.SimpleRepl

rollup.config.js

@@ -7,7 +7,7 @@ const nodeResolve = require("@rollup/plugin-node-resolve");
 const json = require("@rollup/plugin-json");
 const { resolve } = require("path");
 
-const shouldMinify = () => false;
+const shouldMinify = () => true;
 const shouldEmitSourcemaps = () => true;
 const shouldPolyfill = () => !!process.env.POLYFILLS;
 
@@ -99,6 +99,7 @@ const construct = (input, output) => defineConfig({
 		shouldMinify() && terser({
 			sourceMap: shouldEmitSourcemaps(),
 			keep_classnames: true,
+			keep_fnames: true,
 		}),
 	],
 	output: {

src/lib/libs/primordials.ts

@@ -112,7 +112,8 @@ export interface Primordials {
 	schedule(func: () => void, delay: number): () => void;
 }
 
-globalThis.undefined = void 0;
+// prevent optimization to "undefined", which doesn't exist yet
+globalThis.undefined = ({} as any).bogus;
 export const target = (globalThis as any).target;
 export const primordials: Primordials = (globalThis as any).primordials;
 

src/lib/libs/values/array.ts

@@ -33,7 +33,7 @@ export const Array = (() => {
 			for (let i = arguments.length - 1; i >= 0; i--) {
 				this[start + i] = arguments[i];
 			}
-			return arguments.length;
+			return this.length;
 		}
 		public pop(this: any[]) {
 			if (this.length === 0) return undefined;
@@ -51,7 +51,7 @@ export const Array = (() => {
 			for (let i = 0; i < arguments.length; i++) {
 				this[i] = arguments[i];
 			}
-			return arguments.length;
+			return this.length;
 		}
 		public shift(this: any[]) {
 			if (this.length === 0) return undefined;

src/lib/libs/values/object.ts

@@ -82,13 +82,13 @@ export const Object = (() => {
 					res.s = set;
 				}
 				if ("enumerable" in desc) res.e = !!desc.enumerable;
-				if ("configurable" in desc) res.e = !!desc.configurable;
+				if ("configurable" in desc) res.c = !!desc.configurable;
 
 				if (!object.defineProperty(obj, key, res)) throw new TypeError("Cannot redefine property: " + String(key));
 			}
 			else {
 				if ("enumerable" in desc) res.e = !!desc.enumerable;
-				if ("configurable" in desc) res.e = !!desc.configurable;
+				if ("configurable" in desc) res.c = !!desc.configurable;
 				if ("writable" in desc) res.w = !!desc.writable;
 				if ("value" in desc) res.v = desc.value;
 

src/lib/libs/values/string.ts

@@ -41,8 +41,9 @@ export const String = (() => {
 			offset = +offset;
 			return string.indexOf(self, search, offset, false);
 		}
-		public lastIndexOf(search: string, offset = 0) {
+		public lastIndexOf(search: string, offset?: number) {
 			const self = unwrapThis(this, "string", String, "String.prototype.lastIndexOf");
+			if (offset == null) offset = self.length;
 			offset = +offset;
 			return string.indexOf(self, search, offset, true);
 		}

src/lib/transpiler/_entry.ts

@@ -1,7 +1,4 @@
-// import coffeescript from "./coffeescript.ts";
-// import babel from "./babel.ts";
+import coffeescript from "./coffeescript.ts";
+import babel from "./babel.ts";
 
-// register(v => coffeescript(babel(v)));
-import typescript from "./typescript.ts";
-
-register(typescript);
+register(v => coffeescript(babel(v)));

src/lib/transpiler/babel.ts

@@ -11,17 +11,14 @@ export default function babel(next: Compiler): Compiler {
 			presets: [availablePresets.env],
 		});
 
-		print(res.map!.mappings);
-
 		const map = SourceMap.parse({
 			file: "babel-internal://" + filename,
 			mappings: res.map!.mappings,
 			sources: [filename],
 		});
 
-		const compiled = next("babel-internal://" + filename, res.code!, SourceMap.chain(map, prevMap));
 		registerSource(filename, code);
-		return compiled;
+		return next("babel-internal://" + filename, res.code!, SourceMap.chain(map, prevMap));
 	};
 }
 

src/lib/transpiler/coffeescript.ts

@@ -20,9 +20,8 @@ export default function coffee(next: Compiler): Compiler {
 			sources: [filename],
 		});
 
-		const compiled = next("coffee-internal://" + filename, result, SourceMap.chain(map, prevMap));
 		registerSource(filename, code);
-		return compiled;
+		return next("coffee-internal://" + filename, result, SourceMap.chain(map, prevMap));
 	};
 }
 

src/lib/transpiler/transpiler.d.ts

@@ -1,4 +1,4 @@
-type Location = readonly [file: string, line: number, start: number];
+type Location = [file: string, line: number, start: number];
 type SourceMap = (loc: Location) => Location | undefined;
 
 type CompilerFactory = (next: Compiler) => Compiler;

src/lib/transpiler/typescript.ts

@@ -106,8 +106,8 @@ export default function typescript(next: Compiler): Compiler {
 		const result = outputs["/src.js"];
 		const declaration = outputs["/src.d.ts"];
 
-		const compiled = next("ts-internal://" + filename, result, SourceMap.chain(map, prevMap));
 		registerSource(filename, code);
+		const compiled = next("ts-internal://" + filename, result, SourceMap.chain(map, prevMap));
 
 		return function (this: any) {
 			const res = compiled.apply(this, arguments);

src/main/java/me/topchetoeu/j2s/common/FunctionBody.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common;
+package me.topchetoeu.j2s.common;
 
 public class FunctionBody {
 	public final FunctionBody[] children;

src/main/java/me/topchetoeu/j2s/common/Instruction.java

@@ -1,10 +1,10 @@
-package me.topchetoeu.jscript.common;
+package me.topchetoeu.j2s.common;
 
 import java.util.HashMap;
 import java.util.function.IntFunction;
 import java.util.function.IntSupplier;
 
-import me.topchetoeu.jscript.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.Location;
 
 public class Instruction {
 	public static enum Type {

src/main/java/me/topchetoeu/j2s/common/Metadata.java

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.common;
+package me.topchetoeu.j2s.common;
 
-import me.topchetoeu.jscript.common.json.JSON;
+import me.topchetoeu.j2s.common.json.JSON;
 
 public class Metadata {
 	private static final String VERSION;

src/main/java/me/topchetoeu/j2s/common/Operation.java

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

src/main/java/me/topchetoeu/j2s/common/Reading.java

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

src/main/java/me/topchetoeu/j2s/common/SyntaxException.java

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

src/main/java/me/topchetoeu/j2s/common/environment/Environment.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common.environment;
+package me.topchetoeu.j2s.common.environment;
 
 import java.util.HashMap;
 import java.util.HashSet;

src/main/java/me/topchetoeu/j2s/common/environment/Key.java

@@ -0,0 +1,3 @@
+package me.topchetoeu.j2s.common.environment;
+
+public final class Key<T> { }

src/main/java/me/topchetoeu/j2s/common/json/JSON.java

@@ -1,15 +1,16 @@
-package me.topchetoeu.jscript.common.json;
+package me.topchetoeu.j2s.common.json;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.parsing.Filename;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
+import me.topchetoeu.j2s.common.Metadata;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.parsing.Filename;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
 
 public class JSON {
 	public static ParseRes<JSONElement> parseString(Source src, int i) {
@@ -100,7 +101,7 @@ public class JSON {
 		return ParseRes.res(JSONElement.list(values), n);
 	}
 	public static JSONElement parse(Filename filename, String raw) {
-		if (filename == null) filename = new Filename("jscript", "json");
+		if (filename == null) filename = new Filename(Metadata.name(), "json");
 
 		var res = parseValue(new Source(null, filename, raw), 0);
 		if (res.isFailed()) throw new SyntaxException(Location.of(filename, 0, 0), "Invalid JSON given");

src/main/java/me/topchetoeu/j2s/common/json/JSONElement.java

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

src/main/java/me/topchetoeu/j2s/common/json/JSONList.java

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

src/main/java/me/topchetoeu/j2s/common/json/JSONMap.java

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

src/main/java/me/topchetoeu/j2s/common/mapping/FunctionMap.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common.mapping;
+package me.topchetoeu.j2s.common.mapping;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,9 +13,9 @@ import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Filename;
-import me.topchetoeu.jscript.common.parsing.Location;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Filename;
+import me.topchetoeu.j2s.common.parsing.Location;
 
 public class FunctionMap {
 	public static class FunctionMapBuilder {

src/main/java/me/topchetoeu/j2s/common/parsing/Filename.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
 import java.io.File;
 

src/main/java/me/topchetoeu/j2s/common/parsing/Location.java

@@ -1,10 +1,12 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
 import java.util.ArrayList;
 import java.util.Objects;
 
+import me.topchetoeu.j2s.common.Metadata;
+
 public abstract class Location implements Comparable<Location> {
-	public static final Location INTERNAL = Location.of(new Filename("jscript", "native"), -1, -1);
+	public static final Location INTERNAL = Location.of(new Filename(Metadata.name(), "native"), -1, -1);
 
 	public abstract int line();
 	public abstract int start();

src/main/java/me/topchetoeu/j2s/common/parsing/ParseRes.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
 public class ParseRes<T> {
 	public static enum State {

src/main/java/me/topchetoeu/j2s/common/parsing/Parser.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
 public interface Parser<T> {
 	public ParseRes<T> parse(Source src, int i);

src/main/java/me/topchetoeu/j2s/common/parsing/Parsing.java

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.compilation.values.constants.NumberNode;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.compilation.values.constants.NumberNode;
 
 public class Parsing {
 	public static boolean isDigit(Character c) {

src/main/java/me/topchetoeu/j2s/common/parsing/Source.java

@@ -1,8 +1,8 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
 import java.util.function.Predicate;
 
-import me.topchetoeu.jscript.common.environment.Environment;
+import me.topchetoeu.j2s.common.environment.Environment;
 
 public class Source {
 	public final Environment env;

src/main/java/me/topchetoeu/j2s/common/parsing/SourceLocation.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.common.parsing;
+package me.topchetoeu.j2s.common.parsing;
 
 import java.util.Objects;
 

src/main/java/me/topchetoeu/j2s/compilation/CompileResult.java

@@ -1,24 +1,25 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+
+import me.topchetoeu.j2s.common.FunctionBody;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.mapping.FunctionMap;
+import me.topchetoeu.j2s.common.mapping.FunctionMap.FunctionMapBuilder;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.control.TryNode;
+import me.topchetoeu.j2s.compilation.scope.FunctionScope;
+import me.topchetoeu.j2s.compilation.scope.Variable;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 
-import me.topchetoeu.jscript.common.FunctionBody;
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.common.environment.Key;
-import me.topchetoeu.jscript.common.mapping.FunctionMap;
-import me.topchetoeu.jscript.common.mapping.FunctionMap.FunctionMapBuilder;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.control.TryNode;
-import me.topchetoeu.jscript.compilation.scope.FunctionScope;
-import me.topchetoeu.jscript.compilation.scope.Variable;
-
 public final class CompileResult {
 	public static final Key<Void> DEBUG_LOG = new Key<>();
 

src/main/java/me/topchetoeu/j2s/compilation/CompoundNode.java

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
 
 
 public class CompoundNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/DeferredIntSupplier.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.function.IntSupplier;
 

src/main/java/me/topchetoeu/j2s/compilation/FunctionNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.List;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.scope.FunctionScope;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.scope.FunctionScope;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public abstract class FunctionNode extends Node {
 	public final CompoundNode body;

src/main/java/me/topchetoeu/j2s/compilation/FunctionStatementNode.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.List;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.scope.Variable;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.scope.Variable;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public class FunctionStatementNode extends FunctionNode {
 	public final String name;

src/main/java/me/topchetoeu/j2s/compilation/FunctionValueNode.java

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.List;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public class FunctionValueNode extends FunctionNode {
 	public final String name;

src/main/java/me/topchetoeu/j2s/compilation/JavaScript.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,45 +6,45 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.common.environment.Key;
-import me.topchetoeu.jscript.common.parsing.Filename;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.control.BreakNode;
-import me.topchetoeu.jscript.compilation.control.ContinueNode;
-import me.topchetoeu.jscript.compilation.control.DebugNode;
-import me.topchetoeu.jscript.compilation.control.DeleteNode;
-import me.topchetoeu.jscript.compilation.control.DoWhileNode;
-import me.topchetoeu.jscript.compilation.control.ForInNode;
-import me.topchetoeu.jscript.compilation.control.ForNode;
-import me.topchetoeu.jscript.compilation.control.IfNode;
-import me.topchetoeu.jscript.compilation.control.ReturnNode;
-import me.topchetoeu.jscript.compilation.control.SwitchNode;
-import me.topchetoeu.jscript.compilation.control.ThrowNode;
-import me.topchetoeu.jscript.compilation.control.TryNode;
-import me.topchetoeu.jscript.compilation.control.WhileNode;
-import me.topchetoeu.jscript.compilation.scope.FunctionScope;
-import me.topchetoeu.jscript.compilation.values.ArgumentsNode;
-import me.topchetoeu.jscript.compilation.values.ArrayNode;
-import me.topchetoeu.jscript.compilation.values.GlobalThisNode;
-import me.topchetoeu.jscript.compilation.values.ObjectNode;
-import me.topchetoeu.jscript.compilation.values.RegexNode;
-import me.topchetoeu.jscript.compilation.values.ThisNode;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
-import me.topchetoeu.jscript.compilation.values.constants.BoolNode;
-import me.topchetoeu.jscript.compilation.values.constants.NullNode;
-import me.topchetoeu.jscript.compilation.values.constants.NumberNode;
-import me.topchetoeu.jscript.compilation.values.constants.StringNode;
-import me.topchetoeu.jscript.compilation.values.operations.CallNode;
-import me.topchetoeu.jscript.compilation.values.operations.ChangeNode;
-import me.topchetoeu.jscript.compilation.values.operations.DiscardNode;
-import me.topchetoeu.jscript.compilation.values.operations.IndexNode;
-import me.topchetoeu.jscript.compilation.values.operations.OperationNode;
-import me.topchetoeu.jscript.compilation.values.operations.PostfixNode;
-import me.topchetoeu.jscript.compilation.values.operations.TypeofNode;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.parsing.Filename;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.control.BreakNode;
+import me.topchetoeu.j2s.compilation.control.ContinueNode;
+import me.topchetoeu.j2s.compilation.control.DebugNode;
+import me.topchetoeu.j2s.compilation.control.DeleteNode;
+import me.topchetoeu.j2s.compilation.control.DoWhileNode;
+import me.topchetoeu.j2s.compilation.control.ForInNode;
+import me.topchetoeu.j2s.compilation.control.ForNode;
+import me.topchetoeu.j2s.compilation.control.IfNode;
+import me.topchetoeu.j2s.compilation.control.ReturnNode;
+import me.topchetoeu.j2s.compilation.control.SwitchNode;
+import me.topchetoeu.j2s.compilation.control.ThrowNode;
+import me.topchetoeu.j2s.compilation.control.TryNode;
+import me.topchetoeu.j2s.compilation.control.WhileNode;
+import me.topchetoeu.j2s.compilation.scope.FunctionScope;
+import me.topchetoeu.j2s.compilation.values.ArgumentsNode;
+import me.topchetoeu.j2s.compilation.values.ArrayNode;
+import me.topchetoeu.j2s.compilation.values.GlobalThisNode;
+import me.topchetoeu.j2s.compilation.values.ObjectNode;
+import me.topchetoeu.j2s.compilation.values.RegexNode;
+import me.topchetoeu.j2s.compilation.values.ThisNode;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
+import me.topchetoeu.j2s.compilation.values.constants.BoolNode;
+import me.topchetoeu.j2s.compilation.values.constants.NullNode;
+import me.topchetoeu.j2s.compilation.values.constants.NumberNode;
+import me.topchetoeu.j2s.compilation.values.constants.StringNode;
+import me.topchetoeu.j2s.compilation.values.operations.CallNode;
+import me.topchetoeu.j2s.compilation.values.operations.ChangeNode;
+import me.topchetoeu.j2s.compilation.values.operations.DiscardNode;
+import me.topchetoeu.j2s.compilation.values.operations.IndexNode;
+import me.topchetoeu.j2s.compilation.values.operations.OperationNode;
+import me.topchetoeu.j2s.compilation.values.operations.PostfixNode;
+import me.topchetoeu.j2s.compilation.values.operations.TypeofNode;
 
 public final class JavaScript {
 	public static enum DeclarationType {

src/main/java/me/topchetoeu/j2s/compilation/LabelContext.java

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.function.IntSupplier;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.common.environment.Key;
-import me.topchetoeu.jscript.common.parsing.Location;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.parsing.Location;
 
 public class LabelContext {
 	public static final Key<LabelContext> BREAK_CTX = new Key<>();

src/main/java/me/topchetoeu/j2s/compilation/Node.java

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
 
 public abstract class Node {
 	private Location loc;

src/main/java/me/topchetoeu/j2s/compilation/NodeChildren.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.ArrayList;
 import java.util.Iterator;

src/main/java/me/topchetoeu/j2s/compilation/Parameter.java

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
-import me.topchetoeu.jscript.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.Location;
 
 public final class Parameter {
 	public final Location loc;

src/main/java/me/topchetoeu/j2s/compilation/VariableDeclareNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation;
+package me.topchetoeu.j2s.compilation;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.github.bsideup.jabel.Desugar;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public class VariableDeclareNode extends Node {
 	@Desugar

src/main/java/me/topchetoeu/j2s/compilation/control/BreakNode.java

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class BreakNode extends Node {
 	public final String label;

src/main/java/me/topchetoeu/j2s/compilation/control/ContinueNode.java

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class ContinueNode extends Node {
 	public final String label;

src/main/java/me/topchetoeu/j2s/compilation/control/DebugNode.java

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class DebugNode extends Node {
 	@Override public void compileFunctions(CompileResult target) {

src/main/java/me/topchetoeu/j2s/compilation/control/DeleteNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
-import me.topchetoeu.jscript.compilation.values.constants.BoolNode;
-import me.topchetoeu.jscript.compilation.values.operations.IndexNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
+import me.topchetoeu.j2s.compilation.values.constants.BoolNode;
+import me.topchetoeu.j2s.compilation.values.operations.IndexNode;
 
 public class DeleteNode extends Node {
 	public final Node key;

src/main/java/me/topchetoeu/j2s/compilation/control/DoWhileNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class DoWhileNode extends Node {
 	public final Node condition, body;

src/main/java/me/topchetoeu/j2s/compilation/control/ForInNode.java

@@ -1,17 +1,17 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public class ForInNode extends Node {
 	public final boolean isDecl;
@@ -21,7 +21,9 @@ public class ForInNode extends Node {
 
 	@Override public void resolve(CompileResult target) {
 		body.resolve(target);
-		binding.resolve(target);
+		if (isDecl) {
+			target.scope.define(binding.name);
+		}
 	}
 
 	@Override public void compileFunctions(CompileResult target) {

src/main/java/me/topchetoeu/j2s/compilation/control/ForNode.java

@@ -1,17 +1,17 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.VariableDeclareNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.VariableDeclareNode;
 
 public class ForNode extends Node {
 	public final Node declaration, assignment, condition, body;

src/main/java/me/topchetoeu/j2s/compilation/control/IfNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class IfNode extends Node {
 	public final Node condition, body, elseBody;

src/main/java/me/topchetoeu/j2s/compilation/control/ReturnNode.java

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class ReturnNode extends Node {
 	public final Node value;

src/main/java/me/topchetoeu/j2s/compilation/control/SwitchNode.java

@@ -1,20 +1,20 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Operation;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Operation;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class SwitchNode extends Node {
 	public static class SwitchCase {

src/main/java/me/topchetoeu/j2s/compilation/control/ThrowNode.java

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class ThrowNode extends Node {
 	public final Node value;

src/main/java/me/topchetoeu/j2s/compilation/control/TryNode.java

@@ -1,17 +1,17 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.CompoundNode;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.CompoundNode;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class TryNode extends Node {
 	public final CompoundNode tryBody;

src/main/java/me/topchetoeu/j2s/compilation/control/WhileNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation.control;
+package me.topchetoeu.j2s.compilation.control;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.DeferredIntSupplier;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.LabelContext;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.DeferredIntSupplier;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.LabelContext;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class WhileNode extends Node {
 	public final Node condition, body;

src/main/java/me/topchetoeu/j2s/compilation/members/FieldMemberNode.java

@@ -1,14 +1,14 @@
-package me.topchetoeu.jscript.compilation.members;
+package me.topchetoeu.j2s.compilation.members;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.values.ObjectNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.values.ObjectNode;
 
 public class FieldMemberNode implements Member {
 	public final Location loc;

src/main/java/me/topchetoeu/j2s/compilation/members/Member.java

@@ -0,0 +1,11 @@
+package me.topchetoeu.j2s.compilation.members;
+
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+
+public interface Member {
+	Location loc();
+
+	void compileFunctions(CompileResult target);
+	void compile(CompileResult target, boolean pollute);
+}

src/main/java/me/topchetoeu/j2s/compilation/members/PropertyMemberNode.java

@@ -1,21 +1,21 @@
-package me.topchetoeu.jscript.compilation.members;
+package me.topchetoeu.j2s.compilation.members;
 
 import java.util.Arrays;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.CompoundNode;
-import me.topchetoeu.jscript.compilation.FunctionNode;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.values.ObjectNode;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
-import me.topchetoeu.jscript.compilation.values.constants.StringNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.CompoundNode;
+import me.topchetoeu.j2s.compilation.FunctionNode;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.values.ObjectNode;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
+import me.topchetoeu.j2s.compilation.values.constants.StringNode;
 
 public final class PropertyMemberNode extends FunctionNode implements Member {
 	public final Node key;

src/main/java/me/topchetoeu/j2s/compilation/patterns/AssignTarget.java

@@ -1,7 +1,7 @@
-package me.topchetoeu.jscript.compilation.patterns;
+package me.topchetoeu.j2s.compilation.patterns;
 
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
 
 /**
  * Represents all nodes that can be assign targets

src/main/java/me/topchetoeu/j2s/compilation/patterns/AssignTargetLike.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation.patterns;
+package me.topchetoeu.j2s.compilation.patterns;
 
 /**
  * Represents all nodes that can be converted to assign targets

src/main/java/me/topchetoeu/j2s/compilation/patterns/ChangeTarget.java

@@ -0,0 +1,7 @@
+package me.topchetoeu.j2s.compilation.patterns;
+
+import me.topchetoeu.j2s.compilation.CompileResult;
+
+public interface ChangeTarget extends AssignTarget {
+	void beforeChange(CompileResult target);
+}

src/main/java/me/topchetoeu/j2s/compilation/scope/FunctionScope.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation.scope;
+package me.topchetoeu.j2s.compilation.scope;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/me/topchetoeu/j2s/compilation/scope/Variable.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.compilation.scope;
+package me.topchetoeu.j2s.compilation.scope;
 
 import java.util.function.Supplier;
 

src/main/java/me/topchetoeu/j2s/compilation/scope/VariableIndex.java

@@ -1,6 +1,6 @@
-package me.topchetoeu.jscript.compilation.scope;
+package me.topchetoeu.j2s.compilation.scope;
 
-import me.topchetoeu.jscript.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction;
 
 public final class VariableIndex {
 	public static enum IndexType {

src/main/java/me/topchetoeu/j2s/compilation/scope/VariableList.java

@@ -1,11 +1,11 @@
-package me.topchetoeu.jscript.compilation.scope;
+package me.topchetoeu.j2s.compilation.scope;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
-import me.topchetoeu.jscript.compilation.scope.VariableIndex.IndexType;
+import me.topchetoeu.j2s.compilation.scope.VariableIndex.IndexType;
 
 public final class VariableList implements Iterable<Variable> {
 	private final class VariableNode implements Supplier<VariableIndex> {

src/main/java/me/topchetoeu/j2s/compilation/values/ArgumentsNode.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 
 public class ArgumentsNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/values/ArrayNode.java

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
 import java.util.ArrayList;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 
 public class ArrayNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/values/GlobalThisNode.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 
 public class GlobalThisNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/values/ObjectNode.java

@@ -1,21 +1,21 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.members.FieldMemberNode;
-import me.topchetoeu.jscript.compilation.members.Member;
-import me.topchetoeu.jscript.compilation.members.PropertyMemberNode;
-import me.topchetoeu.jscript.compilation.values.constants.NumberNode;
-import me.topchetoeu.jscript.compilation.values.constants.StringNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.members.FieldMemberNode;
+import me.topchetoeu.j2s.compilation.members.Member;
+import me.topchetoeu.j2s.compilation.members.PropertyMemberNode;
+import me.topchetoeu.j2s.compilation.values.constants.NumberNode;
+import me.topchetoeu.j2s.compilation.values.constants.StringNode;
 
 public class ObjectNode extends Node {
 	public final List<Member> members;

src/main/java/me/topchetoeu/j2s/compilation/values/RegexNode.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class RegexNode extends Node {
 	public final String pattern, flags;

src/main/java/me/topchetoeu/j2s/compilation/values/ThisNode.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 
 public class ThisNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/values/VariableNode.java

@@ -1,14 +1,14 @@
-package me.topchetoeu.jscript.compilation.values;
+package me.topchetoeu.j2s.compilation.values;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.patterns.ChangeTarget;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.patterns.ChangeTarget;
 
 public class VariableNode extends Node implements ChangeTarget {
 	public final String name;

src/main/java/me/topchetoeu/j2s/compilation/values/constants/BoolNode.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.compilation.values.constants;
+package me.topchetoeu.j2s.compilation.values.constants;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class BoolNode extends Node {
 	public final boolean value;

src/main/java/me/topchetoeu/j2s/compilation/values/constants/NullNode.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.compilation.values.constants;
+package me.topchetoeu.j2s.compilation.values.constants;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class NullNode extends Node {
 	@Override public void compileFunctions(CompileResult target) {

src/main/java/me/topchetoeu/j2s/compilation/values/constants/NumberNode.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values.constants;
+package me.topchetoeu.j2s.compilation.values.constants;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class NumberNode extends Node {
 	public final double value;

src/main/java/me/topchetoeu/j2s/compilation/values/constants/StringNode.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values.constants;
+package me.topchetoeu.j2s.compilation.values.constants;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class StringNode extends Node {
 	public final String value;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/AssignNode.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Operation;
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.patterns.AssignTarget;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Operation;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.patterns.AssignTarget;
 
 public class AssignNode extends Node implements AssignTarget {
 	public final AssignTarget assignable;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/CallNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
 import java.util.ArrayList;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class CallNode extends Node {
 	public final Node func;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/ChangeNode.java

@@ -1,16 +1,16 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Operation;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.patterns.ChangeTarget;
-import me.topchetoeu.jscript.compilation.values.constants.NumberNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Operation;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.patterns.ChangeTarget;
+import me.topchetoeu.j2s.compilation.values.constants.NumberNode;
 
 public class ChangeNode extends Node {
 	public final ChangeTarget changable;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/DiscardNode.java

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 
 public class DiscardNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/values/operations/IndexNode.java

@@ -1,17 +1,17 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.patterns.ChangeTarget;
-import me.topchetoeu.jscript.compilation.values.constants.NumberNode;
-import me.topchetoeu.jscript.compilation.values.constants.StringNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.patterns.ChangeTarget;
+import me.topchetoeu.j2s.compilation.values.constants.NumberNode;
+import me.topchetoeu.j2s.compilation.values.constants.StringNode;
 
 public class IndexNode extends Node implements ChangeTarget {
 	public final Node object;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/LazyAndNode.java

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 public class LazyAndNode extends Node {
 	public final Node first, second;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/LazyOrNode.java

@@ -1,13 +1,13 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
 
 
 public class LazyOrNode extends Node {

src/main/java/me/topchetoeu/j2s/compilation/values/operations/OperationNode.java

@@ -1,21 +1,21 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Operation;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.patterns.AssignTargetLike;
-import me.topchetoeu.jscript.compilation.patterns.ChangeTarget;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Operation;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.patterns.AssignTargetLike;
+import me.topchetoeu.j2s.compilation.patterns.ChangeTarget;
 
 public class OperationNode extends Node {
 	private static interface OperatorFactory {

src/main/java/me/topchetoeu/j2s/compilation/values/operations/PostfixNode.java

@@ -1,15 +1,15 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Operation;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.patterns.ChangeTarget;
-import me.topchetoeu.jscript.compilation.values.constants.NumberNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Operation;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.patterns.ChangeTarget;
+import me.topchetoeu.j2s.compilation.values.constants.NumberNode;
 
 public class PostfixNode extends ChangeNode {
 	@Override public void compileFunctions(CompileResult target) {

src/main/java/me/topchetoeu/j2s/compilation/values/operations/TypeofNode.java

@@ -1,15 +1,14 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.common.parsing.ParseRes;
-import me.topchetoeu.jscript.common.parsing.Parsing;
-import me.topchetoeu.jscript.common.parsing.Source;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.JavaScript;
-import me.topchetoeu.jscript.compilation.Node;
-
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.common.parsing.ParseRes;
+import me.topchetoeu.j2s.common.parsing.Parsing;
+import me.topchetoeu.j2s.common.parsing.Source;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public class TypeofNode extends Node {
 	public final Node value;

src/main/java/me/topchetoeu/j2s/compilation/values/operations/VariableAssignNode.java

@@ -1,12 +1,12 @@
-package me.topchetoeu.jscript.compilation.values.operations;
+package me.topchetoeu.j2s.compilation.values.operations;
 
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Operation;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.compilation.CompileResult;
-import me.topchetoeu.jscript.compilation.FunctionNode;
-import me.topchetoeu.jscript.compilation.Node;
-import me.topchetoeu.jscript.compilation.values.VariableNode;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Operation;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.compilation.CompileResult;
+import me.topchetoeu.j2s.compilation.FunctionNode;
+import me.topchetoeu.j2s.compilation.Node;
+import me.topchetoeu.j2s.compilation.values.VariableNode;
 
 public class VariableAssignNode extends Node {
 	public final String name;

src/main/java/me/topchetoeu/j2s/repl/SimpleRepl.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.repl;
+package me.topchetoeu.j2s.repl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -16,40 +16,40 @@ import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import me.topchetoeu.jscript.common.Metadata;
-import me.topchetoeu.jscript.common.Reading;
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.common.environment.Key;
-import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.common.parsing.Filename;
-import me.topchetoeu.jscript.repl.debug.DebugServer;
-import me.topchetoeu.jscript.repl.debug.Debugger;
-import me.topchetoeu.jscript.repl.debug.SimpleDebugger;
-import me.topchetoeu.jscript.runtime.ArgumentsValue;
-import me.topchetoeu.jscript.runtime.Engine;
-import me.topchetoeu.jscript.runtime.EventLoop;
-import me.topchetoeu.jscript.runtime.Frame;
-import me.topchetoeu.jscript.runtime.JSONConverter;
-import me.topchetoeu.jscript.runtime.debug.DebugContext;
-import me.topchetoeu.jscript.runtime.exceptions.EngineException;
-import me.topchetoeu.jscript.runtime.values.Value;
-import me.topchetoeu.jscript.runtime.values.functions.FunctionValue;
-import me.topchetoeu.jscript.runtime.values.functions.NativeFunction;
-import me.topchetoeu.jscript.runtime.values.objects.ArrayLikeValue;
-import me.topchetoeu.jscript.runtime.values.objects.ArrayValue;
-import me.topchetoeu.jscript.runtime.values.objects.ObjectValue;
-import me.topchetoeu.jscript.runtime.values.objects.buffers.Int32ArrayValue;
-import me.topchetoeu.jscript.runtime.values.objects.buffers.Int8ArrayValue;
-import me.topchetoeu.jscript.runtime.values.objects.buffers.TypedArrayValue;
-import me.topchetoeu.jscript.runtime.values.objects.buffers.Uint8ArrayValue;
-import me.topchetoeu.jscript.runtime.values.primitives.BoolValue;
-import me.topchetoeu.jscript.runtime.values.primitives.StringValue;
-import me.topchetoeu.jscript.runtime.values.primitives.SymbolValue;
-import me.topchetoeu.jscript.runtime.values.primitives.UserValue;
-import me.topchetoeu.jscript.runtime.values.primitives.VoidValue;
-import me.topchetoeu.jscript.runtime.values.primitives.numbers.NumberValue;
-import me.topchetoeu.jscript.runtime.Compiler;
+import me.topchetoeu.j2s.common.Metadata;
+import me.topchetoeu.j2s.common.Reading;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.environment.Key;
+import me.topchetoeu.j2s.common.json.JSON;
+import me.topchetoeu.j2s.common.parsing.Filename;
+import me.topchetoeu.j2s.repl.debug.DebugServer;
+import me.topchetoeu.j2s.repl.debug.Debugger;
+import me.topchetoeu.j2s.repl.debug.SimpleDebugger;
+import me.topchetoeu.j2s.runtime.ArgumentsValue;
+import me.topchetoeu.j2s.runtime.Compiler;
+import me.topchetoeu.j2s.runtime.Engine;
+import me.topchetoeu.j2s.runtime.EventLoop;
+import me.topchetoeu.j2s.runtime.Frame;
+import me.topchetoeu.j2s.runtime.JSONConverter;
+import me.topchetoeu.j2s.runtime.debug.DebugContext;
+import me.topchetoeu.j2s.runtime.exceptions.EngineException;
+import me.topchetoeu.j2s.runtime.values.Value;
+import me.topchetoeu.j2s.runtime.values.functions.FunctionValue;
+import me.topchetoeu.j2s.runtime.values.functions.NativeFunction;
+import me.topchetoeu.j2s.runtime.values.objects.ArrayLikeValue;
+import me.topchetoeu.j2s.runtime.values.objects.ArrayValue;
+import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
+import me.topchetoeu.j2s.runtime.values.objects.buffers.Int32ArrayValue;
+import me.topchetoeu.j2s.runtime.values.objects.buffers.Int8ArrayValue;
+import me.topchetoeu.j2s.runtime.values.objects.buffers.TypedArrayValue;
+import me.topchetoeu.j2s.runtime.values.objects.buffers.Uint8ArrayValue;
+import me.topchetoeu.j2s.runtime.values.primitives.BoolValue;
+import me.topchetoeu.j2s.runtime.values.primitives.StringValue;
+import me.topchetoeu.j2s.runtime.values.primitives.SymbolValue;
+import me.topchetoeu.j2s.runtime.values.primitives.UserValue;
+import me.topchetoeu.j2s.runtime.values.primitives.VoidValue;
+import me.topchetoeu.j2s.runtime.values.primitives.numbers.NumberValue;
 
 public class SimpleRepl {
 	static Thread engineTask, debugTask;
@@ -118,7 +118,7 @@ public class SimpleRepl {
 					try {
 						var res = engine.pushMsg(
 							false, environment,
-							new Filename("jscript", "repl/" + i + ".js"), raw,
+							new Filename(Metadata.name(), "repl/" + i + ".js"), raw,
 							Value.UNDEFINED
 						).get();
 						System.err.println(res.toReadable(environment));
@@ -751,7 +751,7 @@ public class SimpleRepl {
 			return Value.UNDEFINED;
 		}));
 		res.defineOwnField(env, "compile", new NativeFunction(args -> {
-			return Compiler.compileFunc(env, new Filename("jscript", "func" + i[0]++ + ".js"), args.get(0).toString(env));
+			return Compiler.compileFunc(env, new Filename(Metadata.name(), "func" + i[0]++ + ".js"), args.get(0).toString(env));
 		}));
 		res.defineOwnField(env, "now", new NativeFunction(args -> {
 			return NumberValue.of(System.currentTimeMillis());
@@ -775,7 +775,7 @@ public class SimpleRepl {
 
 		EventLoop.get(stubEnv).pushMsg(
 			false, stubEnv,
-			Filename.parse("jscript://init.js"), Reading.resourceToString("lib/index.js"),
+			new Filename(Metadata.name(), "init.js"), Reading.resourceToString("lib/index.js"),
 			Value.UNDEFINED
 		).get();
 
@@ -851,7 +851,7 @@ public class SimpleRepl {
 		var ts = Reading.resourceToString("lib/ts.js");
 		if (ts != null) EventLoop.get(tsEnvironment).pushMsg(
 			false, tsEnvironment,
-			Filename.parse("jscript://ts.js"), ts,
+			new Filename(Metadata.name(), "ts.js"), ts,
 			Value.UNDEFINED, setter
 		).get();
 

src/main/java/me/topchetoeu/j2s/repl/V8Error.java

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

src/main/java/me/topchetoeu/j2s/repl/debug/DebugServer.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.repl.debug;
+package me.topchetoeu.j2s.repl.debug;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -9,13 +9,13 @@ import java.security.MessageDigest;
 import java.util.Base64;
 import java.util.HashMap;
 
-import me.topchetoeu.jscript.common.Metadata;
-import me.topchetoeu.jscript.common.Reading;
-import me.topchetoeu.jscript.common.SyntaxException;
-import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.common.json.JSONList;
-import me.topchetoeu.jscript.common.json.JSONMap;
-import me.topchetoeu.jscript.repl.debug.WebSocketMessage.Type;
+import me.topchetoeu.j2s.common.Metadata;
+import me.topchetoeu.j2s.common.Reading;
+import me.topchetoeu.j2s.common.SyntaxException;
+import me.topchetoeu.j2s.common.json.JSON;
+import me.topchetoeu.j2s.common.json.JSONList;
+import me.topchetoeu.j2s.common.json.JSONMap;
+import me.topchetoeu.j2s.repl.debug.WebSocketMessage.Type;
 
 public class DebugServer {
 	public static String browserDisplayName = Metadata.name() + "/" + Metadata.version();
@@ -185,7 +185,7 @@ public class DebugServer {
 
 							for (var el : targets.entrySet()) {
 								res.add(new JSONMap()
-									.set("description", "JScript debugger")
+									.set("description", "J2S debugger")
 									.set("favicon", "/favicon.ico")
 									.set("id", el.getKey())
 									.set("type", "node")

src/main/java/me/topchetoeu/j2s/repl/debug/Debugger.java

@@ -1,8 +1,8 @@
-package me.topchetoeu.jscript.repl.debug;
+package me.topchetoeu.j2s.repl.debug;
 
 import java.io.IOException;
 
-import me.topchetoeu.jscript.runtime.debug.DebugHandler;
+import me.topchetoeu.j2s.runtime.debug.DebugHandler;
 
 public interface Debugger extends DebugHandler {
     void close();

src/main/java/me/topchetoeu/j2s/repl/debug/DebuggerProvider.java

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

src/main/java/me/topchetoeu/j2s/repl/debug/HttpRequest.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.repl.debug;
+package me.topchetoeu.j2s.repl.debug;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -10,7 +10,7 @@ import java.util.HashMap;
 import java.util.IllegalFormatException;
 import java.util.Map;
 
-import me.topchetoeu.jscript.common.Reading;
+import me.topchetoeu.j2s.common.Reading;
 
 public class HttpRequest {
     public final String method;

src/main/java/me/topchetoeu/j2s/repl/debug/ScopeObject.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.repl.debug;
+package me.topchetoeu.j2s.repl.debug;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,18 +7,18 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.IntUnaryOperator;
 
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.runtime.Frame;
-import me.topchetoeu.jscript.runtime.exceptions.EngineException;
-import me.topchetoeu.jscript.runtime.values.KeyCache;
-import me.topchetoeu.jscript.runtime.values.Member;
-import me.topchetoeu.jscript.runtime.values.Value;
-import me.topchetoeu.jscript.runtime.values.Member.FieldMember;
-import me.topchetoeu.jscript.runtime.values.functions.FunctionValue;
-import me.topchetoeu.jscript.runtime.values.objects.ObjectValue;
-import me.topchetoeu.jscript.runtime.values.primitives.StringValue;
-import me.topchetoeu.jscript.runtime.values.primitives.SymbolValue;
-import me.topchetoeu.jscript.runtime.values.primitives.numbers.NumberValue;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.runtime.Frame;
+import me.topchetoeu.j2s.runtime.exceptions.EngineException;
+import me.topchetoeu.j2s.runtime.values.KeyCache;
+import me.topchetoeu.j2s.runtime.values.Member;
+import me.topchetoeu.j2s.runtime.values.Value;
+import me.topchetoeu.j2s.runtime.values.Member.FieldMember;
+import me.topchetoeu.j2s.runtime.values.functions.FunctionValue;
+import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
+import me.topchetoeu.j2s.runtime.values.primitives.StringValue;
+import me.topchetoeu.j2s.runtime.values.primitives.SymbolValue;
+import me.topchetoeu.j2s.runtime.values.primitives.numbers.NumberValue;
 
 public class ScopeObject extends Value {
 	public static final class ScopeMember extends FieldMember {

src/main/java/me/topchetoeu/j2s/repl/debug/SimpleDebugger.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.jscript.repl.debug;
+package me.topchetoeu.j2s.repl.debug;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -11,35 +11,36 @@ import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import me.topchetoeu.jscript.common.FunctionBody;
-import me.topchetoeu.jscript.common.Instruction;
-import me.topchetoeu.jscript.common.Instruction.BreakpointType;
-import me.topchetoeu.jscript.common.Instruction.Type;
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.common.json.JSON;
-import me.topchetoeu.jscript.common.json.JSONElement;
-import me.topchetoeu.jscript.common.json.JSONList;
-import me.topchetoeu.jscript.common.json.JSONMap;
-import me.topchetoeu.jscript.common.mapping.FunctionMap;
-import me.topchetoeu.jscript.common.parsing.Filename;
-import me.topchetoeu.jscript.common.parsing.Location;
-import me.topchetoeu.jscript.runtime.Compiler;
-import me.topchetoeu.jscript.runtime.Engine;
-import me.topchetoeu.jscript.runtime.EventLoop;
-import me.topchetoeu.jscript.runtime.Frame;
-import me.topchetoeu.jscript.runtime.JSONConverter;
-import me.topchetoeu.jscript.runtime.debug.DebugContext;
-import me.topchetoeu.jscript.runtime.exceptions.EngineException;
-import me.topchetoeu.jscript.runtime.values.Value;
-import me.topchetoeu.jscript.runtime.values.Member.FieldMember;
-import me.topchetoeu.jscript.runtime.values.Member.PropertyMember;
-import me.topchetoeu.jscript.runtime.values.functions.FunctionValue;
-import me.topchetoeu.jscript.runtime.values.objects.ArrayValue;
-import me.topchetoeu.jscript.runtime.values.objects.ObjectValue;
-import me.topchetoeu.jscript.runtime.values.primitives.BoolValue;
-import me.topchetoeu.jscript.runtime.values.primitives.StringValue;
-import me.topchetoeu.jscript.runtime.values.primitives.SymbolValue;
-import me.topchetoeu.jscript.runtime.values.primitives.numbers.NumberValue;
+import me.topchetoeu.j2s.common.FunctionBody;
+import me.topchetoeu.j2s.common.Instruction;
+import me.topchetoeu.j2s.common.Metadata;
+import me.topchetoeu.j2s.common.Instruction.BreakpointType;
+import me.topchetoeu.j2s.common.Instruction.Type;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.common.json.JSON;
+import me.topchetoeu.j2s.common.json.JSONElement;
+import me.topchetoeu.j2s.common.json.JSONList;
+import me.topchetoeu.j2s.common.json.JSONMap;
+import me.topchetoeu.j2s.common.mapping.FunctionMap;
+import me.topchetoeu.j2s.common.parsing.Filename;
+import me.topchetoeu.j2s.common.parsing.Location;
+import me.topchetoeu.j2s.runtime.Compiler;
+import me.topchetoeu.j2s.runtime.Engine;
+import me.topchetoeu.j2s.runtime.EventLoop;
+import me.topchetoeu.j2s.runtime.Frame;
+import me.topchetoeu.j2s.runtime.JSONConverter;
+import me.topchetoeu.j2s.runtime.debug.DebugContext;
+import me.topchetoeu.j2s.runtime.exceptions.EngineException;
+import me.topchetoeu.j2s.runtime.values.Value;
+import me.topchetoeu.j2s.runtime.values.Member.FieldMember;
+import me.topchetoeu.j2s.runtime.values.Member.PropertyMember;
+import me.topchetoeu.j2s.runtime.values.functions.FunctionValue;
+import me.topchetoeu.j2s.runtime.values.objects.ArrayValue;
+import me.topchetoeu.j2s.runtime.values.objects.ObjectValue;
+import me.topchetoeu.j2s.runtime.values.primitives.BoolValue;
+import me.topchetoeu.j2s.runtime.values.primitives.StringValue;
+import me.topchetoeu.j2s.runtime.values.primitives.SymbolValue;
+import me.topchetoeu.j2s.runtime.values.primitives.numbers.NumberValue;
 
 // very simple indeed
 public class SimpleDebugger implements Debugger {
@@ -409,7 +410,43 @@ public class SimpleDebugger implements Debugger {
 				res.set("description", className);
 			}
 
-			if (val instanceof ArrayValue arr) res.set("description", "Array(" + arr.size() + ")");
+			if (val instanceof ArrayValue arr) {
+				var desc = new StringBuilder("Array(" + arr.size() + ")");
+
+				if (arr.size() > 0) {
+					desc.append("[");
+
+					for (var i = 0; i < arr.size(); i++) {
+						if (i != 0) desc.append(", ");
+						if (desc.length() > 120) {
+							desc.append("...");
+							break;
+						}
+	
+						if (arr.has(i)) {
+							try {
+								var curr = arr.get(i);
+								if (curr instanceof StringValue str) {
+									desc.append(JSON.stringify(JSONElement.string(str.value)));
+								}
+								else {
+									desc.append(arr.get(i).toString(env));
+								}
+							}
+							catch (EngineException e) {
+								desc.append("<error>");
+							}
+						}
+						else {
+							desc.append("<empty>");
+						}
+					}
+	
+					desc.append("]");
+				}
+
+				res.set("description", desc.toString());
+			}
 			else if (val instanceof FunctionValue) res.set("description", val.toString());
 			else {
 				var defaultToString = false;
@@ -601,7 +638,7 @@ public class SimpleDebugger implements Debugger {
 		env.add(EventLoop.KEY, engine);
 		env.add(Value.GLOBAL, codeFrame.variables);
 
-		var awaiter = engine.pushMsg(false, env, new Filename("jscript", "eval"), code, codeFrame.frame.self, codeFrame.frame.args);
+		var awaiter = engine.pushMsg(false, env, new Filename(Metadata.name(), "eval"), code, codeFrame.frame.self, codeFrame.frame.args);
 
 		try {
 			engine.run(true);

src/main/java/me/topchetoeu/j2s/repl/debug/StackObject.java

@@ -1,9 +1,9 @@
-package me.topchetoeu.jscript.repl.debug;
+package me.topchetoeu.j2s.repl.debug;
 
-import me.topchetoeu.jscript.common.environment.Environment;
-import me.topchetoeu.jscript.runtime.Frame;
-import me.topchetoeu.jscript.runtime.values.Value;
-import me.topchetoeu.jscript.runtime.values.objects.ArrayLikeValue;
+import me.topchetoeu.j2s.common.environment.Environment;
+import me.topchetoeu.j2s.runtime.Frame;
+import me.topchetoeu.j2s.runtime.values.Value;
+import me.topchetoeu.j2s.runtime.values.objects.ArrayLikeValue;
 
 public class StackObject extends ArrayLikeValue {
 	public final Frame frame;

src/main/java/me/topchetoeu/j2s/repl/debug/V8Error.java

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

src/main/java/me/topchetoeu/j2s/repl/debug/V8Event.java

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