redscript-mc 1.2.2 → 1.2.4

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/ast/types.d.ts

@@ -298,6 +298,7 @@ export type Stmt = {
     binding: string;
     iterable: Expr;
     body: Block;
+    executeContext?: string;
     span?: Span;
 } | {
     kind: 'for_range';

package/dist/lowering/index.js

@@ -757,8 +757,9 @@ class Lowering {
         // Extract body into a separate function
         const subFnName = `${this.currentFn}/foreach_${this.foreachCounter++}`;
         const selector = this.exprToString(stmt.iterable);
-        // Emit execute as ... run function ...
-        this.builder.emitRaw(`execute as ${selector} run function ${this.namespace}:${subFnName}`);
+        // Emit execute as ... [context modifiers] run function ...
+        const execContext = stmt.executeContext ? ` ${stmt.executeContext}` : '';
+        this.builder.emitRaw(`execute as ${selector}${execContext} run function ${this.namespace}:${subFnName}`);
         // Create the sub-function
         const savedBuilder = this.builder;
         const savedVarMap = new Map(this.varMap);

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/dist/parser/index.js

@@ -534,8 +534,20 @@ class Parser {
         this.expect('in');
         const iterable = this.parseExpr();
         this.expect(')');
+        // Parse optional execute context modifiers (at, positioned, rotated, facing, etc.)
+        let executeContext;
+        // Check for 'at' keyword or identifiers like 'positioned', 'rotated', 'facing', 'anchored', 'align'
+        const execIdentKeywords = ['positioned', 'rotated', 'facing', 'anchored', 'align'];
+        if (this.check('at') || this.check('in') || (this.check('ident') && execIdentKeywords.includes(this.peek().value))) {
+            // Collect everything until we hit '{'
+            let context = '';
+            while (!this.check('{') && !this.check('eof')) {
+                context += this.advance().value + ' ';
+            }
+            executeContext = context.trim();
+        }
         const body = this.parseBlock();
-        return this.withLoc({ kind: 'foreach', binding, iterable, body }, foreachToken);
+        return this.withLoc({ kind: 'foreach', binding, iterable, body, executeContext }, foreachToken);
     }
     parseMatchStmt() {
         const matchToken = this.expect('match');

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/examples/spiral.mcrs

@@ -12,8 +12,10 @@ let running: bool = false;
     // 每 tick 增加计数器
     counter = counter + 1;
     
-    // 在玩家位置生成粒子
-    particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
+    // 在每个玩家位置生成粒子
+    foreach (p in @a) at @s {
+        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
+    }
     
     // 每 20 ticks (1秒) 报告一次
     if (counter % 20 == 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redscript-mc",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "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/ast/types.ts

@@ -192,7 +192,7 @@ export type Stmt =
   | { kind: 'if';         cond: Expr; then: Block; else_?: Block; span?: Span }
   | { kind: 'while';      cond: Expr; body: Block; span?: Span }
   | { kind: 'for';        init?: Stmt; cond: Expr; step: Expr; body: Block; span?: Span }
-  | { kind: 'foreach';    binding: string; iterable: Expr; body: Block; span?: Span }
+  | { kind: 'foreach';    binding: string; iterable: Expr; body: Block; executeContext?: string; span?: Span }
   | { kind: 'for_range';  varName: string; start: Expr; end: Expr; body: Block; span?: Span }
   | { kind: 'match';      expr: Expr; arms: { pattern: Expr | null; body: Block }[]; span?: Span }
   | { kind: 'as_block';   selector: EntitySelector; body: Block; span?: Span }

package/src/lowering/index.ts

@@ -898,8 +898,9 @@ export class Lowering {
     const subFnName = `${this.currentFn}/foreach_${this.foreachCounter++}`
     const selector = this.exprToString(stmt.iterable)
 
-    // Emit execute as ... run function ...
-    this.builder.emitRaw(`execute as ${selector} run function ${this.namespace}:${subFnName}`)
+    // Emit execute as ... [context modifiers] run function ...
+    const execContext = stmt.executeContext ? ` ${stmt.executeContext}` : ''
+    this.builder.emitRaw(`execute as ${selector}${execContext} run function ${this.namespace}:${subFnName}`)
 
     // Create the sub-function
     const savedBuilder = this.builder

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
       }

package/src/parser/index.ts

@@ -645,9 +645,23 @@ export class Parser {
     this.expect('in')
     const iterable = this.parseExpr()
     this.expect(')')
+
+    // Parse optional execute context modifiers (at, positioned, rotated, facing, etc.)
+    let executeContext: string | undefined
+    // Check for 'at' keyword or identifiers like 'positioned', 'rotated', 'facing', 'anchored', 'align'
+    const execIdentKeywords = ['positioned', 'rotated', 'facing', 'anchored', 'align']
+    if (this.check('at') || this.check('in') || (this.check('ident') && execIdentKeywords.includes(this.peek().value))) {
+      // Collect everything until we hit '{'
+      let context = ''
+      while (!this.check('{') && !this.check('eof')) {
+        context += this.advance().value + ' '
+      }
+      executeContext = context.trim()
+    }
+
     const body = this.parseBlock()
 
-    return this.withLoc({ kind: 'foreach', binding, iterable, body }, foreachToken)
+    return this.withLoc({ kind: 'foreach', binding, iterable, body, executeContext }, foreachToken)
   }
 
   private parseMatchStmt(): Stmt {