small fixes

buildSrc/build.gradle.kts

@@ -3,5 +3,5 @@ repositories {
 }
 
 plugins {
-    `kotlin-dsl`
+	`kotlin-dsl`
 }

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

@@ -53,8 +53,8 @@ public abstract class FunctionNode extends Node {
 			target.add(scope.define(param.name).index().toSet(false)).setLocation(param.loc());
 		}
 		if (hasSelf) {
-		    target.add(Instruction.loadCalled());
+			target.add(Instruction.loadCalled());
-		    target.add(scope.define(selfName).index().toSet(false));
+			target.add(scope.define(selfName).index().toSet(false));
 		}
 
 		body.compile(target, lastReturn, BreakpointType.NONE);

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

@@ -286,40 +286,40 @@ public final class JavaScript {
 	}
 
 	public static ParseRes<List<VariableNode>> parseParameters(Source src, int i) {
-	    var n = Parsing.skipEmpty(src, i);
+		var n = Parsing.skipEmpty(src, i);
 	
-	    var openParen = Parsing.parseOperator(src, i + n, "(");
+		var openParen = Parsing.parseOperator(src, i + n, "(");
-	    if (!openParen.isSuccess()) return openParen.chainError(src.loc(i + n), "Expected a parameter list");
+		if (!openParen.isSuccess()) return openParen.chainError(src.loc(i + n), "Expected a parameter list");
-	    n += openParen.n;
+		n += openParen.n;
 	
-	    var params = new ArrayList<VariableNode>();
+		var params = new ArrayList<VariableNode>();
 	
-	    var closeParen = Parsing.parseOperator(src, i + n, ")");
+		var closeParen = Parsing.parseOperator(src, i + n, ")");
-	    n += closeParen.n;
+		n += closeParen.n;
 	
-	    if (!closeParen.isSuccess()) {
+		if (!closeParen.isSuccess()) {
-	        while (true) {
+			while (true) {
-	            n += Parsing.skipEmpty(src, i + n);
+				n += Parsing.skipEmpty(src, i + n);
 	
-	            var param = VariableNode.parse(src, i + n);
+				var param = VariableNode.parse(src, i + n);
-	            if (!param.isSuccess()) return ParseRes.error(src.loc(i + n), "Expected a parameter or a closing brace");
+				if (!param.isSuccess()) return ParseRes.error(src.loc(i + n), "Expected a parameter or a closing brace");
-	            n += param.n;
+				n += param.n;
-	            n += Parsing.skipEmpty(src, i + n);
+				n += Parsing.skipEmpty(src, i + n);
 	
-	            params.add(param.result);
+				params.add(param.result);
 	
-	            if (src.is(i + n, ",")) {
+				if (src.is(i + n, ",")) {
-	                n++;
+					n++;
-	                n += Parsing.skipEmpty(src, i + n);
+					n += Parsing.skipEmpty(src, i + n);
-	            }
+				}
 	
-	            if (src.is(i + n, ")")) {
+				if (src.is(i + n, ")")) {
-	                n++;
+					n++;
-	                break;
+					break;
-	            }
+				}
-	        }
+			}
-	    }
+		}
 	
-	    return ParseRes.res(params, n);
+		return ParseRes.res(params, n);
 	}
 }

lib/src/main/java/me/topchetoeu/j2s/lib/Compilers.java

@@ -59,6 +59,8 @@ public class Compilers {
 
 	public static Compiler transpilerFromSource(Compiler prev, Environment target, Filename compilerName, String compilerSrc) {
 		var env = StdLib.apply(null);
+		// var handler = new SimpleDebugHandler();
+		// env.add(DebugHandler.KEY, handler);
 
 		var glob = Value.global(env);
 		var compilerFactory = new FunctionValue[1];
@@ -83,9 +85,19 @@ public class Compilers {
 		}));
 
 		var compiled = JavaScript.compile(compilerName, compilerSrc, false);
-		new CodeFunction(env, "intializer", compiled.body(), new Value[0][]).apply(env, Value.UNDEFINED);
 
