redscript-mc 1.2.2 → 1.2.3

package/dist/__tests__/optimizer.test.js

@@ -71,12 +71,12 @@ describe('copyPropagation', () => {
 describe('deadCodeElimination', () => {
     it('removes unused assignment', () => {
         const fn = makeFn([
-            { op: 'assign', dst: '$unused', src: { kind: 'const', value: 99 } },
-            { op: 'assign', dst: '$used', src: { kind: 'const', value: 1 } },
-        ], { op: 'return', value: { kind: 'var', name: '$used' } });
+            { op: 'assign', dst: '$t0', src: { kind: 'const', value: 99 } }, // unused temp
+            { op: 'assign', dst: '$t1', src: { kind: 'const', value: 1 } }, // used temp
+        ], { op: 'return', value: { kind: 'var', name: '$t1' } });
         const opt = (0, passes_1.deadCodeElimination)(fn);
         expect(opt.blocks[0].instrs).toHaveLength(1);
-        expect(opt.blocks[0].instrs[0].dst).toBe('$used');
+        expect(opt.blocks[0].instrs[0].dst).toBe('$t1');
     });
     it('keeps call even if return value unused (side effects)', () => {
         const fn = makeFn([
@@ -104,12 +104,12 @@ describe('optimize pipeline', () => {
         const fn = makeFn([
             { op: 'binop', dst: '$t0', lhs: { kind: 'const', value: 2 }, bop: '+', rhs: { kind: 'const', value: 3 } },
             { op: 'assign', dst: '$x', src: { kind: 'var', name: '$t0' } },
-            { op: 'assign', dst: '$unused', src: { kind: 'const', value: 0 } },
+            { op: 'assign', dst: '$t1', src: { kind: 'const', value: 0 } }, // unused temp, should be removed
         ], { op: 'return', value: { kind: 'var', name: '$x' } });
         const opt = (0, passes_1.optimize)(fn);
         const instrs = opt.blocks[0].instrs;
-        // $unused should be gone
-        expect(instrs.some((i) => i.dst === '$unused')).toBe(false);
+        // $t1 (unused temp) should be gone
+        expect(instrs.some((i) => i.dst === '$t1')).toBe(false);
         // $x should be const 5 (after folding + propagation)
         const xInstr = instrs.find((i) => i.dst === '$x');
         expect(xInstr?.src).toEqual({ kind: 'const', value: 5 });

package/dist/optimizer/passes.js

@@ -184,7 +184,11 @@ function deadCodeEliminationWithStats(fn) {
         instrs: block.instrs.filter(instr => {
             // Only assignments/binops/cmps with an unused dst are candidates for removal
             if (instr.op === 'assign' || instr.op === 'binop' || instr.op === 'cmp') {
-                const keep = readVars.has(instr.dst);
+                // Always keep assignments to global variables (they may be read by other functions)
+                // Temps are $t0, $t1, ...; params are $p0, $p1, ...; locals are $_0, $_1, ...
+                // Everything else is a potential global
+                const isTemp = /^\$t\d+$/.test(instr.dst) || /^\$p\d+$/.test(instr.dst) || /^\$_\d+$/.test(instr.dst);
+                const keep = !isTemp || readVars.has(instr.dst);
                 if (!keep)
                     removed++;
                 return keep;

package/editors/vscode/out/extension.js

@@ -6291,7 +6291,9 @@ var require_dce = __commonJS({
             "on_craft",
             "on_death",
             "on_login",
-            "on_join_team"
+            "on_join_team",
+            "keep"
+            // Prevent DCE from removing this function
           ].includes(decorator.name))) {
             entries.add(fn.name);
           }

package/editors/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "redscript-vscode",
   "displayName": "RedScript for Minecraft",
   "description": "Syntax highlighting, error diagnostics, and language support for RedScript — a compiler targeting Minecraft Java Edition",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

package/editors/vscode/syntaxes/redscript.tmLanguage.json

@@ -61,7 +61,7 @@
       "patterns": [
         {
           "comment": "Decorator with arguments: @tick(rate=20)",
-          "begin": "(@(?:tick|on_advancement|on_craft|on_death|on_trigger|on_join_team|on_login))\\s*(\\()",
+          "begin": "(@(?:tick|load|keep|on|on_advancement|on_craft|on_death|on_trigger|on_join_team|on_login))\\s*(\\()",
           "beginCaptures": {
             "1": { "name": "entity.name.function.decorator.redscript" },
             "2": { "name": "punctuation.definition.parameters.redscript" }
@@ -86,7 +86,7 @@
         {
           "comment": "Bare decorator: @on_death",
           "name": "entity.name.function.decorator.redscript",
-          "match": "@(?:tick|on_advancement|on_craft|on_death|on_trigger|on_join_team|on_login)\\b"
+          "match": "@(?:tick|load|keep|on|on_advancement|on_craft|on_death|on_trigger|on_join_team|on_login)\\b"
         }
       ]
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redscript-mc",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A high-level programming language that compiles to Minecraft datapacks",
   "main": "dist/index.js",
   "bin": {

package/src/__tests__/optimizer.test.ts

@@ -79,12 +79,12 @@ describe('copyPropagation', () => {
 describe('deadCodeElimination', () => {
   it('removes unused assignment', () => {
     const fn = makeFn([
-      { op: 'assign', dst: '$unused', src: { kind: 'const', value: 99 } },
-      { op: 'assign', dst: '$used', src: { kind: 'const', value: 1 } },
-    ], { op: 'return', value: { kind: 'var', name: '$used' } })
+      { op: 'assign', dst: '$t0', src: { kind: 'const', value: 99 } },  // unused temp
+      { op: 'assign', dst: '$t1', src: { kind: 'const', value: 1 } },   // used temp
+    ], { op: 'return', value: { kind: 'var', name: '$t1' } })
     const opt = deadCodeElimination(fn)
     expect(opt.blocks[0].instrs).toHaveLength(1)
-    expect((opt.blocks[0].instrs[0] as any).dst).toBe('$used')
+    expect((opt.blocks[0].instrs[0] as any).dst).toBe('$t1')
   })
 
   it('keeps call even if return value unused (side effects)', () => {
@@ -115,13 +115,13 @@ describe('optimize pipeline', () => {
     const fn = makeFn([
       { op: 'binop', dst: '$t0', lhs: { kind: 'const', value: 2 }, bop: '+', rhs: { kind: 'const', value: 3 } },
       { op: 'assign', dst: '$x', src: { kind: 'var', name: '$t0' } },
-      { op: 'assign', dst: '$unused', src: { kind: 'const', value: 0 } },
+      { op: 'assign', dst: '$t1', src: { kind: 'const', value: 0 } },  // unused temp, should be removed
     ], { op: 'return', value: { kind: 'var', name: '$x' } })
 
     const opt = optimize(fn)
     const instrs = opt.blocks[0].instrs
-    // $unused should be gone
-    expect(instrs.some((i: any) => i.dst === '$unused')).toBe(false)
+    // $t1 (unused temp) should be gone
+    expect(instrs.some((i: any) => i.dst === '$t1')).toBe(false)
     // $x should be const 5 (after folding + propagation)
     const xInstr = instrs.find((i: any) => i.dst === '$x') as any
     expect(xInstr?.src).toEqual({ kind: 'const', value: 5 })

package/src/optimizer/passes.ts

@@ -177,7 +177,11 @@ export function deadCodeEliminationWithStats(fn: IRFunction): { fn: IRFunction;
     instrs: block.instrs.filter(instr => {
       // Only assignments/binops/cmps with an unused dst are candidates for removal
       if (instr.op === 'assign' || instr.op === 'binop' || instr.op === 'cmp') {
-        const keep = readVars.has(instr.dst)
+        // Always keep assignments to global variables (they may be read by other functions)
+        // Temps are $t0, $t1, ...; params are $p0, $p1, ...; locals are $_0, $_1, ...
+        // Everything else is a potential global
+        const isTemp = /^\$t\d+$/.test(instr.dst) || /^\$p\d+$/.test(instr.dst) || /^\$_\d+$/.test(instr.dst)
+        const keep = !isTemp || readVars.has(instr.dst)
         if (!keep) removed++
         return keep
       }