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

fix: try-catch-finally fix #457846982

Browse Source
This commit is contained in:
TopchetoEU 2024-01-04 13:57:41 +02:00
parent 4fa5f5a815
commit e575b3287e
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/me/topchetoeu/jscript/engine/frame/CodeFrame.java
View File

@ -38,8 +38,10 @@ public class CodeFrame {
return ptr >= start && ptr < end; return ptr >= start && ptr < end;
} }
public void setCause(EngineException target) {
if (error != null) target.setCause(error);
}
public TryCtx _catch(EngineException e) { public TryCtx _catch(EngineException e) {
if (error != null) e.setCause(error);
return new TryCtx(TryState.CATCH, e, result, restoreStackPtr, start, end, -1, finallyStart); return new TryCtx(TryState.CATCH, e, result, restoreStackPtr, start, end, -1, finallyStart);
} }
public TryCtx _finally(PendingResult res) { public TryCtx _finally(PendingResult res) {
@ -221,6 +223,7 @@ public class CodeFrame {
TryCtx newCtx = null; TryCtx newCtx = null;
if (error != null) { if (error != null) {
tryCtx.setCause(error);
if (tryCtx.hasCatch()) newCtx = tryCtx._catch(error); if (tryCtx.hasCatch()) newCtx = tryCtx._catch(error);
else if (tryCtx.hasFinally()) newCtx = tryCtx._finally(PendingResult.ofThrow(error, instr)); else if (tryCtx.hasFinally()) newCtx = tryCtx._finally(PendingResult.ofThrow(error, instr));
} }
@ -269,15 +272,17 @@ public class CodeFrame {
tryStack.pop(); tryStack.pop();
codePtr = tryCtx.end; codePtr = tryCtx.end;
if (tryCtx.result.instruction != null) instr = tryCtx.result.instruction; if (tryCtx.result.instruction != null) instr = tryCtx.result.instruction;
if (tryCtx.result.isJump) { if (!jumpFlag && returnValue == Runners.NO_RETURN && error == null) {
codePtr = tryCtx.result.ptr; if (tryCtx.result.isJump) {
jumpFlag = true; codePtr = tryCtx.result.ptr;
jumpFlag = true;
}
if (tryCtx.result.isReturn) returnValue = tryCtx.result.value;
if (error == null && tryCtx.result.isThrow) {
error = tryCtx.result.error;
}
} }
if (tryCtx.result.isReturn) returnValue = tryCtx.result.value; if (error != null) tryCtx.setCause(error);
if (tryCtx.result.isThrow) {
error = tryCtx.result.error;
}
if (error != null) error.setCause(tryCtx.error);
continue; continue;
} }
} }