redscript-mc 1.2.30 → 2.0.0

package/dist/src/optimizer/commands.js

@@ -0,0 +1,451 @@
+"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;
+// 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 ([^:]+):(.+)$/;
+const TEMP_RE = /\$[A-Za-z0-9_]+/g;
+const SETBLOCK_RE = /^setblock (-?\d+) (-?\d+) (-?\d+) (\S+)$/;
+function createEmptyOptimizationStats() {
+    return {
+        licmHoists: 0,
+        licmLoopBodies: 0,
+        cseRedundantReads: 0,
+        cseArithmetic: 0,
+        setblockMergedCommands: 0,
+        setblockFillCommands: 0,
+        setblockSavedCommands: 0,
+        deadCodeRemoved: 0,
+        constantFolds: 0,
+        inlinedTrivialFunctions: 0,
+        totalCommandsBefore: 0,
+        totalCommandsAfter: 0,
+    };
+}
+function cloneCommand(command) {
+    return { ...command };
+}
+function cloneFunctions(functions) {
+    return functions.map(fn => ({
+        name: fn.name,
+        commands: fn.commands.map(cloneCommand),
+    }));
+}
+function mergeOptimizationStats(base, delta) {
+    for (const [key, value] of Object.entries(delta)) {
+        base[key] += value;
+    }
+}
+function parseScoreboardWrite(command) {
+    const executeStoreMatch = command.match(EXECUTE_STORE_SCORE_RE);
+    if (executeStoreMatch) {
+        return { player: executeStoreMatch[1], objective: executeStoreMatch[2] };
+    }
+    const match = command.match(SCOREBOARD_WRITE_RE);
+    if (!match) {
+        return null;
+    }
+    if (match[1] && match[2]) {
+        return { player: match[1], objective: match[2] };
+    }
+    if (match[3] && match[4]) {
+        return { player: match[3], objective: match[4] };
+    }
+    return null;
+}
+function replaceTemp(command, from, to) {
+    const re = new RegExp(`\\${from}(?![A-Za-z0-9_])`, 'g');
+    return command.replace(re, to);
+}
+function collectObjectiveWrites(functions) {
+    const writes = new Map();
+    for (const fn of functions) {
+        for (const command of fn.commands) {
+            const write = parseScoreboardWrite(command.cmd);
+            if (!write)
+                continue;
+            writes.set(write.objective, (writes.get(write.objective) ?? 0) + 1);
+        }
+    }
+    return writes;
+}
+function applyLICMInternal(functions) {
+    const stats = { licmHoists: 0, licmLoopBodies: 0 };
+    const functionMap = new Map(functions.map(fn => [fn.name, fn]));
+    const objectiveWrites = collectObjectiveWrites(functions);
+    for (const fn of functions) {
+        const nextCommands = [];
+        for (const command of fn.commands) {
+            const match = command.cmd.match(FUNCTION_CALL_RE);
+            if (!match) {
+                nextCommands.push(command);
+                continue;
+            }
+            const loopFn = functionMap.get(match[3]);
+            if (!loopFn) {
+                nextCommands.push(command);
+                continue;
+            }
+            const readInfo = new Map();
+            const scoreboardWrites = new Set();
+            for (const inner of loopFn.commands) {
+                const readMatch = inner.cmd.match(scoreboardReadRe());
+                if (readMatch) {
+                    const [, temp, player, objective] = readMatch;
+                    const key = `${player} ${objective}`;
+                    readInfo.set(key, { temp, player, objective, uses: 0 });
+                }
+                const write = parseScoreboardWrite(inner.cmd);
+                if (write) {
+                    scoreboardWrites.add(`${write.player} ${write.objective}`);
+                }
+            }
+            for (const inner of loopFn.commands) {
+                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} ${_OBJ_PATTERN} run scoreboard players get `);
+                    if (!isDef) {
+                        info.uses += usageCount;
+                    }
+                }
+            }
+            const hoistable = Array.from(readInfo.entries())
+                .filter(([key, info]) => {
+                if (info.uses < 2)
+                    return false;
+                if ((objectiveWrites.get(info.objective) ?? 0) !== 0)
+                    return false;
+                if (scoreboardWrites.has(key))
+                    return false;
+                return true;
+            })
+                .map(([, info]) => info);
+            if (hoistable.length === 0) {
+                nextCommands.push(command);
+                continue;
+            }
+            const hoistedTemps = new Set(hoistable.map(item => item.temp));
+            const rewrittenLoopCommands = [];
+            for (const inner of loopFn.commands) {
+                const readMatch = inner.cmd.match(scoreboardReadRe());
+                if (readMatch && hoistedTemps.has(readMatch[1])) {
+                    continue;
+                }
+                rewrittenLoopCommands.push(inner);
+            }
+            loopFn.commands = rewrittenLoopCommands;
+            nextCommands.push(...hoistable.map(item => ({
+                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;
+        }
+        fn.commands = nextCommands;
+    }
+    return stats;
+}
+function extractArithmeticExpression(commands, index) {
+    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;
+    }
+    return {
+        key: `${assign[2]} ${op[2]} ${op[3]}`,
+        dst: assign[1],
+    };
+}
+function applyCSEInternal(functions) {
+    const stats = { cseRedundantReads: 0, cseArithmetic: 0 };
+    for (const fn of functions) {
+        const commands = fn.commands.map(cloneCommand);
+        const readCache = new Map();
+        const exprCache = new Map();
+        const rewritten = [];
+        function invalidateByTemp(temp) {
+            for (const [key, value] of readCache.entries()) {
+                if (value === temp || key.includes(`${temp} `) || key.endsWith(` ${temp}`)) {
+                    readCache.delete(key);
+                }
+            }
+            for (const [key, value] of exprCache.entries()) {
+                if (value === temp || key.includes(temp)) {
+                    exprCache.delete(key);
+                }
+            }
+        }
+        for (let i = 0; i < commands.length; i++) {
+            const command = commands[i];
+            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} ${_OBJ_PATTERN} = ${cached} ${_OBJ_PATTERN}` });
+                }
+                else {
+                    readCache.set(key, dst);
+                    rewritten.push(command);
+                }
+                invalidateByTemp(dst);
+                readCache.set(key, dst);
+                continue;
+            }
+            const expr = extractArithmeticExpression(commands, i);
+            if (expr) {
+                const cached = exprCache.get(expr.key);
+                if (cached) {
+                    rewritten.push({ ...commands[i], cmd: `scoreboard players operation ${expr.dst} ${_OBJ_PATTERN} = ${cached} ${_OBJ_PATTERN}` });
+                    stats.cseArithmetic = (stats.cseArithmetic ?? 0) + 1;
+                    i += 1;
+                }
+                else {
+                    rewritten.push(command);
+                    rewritten.push(commands[i + 1]);
+                    exprCache.set(expr.key, expr.dst);
+                    i += 1;
+                }
+                invalidateByTemp(expr.dst);
+                exprCache.set(expr.key, expr.dst);
+                continue;
+            }
+            const write = parseScoreboardWrite(command.cmd);
+            if (write) {
+                readCache.delete(`${write.player} ${write.objective}`);
+                if (write.player.startsWith('$')) {
+                    invalidateByTemp(write.player);
+                }
+            }
+            rewritten.push(command);
+        }
+        fn.commands = rewritten;
+    }
+    return stats;
+}
+function batchSetblocksInCommands(commands) {
+    const rewritten = [];
+    const stats = {
+        setblockMergedCommands: 0,
+        setblockFillCommands: 0,
+        setblockSavedCommands: 0,
+    };
+    for (let i = 0; i < commands.length;) {
+        const start = commands[i].cmd.match(SETBLOCK_RE);
+        if (!start) {
+            rewritten.push(commands[i]);
+            i++;
+            continue;
+        }
+        const block = start[4];
+        const run = [{ index: i, x: Number(start[1]), y: Number(start[2]), z: Number(start[3]) }];
+        let axis = null;
+        let j = i + 1;
+        while (j < commands.length) {
+            const next = commands[j].cmd.match(SETBLOCK_RE);
+            if (!next || next[4] !== block)
+                break;
+            const point = { x: Number(next[1]), y: Number(next[2]), z: Number(next[3]) };
+            const prev = run[run.length - 1];
+            if (point.y !== prev.y)
+                break;
+            const stepX = point.x - prev.x;
+            const stepZ = point.z - prev.z;
+            if (axis === null) {
+                if (stepX === 1 && stepZ === 0)
+                    axis = 'x';
+                else if (stepX === 0 && stepZ === 1)
+                    axis = 'z';
+                else
+                    break;
+            }
+            const valid = axis === 'x'
+                ? point.z === prev.z && stepX === 1 && stepZ === 0
+                : point.x === prev.x && stepX === 0 && stepZ === 1;
+            if (!valid)
+                break;
+            run.push({ index: j, ...point });
+            j++;
+        }
+        if (run.length >= 2) {
+            const first = run[0];
+            const last = run[run.length - 1];
+            rewritten.push({
+                ...commands[i],
+                cmd: `fill ${first.x} ${first.y} ${first.z} ${last.x} ${last.y} ${last.z} ${block}`,
+            });
+            stats.setblockMergedCommands = (stats.setblockMergedCommands ?? 0) + run.length;
+            stats.setblockFillCommands = (stats.setblockFillCommands ?? 0) + 1;
+            stats.setblockSavedCommands = (stats.setblockSavedCommands ?? 0) + (run.length - 1);
+            i = j;
+            continue;
+        }
+        rewritten.push(commands[i]);
+        i++;
+    }
+    return { commands: rewritten, stats };
+}
+function applySetblockBatchingInternal(functions) {
+    const stats = {
+        setblockMergedCommands: 0,
+        setblockFillCommands: 0,
+        setblockSavedCommands: 0,
+    };
+    for (const fn of functions) {
+        const batched = batchSetblocksInCommands(fn.commands);
+        fn.commands = batched.commands;
+        mergeOptimizationStats(stats, batched.stats);
+    }
+    return stats;
+}
+function applyLICM(functions) {
+    const optimized = cloneFunctions(functions);
+    const stats = createEmptyOptimizationStats();
+    stats.totalCommandsBefore = optimized.reduce((sum, fn) => sum + fn.commands.length, 0);
+    mergeOptimizationStats(stats, applyLICMInternal(optimized));
+    stats.totalCommandsAfter = optimized.reduce((sum, fn) => sum + fn.commands.length, 0);
+    return { functions: optimized, stats };
+}
+function applyCSE(functions) {
+    const optimized = cloneFunctions(functions);
+    const stats = createEmptyOptimizationStats();
+    stats.totalCommandsBefore = optimized.reduce((sum, fn) => sum + fn.commands.length, 0);
+    mergeOptimizationStats(stats, applyCSEInternal(optimized));
+    stats.totalCommandsAfter = optimized.reduce((sum, fn) => sum + fn.commands.length, 0);
+    return { functions: optimized, stats };
+}
+function batchSetblocks(functions) {
+    const optimized = cloneFunctions(functions);
+    const stats = createEmptyOptimizationStats();
+    stats.totalCommandsBefore = optimized.reduce((sum, fn) => sum + fn.commands.length, 0);
+    mergeOptimizationStats(stats, applySetblockBatchingInternal(optimized));
+    stats.totalCommandsAfter = optimized.reduce((sum, fn) => sum + fn.commands.length, 0);
+    return { functions: optimized, stats };
+}
+/**
+ * Inline trivial functions:
+ * 1. Functions that only contain a single `function` call → inline the call
+ * 2. Empty functions (no commands) → remove and eliminate all calls to them
+ */
+function inlineTrivialFunctions(functions) {
+    const FUNCTION_CMD_RE = /^function ([^:]+):(.+)$/;
+    // Find trivial functions (only a single function call, no other commands)
+    const trivialMap = new Map(); // fn name -> target fn name
+    const emptyFunctions = new Set(); // functions with no commands
+    // System functions that should never be removed
+    const SYSTEM_FUNCTIONS = new Set(['__tick', '__load']);
+    for (const fn of functions) {
+        // Never remove system functions
+        if (SYSTEM_FUNCTIONS.has(fn.name) || fn.name.startsWith('__trigger_')) {
+            continue;
+        }
+        const nonCommentCmds = fn.commands.filter(cmd => !cmd.cmd.startsWith('#'));
+        if (nonCommentCmds.length === 0 && fn.name.includes('/')) {
+            // Empty control-flow block (e.g., main/merge_5) - mark for removal
+            // Only remove if it's a sub-block (contains /), not a top-level function
+            emptyFunctions.add(fn.name);
+        }
+        else if (nonCommentCmds.length === 1 && fn.name.includes('/')) {
+            const match = nonCommentCmds[0].cmd.match(FUNCTION_CMD_RE);
+            if (match) {
+                // This function only calls another function
+                trivialMap.set(fn.name, match[2]);
+            }
+        }
+    }
+    // Resolve chains: if A -> B -> C, then A -> C
+    // Also handle: A -> B where B is empty → A is effectively empty
+    let changed = true;
+    while (changed) {
+        changed = false;
+        for (const [from, to] of trivialMap) {
+            if (emptyFunctions.has(to)) {
+                // Target is empty, so this function is effectively empty too
+                trivialMap.delete(from);
+                emptyFunctions.add(from);
+                changed = true;
+            }
+            else {
+                const finalTarget = trivialMap.get(to);
+                if (finalTarget && finalTarget !== to) {
+                    trivialMap.set(from, finalTarget);
+                    changed = true;
+                }
+            }
+        }
+    }
+    const totalRemoved = trivialMap.size + emptyFunctions.size;
+    if (totalRemoved === 0) {
+        return { functions, stats: {} };
+    }
+    // Set of all functions to remove
+    const removedNames = new Set([...trivialMap.keys(), ...emptyFunctions]);
+    // Rewrite all function calls to skip trivial wrappers or remove empty calls
+    const result = [];
+    for (const fn of functions) {
+        // Skip removed functions
+        if (removedNames.has(fn.name)) {
+            continue;
+        }
+        // Rewrite function calls in this function
+        const rewrittenCmds = [];
+        for (const cmd of fn.commands) {
+            // Check if this is a call to an empty function
+            const emptyCallMatch = cmd.cmd.match(/^(?:execute .* run )?function ([^:]+):([^\s]+)$/);
+            if (emptyCallMatch) {
+                const targetFn = emptyCallMatch[2];
+                if (emptyFunctions.has(targetFn)) {
+                    // Skip calls to empty functions entirely
+                    continue;
+                }
+            }
+            // Rewrite calls to trivial wrapper functions
+            const rewritten = cmd.cmd.replace(/function ([^:]+):([^\s]+)/g, (match, ns, fnPath) => {
+                const target = trivialMap.get(fnPath);
+                return target ? `function ${ns}:${target}` : match;
+            });
+            rewrittenCmds.push({ ...cmd, cmd: rewritten });
+        }
+        result.push({ name: fn.name, commands: rewrittenCmds });
+    }
+    return {
+        functions: result,
+        stats: { inlinedTrivialFunctions: totalRemoved }
+    };
+}
+function optimizeCommandFunctions(functions) {
+    const initial = cloneFunctions(functions);
+    const stats = createEmptyOptimizationStats();
+    stats.totalCommandsBefore = initial.reduce((sum, fn) => sum + fn.commands.length, 0);
+    // First pass: inline trivial functions
+    const inlined = inlineTrivialFunctions(initial);
+    mergeOptimizationStats(stats, inlined.stats);
+    const licm = applyLICM(inlined.functions);
+    mergeOptimizationStats(stats, licm.stats);
+    const cse = applyCSE(licm.functions);
+    mergeOptimizationStats(stats, cse.stats);
+    const batched = batchSetblocks(cse.functions);
+    mergeOptimizationStats(stats, batched.stats);
+    stats.totalCommandsAfter = batched.functions.reduce((sum, fn) => sum + fn.commands.length, 0);
+    return {
+        functions: batched.functions,
+        stats,
+    };
+}
+//# sourceMappingURL=commands.js.map

package/dist/src/optimizer/dce.d.ts

@@ -0,0 +1,34 @@
+import type { Program } from '../ast/types';
+export interface DCEWarning {
+    message: string;
+    code: string;
+    line?: number;
+    col?: number;
+    filePath?: string;
+}
+export declare class DeadCodeEliminator {
+    private readonly functionMap;
+    private readonly reachableFunctions;
+    private readonly usedConstants;
+    private readonly localReads;
+    private readonly localDeclIds;
+    private localIdCounter;
+    readonly warnings: DCEWarning[];
+    eliminate(program: Program): Program;
+    private findEntryPoints;
+    private markReachable;
+    private collectFunctionRefs;
+    private collectStmtRefs;
+    private collectStmtRef;
+    private collectNestedStmtRefs;
+    private collectExprRefs;
+    private resolveLocal;
+    private transformFunction;
+    private transformBlock;
+    private transformStmt;
+    private transformExpr;
+}
+export declare function eliminateDeadCode(program: Program, sourceRanges?: import('../compile').SourceRange[]): {
+    program: Program;
+    warnings: DCEWarning[];
+};