@poe-platform/safe-bash 0.1.50 → 0.1.51

package/dist/safe-bash/browser.js

@@ -4822,47 +4822,62 @@ function evaluateArithmetic(program, variables) {
         throw new Error(`Unsupported arithmetic operator ${operator}`);
     }
   };
-  const evaluate = (node) => {
-    if (++steps > 1e4) throw new Error("Arithmetic operation limit exceeded");
-    let value2;
-    if (node.kind === "literal") return node.value;
-    if (node.kind === "name") {
-      if (visiting.has(node.name) || visiting.size >= 64) throw new Error("Arithmetic variable recursion");
-      visiting.add(node.name);
-      try {
-        return evaluate(parseArithmetic(variables[node.name] ?? "0"));
-      } finally {
-        visiting.delete(node.name);
-      }
-    }
-    if (node.kind === "conditional") return evaluate(evaluate(node.condition) ? node.yes : node.no);
-    if (node.kind === "unary") {
-      const operand = evaluate(node.operand);
-      if (node.operator === "+") value2 = operand;
-      else if (node.operator === "-") value2 = -operand;
-      else if (node.operator === "!") value2 = BigInt(!operand);
-      else if (node.operator === "~") value2 = ~operand;
-      else {
-        value2 = BigInt.asIntN(64, operand + (node.operator === "++" ? 1n : -1n));
-        variables[node.operand.name] = String(value2);
-        if (node.postfix) value2 = operand;
-      }
-    } else {
-      if (node.operator === "=") value2 = evaluate(node.right);
-      else {
-        const left = evaluate(node.left);
-        if (node.operator === "&&") return left ? BigInt(evaluate(node.right) !== 0n) : 0n;
-        if (node.operator === "||") return left ? 1n : BigInt(evaluate(node.right) !== 0n);
-        if (node.operator === ",") return evaluate(node.right);
-        value2 = binary(precedence[node.operator] === 2 ? node.operator.slice(0, -1) : node.operator, left, evaluate(node.right), node.right.start ?? 0);
-      }
-      if (precedence[node.operator] === 2) variables[node.left.name] = String(BigInt.asIntN(64, value2));
-    }
-    return BigInt.asIntN(64, value2);
-  };
   try {
     if (program.error) throw program.error;
-    return evaluate(program.tree);
+    const pending = [{ kind: "evaluate", node: program.tree }];
+    let value2 = 0n;
+    while (pending.length) {
+      const frame = pending.pop();
+      if (frame.kind === "evaluate") {
+        if (++steps > 1e4) throw new Error("Arithmetic operation limit exceeded");
+        const node = frame.node;
+        if (node.kind === "literal") value2 = node.value;
+        else if (node.kind === "name") {
+          if (visiting.has(node.name) || visiting.size >= 64) throw new Error("Arithmetic variable recursion");
+          visiting.add(node.name);
+          pending.push({ kind: "variable", name: node.name }, { kind: "evaluate", node: parseArithmetic(variables[node.name] ?? "0") });
+        } else if (node.kind === "conditional") {
+          pending.push({ kind: "conditional", node }, { kind: "evaluate", node: node.condition });
+        } else if (node.kind === "unary") {
+          pending.push({ kind: "unary", node }, { kind: "evaluate", node: node.operand });
+        } else if (node.operator === "=") {
+          pending.push({ kind: "right", node }, { kind: "evaluate", node: node.right });
+        } else {
+          pending.push({ kind: "left", node }, { kind: "evaluate", node: node.left });
+        }
+      } else if (frame.kind === "variable") visiting.delete(frame.name);
+      else if (frame.kind === "conditional") {
+        pending.push({ kind: "evaluate", node: value2 ? frame.node.yes : frame.node.no });
+      } else if (frame.kind === "unary") {
+        const { node } = frame;
+        const operand = value2;
+        if (node.operator === "+") value2 = operand;
+        else if (node.operator === "-") value2 = -operand;
+        else if (node.operator === "!") value2 = BigInt(!operand);
+        else if (node.operator === "~") value2 = ~operand;
+        else {
+          value2 = BigInt.asIntN(64, operand + (node.operator === "++" ? 1n : -1n));
+          variables[node.operand.name] = String(value2);
+          if (node.postfix) value2 = operand;
+        }
+        value2 = BigInt.asIntN(64, value2);
+      } else if (frame.kind === "left") {
+        const { node } = frame;
+        if (node.operator === "&&" || node.operator === "||") {
+          if (node.operator === "&&" ? value2 === 0n : value2 !== 0n) value2 = BigInt(value2 !== 0n);
+          else pending.push({ kind: "logical" }, { kind: "evaluate", node: node.right });
+        } else {
+          if (node.operator !== ",") pending.push({ kind: "right", node, left: value2 });
+          pending.push({ kind: "evaluate", node: node.right });
+        }
+      } else if (frame.kind === "right") {
+        const { node } = frame;
+        if (node.operator !== "=") value2 = binary(precedence[node.operator] === 2 ? node.operator.slice(0, -1) : node.operator, frame.left, value2, node.right.start ?? 0);
+        if (precedence[node.operator] === 2) variables[node.left.name] = String(BigInt.asIntN(64, value2));
+        value2 = BigInt.asIntN(64, value2);
+      } else value2 = BigInt(value2 !== 0n);
+    }
+    return value2;
   } catch (error) {
     if (error instanceof ArithmeticFailure) throw new Error(`${program.source.trimStart()}: ${error.message} (error token is "${program.source.slice(error.offset)}")`);
     if (error instanceof ShellSyntaxError) {