-		return wrap(prev, env, target, compilerFactory[0]);
+		// for (var el : compiled.all()) {
+		// 	handler.onFunctionLoad(el.body(), el.map());
+		// }
+
+		try {
+			new CodeFunction(env, "intializer", compiled.body(), new Value[0][]).apply(env, Value.UNDEFINED);
+			return wrap(prev, env, target, compilerFactory[0]);
+		}
+		catch (EngineException e) {
+			System.out.println(Value.errorToReadable(env, e, "in transpiler initializer"));
+			return prev;
+		}
 	}
 
 	public static Compiler babelCompiler(Compiler prev, Environment target) {
@@ -111,7 +123,7 @@ public class Compilers {
 		Compiler create(Compiler prev, Environment target);
 	}
 
-	public static Compiler chainTranspilers(Environment target, Compiler base, TranspilerFactory ...factories) {
+	public static Compiler chainTranspilers(Compiler base, Environment target, TranspilerFactory ...factories) {
 		var res = base;
 
 		for (var el : factories) {

lib/src/main/java/me/topchetoeu/j2s/lib/Primordials.java

@@ -690,5 +690,4 @@ public class Primordials {
 
 		return res;
 	}
-
 }

lib/src/main/java/me/topchetoeu/j2s/lib/StdLib.java

@@ -6,24 +6,36 @@ import me.topchetoeu.j2s.common.Metadata;
 import me.topchetoeu.j2s.common.Reading;
 import me.topchetoeu.j2s.compilation.CompileResult;
 import me.topchetoeu.j2s.compilation.JavaScript;
+import me.topchetoeu.j2s.runtime.exceptions.EngineException;
 import me.topchetoeu.j2s.runtime.values.Value;
 import me.topchetoeu.j2s.runtime.values.functions.CodeFunction;
 
 public class StdLib {
-	private static final CompileResult RUNNER = JavaScript.compile(new Filename(Metadata.name(), "init.js"), Reading.resourceToString("lib/stdlib.js"), false);
+	private static final CompileResult RUNNER = JavaScript.compile(
+		new Filename(Metadata.name(), "init.js"),
+		Reading.resourceToString("lib/stdlib.js"), false
+	);
 
-	public static Environment apply(Environment env) {
+	public static Environment apply(Environment env, CompileResult body) {
-		if (env == null) {
+		env = new Environment();
-			env = new Environment();
-		}
 
 		var stubEnv = new Environment();
 		Value.global(stubEnv).defineOwnField(stubEnv, "target", Value.global(env));
 		Value.global(stubEnv).defineOwnField(stubEnv, "primordials", Primordials.create(env));
 
-		var func = new CodeFunction(stubEnv, "intializer", RUNNER.body(), new Value[0][]);
+		var func = new CodeFunction(stubEnv, "intializer", body.body(), new Value[0][]);
-		func.apply(stubEnv, Value.UNDEFINED);
+		try {
+			func.apply(stubEnv, Value.UNDEFINED);
+		}
+		catch (EngineException e) {
+			System.out.println(Value.errorToReadable(env, e, "in environment initializer"));
+		}
 	
 		return env;
 	}
+
+	public static Environment apply(Environment env) {
+		if (env == null) env = new Environment();
+		return apply(env, RUNNER);
+	}
 }

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

@@ -2,6 +2,7 @@ package me.topchetoeu.j2s.repl;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -17,10 +18,10 @@ import me.topchetoeu.j2s.common.Reading;
 import me.topchetoeu.j2s.common.SyntaxException;
 import me.topchetoeu.j2s.lib.Compilers;
 import me.topchetoeu.j2s.lib.StdLib;
-import me.topchetoeu.j2s.repl.debug.SimpleDebugHandler;
+import me.topchetoeu.j2s.lib.debug.DebugServer;
-import me.topchetoeu.j2s.repl.debug.DebugServer;
+import me.topchetoeu.j2s.lib.debug.Debugger;
-import me.topchetoeu.j2s.repl.debug.Debugger;
+import me.topchetoeu.j2s.lib.debug.SimpleDebugHandler;
-import me.topchetoeu.j2s.repl.debug.SimpleDebugger;
+import me.topchetoeu.j2s.lib.debug.SimpleDebugger;
 import me.topchetoeu.j2s.runtime.Compiler;
 import me.topchetoeu.j2s.runtime.Engine;
 import me.topchetoeu.j2s.runtime.EventLoop;
@@ -104,11 +105,10 @@ public class SimpleRepl {
 	}
 
 	private static Environment createESEnv() {
-		var env = new Environment();
+		var env = StdLib.apply(null);
 		env.add(EventLoop.KEY, engine);
 		env.add(DebugHandler.KEY, new SimpleDebugHandler());
-		env.add(Compiler.KEY, Compilers.chainTranspilers(environment, Compilers.jsCompiler(), Compilers::babelCompiler, Compilers::coffeescriptCompiler));
+		env.add(Compiler.KEY, Compilers.chainTranspilers(Compilers.jsCompiler(), env, Compilers::babelCompiler));
-		StdLib.apply(env);
 
 		var glob = Value.global(env);
 
@@ -116,6 +116,18 @@ public class SimpleRepl {
 			Thread.currentThread().interrupt();
 			throw new CancellationException();
 		}));
+		glob.defineOwnField(null, "dofile", new NativeFunction("dofile", args -> {
+			var file = args.get(0).toString(args.env);
+			var filename = new Filename("file", new File(file).getAbsolutePath());
+
+			try {
+				var src = Reading.streamToString(new FileInputStream(file));
+				return Compiler.get(args.env).compile(args.env, filename, src, v -> v).apply(args.env, Value.UNDEFINED);
+			}
+			catch (FileNotFoundException e) {
+				throw EngineException.ofError("IOException", e.getMessage());
+			}
+		}));
 
 		return env;
 	}

repl/src/main/resources/debugger/index.html

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

runtime/src/main/java/me/topchetoeu/j2s/runtime/Frame.java

@@ -209,7 +209,7 @@ public final class Frame {
 						returnValue = InstructionRunner.exec(env, instr, this);
 					}
 					catch (EngineException e) {
-						error = e.add(env, function.name, dbg.getMapOrEmpty(env, function).toLocation(codePtr));
+						error = e.add(env, function.name, dbg.getMapOrEmpty(env, function).toLocation(codePtr, true));
 					}
 				}
 			}

runtime/src/main/java/me/topchetoeu/j2s/runtime/values/functions/CodeFunction.java

@@ -26,7 +26,7 @@ public final class CodeFunction extends FunctionValue {
 	}
 
 	@Override protected Value onApply(Environment env, Value self, Value... args) {
-		var frame = new Frame(env, false, null, self, args, this);
+		var frame = new Frame(this.env, false, null, self, args, this);
 		var res = onCall(frame);
 		return res;
 	}
@@ -37,7 +37,7 @@ public final class CodeFunction extends FunctionValue {
 		if (proto instanceof ObjectValue) self.setPrototype(env, (ObjectValue)proto);
 		else if (proto == Value.NULL) self.setPrototype(env, null);
 
-		var frame = new Frame(env, true, target, self, args, this);
+		var frame = new Frame(this.env, true, target, self, args, this);
 
 		var ret = onCall(frame);