redscript-mc 1.2.3 → 1.2.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/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

@@ -1163,8 +1163,17 @@ var require_parser = __commonJS({
         this.expect("in");
         const iterable = this.parseExpr();
         this.expect(")");
+        let executeContext;
+        const execIdentKeywords = ["positioned", "rotated", "facing", "anchored", "align"];
+        if (this.check("at") || this.check("in") || this.check("ident") && execIdentKeywords.includes(this.peek().value)) {
+          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");
@@ -3799,7 +3808,8 @@ var require_lowering = __commonJS({
         }
         const subFnName = `${this.currentFn}/foreach_${this.foreachCounter++}`;
         const selector = this.exprToString(stmt.iterable);
-        this.builder.emitRaw(`execute as ${selector} run function ${this.namespace}:${subFnName}`);
+        const execContext = stmt.executeContext ? ` ${stmt.executeContext}` : "";
+        this.builder.emitRaw(`execute as ${selector}${execContext} run function ${this.namespace}:${subFnName}`);
         const savedBuilder = this.builder;
         const savedVarMap = new Map(this.varMap);
         const savedContext = this.currentContext;
@@ -6122,7 +6132,8 @@ var require_passes = __commonJS({
         ...block,
         instrs: block.instrs.filter((instr) => {
           if (instr.op === "assign" || instr.op === "binop" || instr.op === "cmp") {
-            const keep = readVars.has(instr.dst);
+            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/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.5",
+  "version": "1.0.6",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

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

@@ -133,7 +133,7 @@
       "patterns": [
         {
           "name": "keyword.control.redscript",
-          "match": "\\b(if|else|while|for|foreach|return|match|in|execute|as|at|unless|run|is)\\b"
+          "match": "\\b(if|else|while|for|foreach|return|match|in|execute|as|at|unless|run|is|positioned|rotated|facing|anchored|align)\\b"
         },
         {
           "name": "keyword.declaration.redscript",

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.3",
+  "version": "1.2.5",
   "description": "A high-level programming language that compiles to Minecraft datapacks",
   "main": "dist/index.js",
   "bin": {

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/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 {