topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

small fixes
Some checks failed
tagged-release / Tagged Release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
TopchetoEU
2025-01-24 22:46:51 +02:00
parent e14d85e7a8
commit 1548938537
5 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/main/java/me/topchetoeu/j2s/runtime/Frame.java
View File

@@ -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));
}
}
}

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

@@ -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);