redscript-mc 1.2.27 → 1.2.29

package/dist/optimizer/commands.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setOptimizerObjective = setOptimizerObjective;
 exports.createEmptyOptimizationStats = createEmptyOptimizationStats;
 exports.mergeOptimizationStats = mergeOptimizationStats;
 exports.applyLICM = applyLICM;
 exports.applyCSE = applyCSE;
 exports.batchSetblocks = batchSetblocks;
 exports.optimizeCommandFunctions = optimizeCommandFunctions;
-const SCOREBOARD_READ_RE = /^execute store result score (\$[A-Za-z0-9_]+) rs run scoreboard players get (\S+) (\S+)$/;
+// Matches scoreboard reads for LICM/CSE — objective is captured in group 2
+// so the optimizer can reconstruct the command with the same objective.
+let _OBJ_PATTERN = 'rs';
+function setOptimizerObjective(obj) { _OBJ_PATTERN = obj; }
+function scoreboardReadRe() {
+    return new RegExp(`^execute store result score (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} run scoreboard players get (\\S+) (\\S+)$`);
+}
 const SCOREBOARD_WRITE_RE = /^(?:scoreboard players (?:set|add|remove|reset)\s+(\S+)\s+(\S+)|scoreboard players operation\s+(\S+)\s+(\S+)\s+[+\-*/%]?= )/;
 const EXECUTE_STORE_SCORE_RE = /^execute store result score (\S+) (\S+) run /;
 const FUNCTION_CALL_RE = /^execute as (.+) run function ([^:]+):(.+)$/;
