mirror/rsmv
1
0
Fork 0
mirror of https://github.com/skillbert/rsmv.git synced 2025-12-24 05:57:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix multiple value same label switch

Browse Source
This commit is contained in:
Skillbert
2023-12-14 22:57:08 +01:00
parent defe66c5c4
commit 2a8ab5cb91
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/clientscript/ast.ts
View File

@@ -194,8 +194,10 @@ class SwitchStatementNode extends AstNode {
let cases = scriptjson.switches[valueop.op.imm];
if (!cases) { throw new Error("no matching cases in script"); }
if (nodes.length != cases.length + 1) { throw new Error("switch cases and nodes don't match"); }
for (let [index, casev] of cases.entries()) {
let node = nodes[index];
for (let casev of cases) {
//TODO multiple values can point to the same case
let node = nodes.find(q => q.originalindex == valueop.originalindex + 1 + casev.label);
if (!node) { throw new Error("switch case branch not found"); }
this.branches.push({ value: casev.value, block: node });
node.parent = this;
node.maxEndIndex = endindex;
@@ -206,8 +208,8 @@ class SwitchStatementNode extends AstNode {
}
let defaultblock: CodeBlockNode | null = nodes.at(-1)!;
if (defaultblock.children.length == 1 && defaultblock.children[0] instanceof RawOpcodeNode && defaultblock.children[0].opinfo.id == namedClientScriptOps.jump) {
let defaultblock: CodeBlockNode | null = nodes.find(q => q.originalindex == valueop.originalindex + 1) ?? null;
if (defaultblock && defaultblock.children.length == 1 && defaultblock.children[0] instanceof RawOpcodeNode && defaultblock.children[0].opinfo.id == namedClientScriptOps.jump) {
if (defaultblock.possibleSuccessors.length != 1) { throw new Error("jump successor branch expected"); }
defaultblock = defaultblock.possibleSuccessors[0];
if (defaultblock.originalindex == endindex) {
@@ -788,7 +790,9 @@ export function generateAst(calli: ClientscriptObfuscation, script: clientscript
for (let cond of cases) {
let jumpblock = getorMakeSection(nextindex + cond.label);
currentsection.addSuccessor(jumpblock);
if (!currentsection.possibleSuccessors.includes(jumpblock)) {
currentsection.addSuccessor(jumpblock);
}
}
let nextblock = getorMakeSection(nextindex);
currentsection.addSuccessor(nextblock);