@@ -95,7 +102,7 @@ function applyLICMInternal(functions) {
             const readInfo = new Map();
             const scoreboardWrites = new Set();
             for (const inner of loopFn.commands) {
-                const readMatch = inner.cmd.match(SCOREBOARD_READ_RE);
+                const readMatch = inner.cmd.match(scoreboardReadRe());
                 if (readMatch) {
                     const [, temp, player, objective] = readMatch;
                     const key = `${player} ${objective}`;
@@ -110,7 +117,7 @@ function applyLICMInternal(functions) {
                 for (const info of readInfo.values()) {
                     const matches = inner.cmd.match(TEMP_RE) ?? [];
                     const usageCount = matches.filter(name => name === info.temp).length;
-                    const isDef = inner.cmd.startsWith(`execute store result score ${info.temp} rs run scoreboard players get `);
+                    const isDef = inner.cmd.startsWith(`execute store result score ${info.temp} ${_OBJ_PATTERN} run scoreboard players get `);
                     if (!isDef) {
                         info.uses += usageCount;
                     }
@@ -134,7 +141,7 @@ function applyLICMInternal(functions) {
             const hoistedTemps = new Set(hoistable.map(item => item.temp));
             const rewrittenLoopCommands = [];
             for (const inner of loopFn.commands) {
-                const readMatch = inner.cmd.match(SCOREBOARD_READ_RE);
+                const readMatch = inner.cmd.match(scoreboardReadRe());
                 if (readMatch && hoistedTemps.has(readMatch[1])) {
                     continue;
                 }
@@ -142,7 +149,7 @@ function applyLICMInternal(functions) {
             }
             loopFn.commands = rewrittenLoopCommands;
             nextCommands.push(...hoistable.map(item => ({
-                cmd: `execute store result score ${item.temp} rs run scoreboard players get ${item.player} ${item.objective}`,
+                cmd: `execute store result score ${item.temp} ${_OBJ_PATTERN} run scoreboard players get ${item.player} ${item.objective}`,
             })), command);
             stats.licmHoists = (stats.licmHoists ?? 0) + hoistable.length;
             stats.licmLoopBodies = (stats.licmLoopBodies ?? 0) + 1;
@@ -152,9 +159,9 @@ function applyLICMInternal(functions) {
     return stats;
 }
 function extractArithmeticExpression(commands, index) {
-    const assign = commands[index]?.cmd.match(/^scoreboard players operation (\$[A-Za-z0-9_]+) rs = (\$[A-Za-z0-9_]+|\$const_-?\d+) rs$/) ??
-        commands[index]?.cmd.match(/^scoreboard players set (\$[A-Za-z0-9_]+) rs (-?\d+)$/);
-    const op = commands[index + 1]?.cmd.match(/^scoreboard players operation (\$[A-Za-z0-9_]+) rs ([+\-*/%]=) (\$[A-Za-z0-9_]+|\$const_-?\d+) rs$/);
+    const assign = commands[index]?.cmd.match(new RegExp(`^scoreboard players operation (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} = (\\$[A-Za-z0-9_]+|\\$const_-?\\d+) ${_OBJ_PATTERN}$`)) ??
+        commands[index]?.cmd.match(new RegExp(`^scoreboard players set (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} (-?\\d+)$`));
+    const op = commands[index + 1]?.cmd.match(new RegExp(`^scoreboard players operation (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} ([+\\-*/%]=) (\\$[A-Za-z0-9_]+|\\$const_-?\\d+) ${_OBJ_PATTERN}$`));
     if (!assign || !op || assign[1] !== op[1]) {
         return null;
     }
@@ -184,14 +191,14 @@ function applyCSEInternal(functions) {
         }
         for (let i = 0; i < commands.length; i++) {
             const command = commands[i];
-            const readMatch = command.cmd.match(SCOREBOARD_READ_RE);
+            const readMatch = command.cmd.match(scoreboardReadRe());
             if (readMatch) {
                 const [, dst, player, objective] = readMatch;
                 const key = `${player} ${objective}`;
                 const cached = readCache.get(key);
                 if (cached) {
                     stats.cseRedundantReads = (stats.cseRedundantReads ?? 0) + 1;
-                    rewritten.push({ ...command, cmd: `scoreboard players operation ${dst} rs = ${cached} rs` });
+                    rewritten.push({ ...command, cmd: `scoreboard players operation ${dst} ${_OBJ_PATTERN} = ${cached} ${_OBJ_PATTERN}` });
                 }
                 else {
                     readCache.set(key, dst);
@@ -205,7 +212,7 @@ function applyCSEInternal(functions) {
             if (expr) {
                 const cached = exprCache.get(expr.key);
                 if (cached) {
-                    rewritten.push({ ...commands[i], cmd: `scoreboard players operation ${expr.dst} rs = ${cached} rs` });
+                    rewritten.push({ ...commands[i], cmd: `scoreboard players operation ${expr.dst} ${_OBJ_PATTERN} = ${cached} ${_OBJ_PATTERN}` });
                     stats.cseArithmetic = (stats.cseArithmetic ?? 0) + 1;
                     i += 1;
                 }

package/dist/optimizer/structure.d.ts

@@ -1,5 +1,6 @@
 import type { IRCommand, IRFunction } from '../ir/types';
 import { type OptimizationStats } from './commands';
+export declare function setStructureObjective(obj: string): void;
 export declare function optimizeFunctionForStructure(fn: IRFunction, functions: Map<string, IRFunction>, namespace: string): IRCommand[];
 export declare function optimizeForStructure(functions: IRFunction[], namespace?: string): IRFunction[];
 export declare function optimizeForStructureWithStats(functions: IRFunction[], namespace?: string): {

package/dist/optimizer/structure.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setStructureObjective = setStructureObjective;
 exports.optimizeFunctionForStructure = optimizeFunctionForStructure;
 exports.optimizeForStructure = optimizeForStructure;
 exports.optimizeForStructureWithStats = optimizeForStructureWithStats;
 const commands_1 = require("./commands");
-const OBJ = 'rs';
+let OBJ = 'rs';
+function setStructureObjective(obj) {
+    OBJ = obj;
+    (0, commands_1.setOptimizerObjective)(obj);
+}
 const INLINE_THRESHOLD = 8;
 const BOP_OP = {
     '+': '+=',