redscript-mc 1.2.9 → 1.2.10

package/README.md

@@ -20,55 +20,56 @@ Write clean game logic. RedScript handles the scoreboard spaghetti.
 
 ### 🚀 [Try it online — no install needed!](https://redscript-ide.pages.dev)
 
+<img src="./demo.gif" alt="RedScript Demo" width="400" />
+
+*↑ Particles spawning at player position every tick — 100% vanilla, no mods! Just 30 lines of RedScript with full control flow: `if`, `foreach`, `@tick`, f-strings, and more.*
+
 </div>
 
 ---
 
 ### What is RedScript?
 
-You want to make a Minecraft mini-game. You need a countdown timer, kill counter, respawn logic, and a scoreboard display. In vanilla MC, that's 40+ `.mcfunction` files, hundreds of `execute if score` commands, and a weekend of debugging.
+RedScript is a typed scripting language that compiles to vanilla Minecraft datapacks. Write clean code with variables, functions, loops, and events — RedScript handles the scoreboard commands and `.mcfunction` files for you.
 
-With RedScript, it's this:
+**The demo above?** Just 30 lines:
 
 ```rs
-// pvp_game.mcrs
-import "stdlib/player.mcrs"
-
-const GAME_TIME: int = 300;
-
-@tick(rate=20)
-fn every_second() {
-    let time: int = scoreboard_get(#game, #timer);
-
-    if (time <= 0) {
-        end_game();
-        return;
+let counter: int = 0;
+let running: bool = false;
+
+@tick fn demo_tick() {
+    if (!running) { return; }
+    counter = counter + 1;
+    
+    foreach (p in @a) at @s {
+        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
+    }
+    
+    if (counter % 20 == 0) {
+        say(f"Running for {counter} ticks");
     }
-
-    scoreboard_set(#game, #timer, time - 1);
-    actionbar(@a, "⏱ ${time}s remaining");
-}
-
-fn start_game() {
-    scoreboard_set(#game, #timer, GAME_TIME);
-    scoreboard_set(#game, #running, 1);
-    title(@a, "Fight!", "Game started");
-    tp(@a, (0, 64, 0));
 }
 
-fn end_game() {
-    scoreboard_set(#game, #running, 0);
-    title(@a, "Game Over!");
-    announce("Thanks for playing!");
+@keep fn start() {
+    running = true;
+    counter = 0;
+    say(f"Demo started!");
 }
 
-@on_death
-fn on_kill() {
-    scoreboard_add(@s, #kills, 1);
+@keep fn stop() {
+    running = false;
+    say(f"Demo stopped at {counter} ticks.");
 }
 ```
 
-One file. Compiles to a ready-to-use datapack in seconds.
+**What you get:**
+- ✅ `let` / `const` variables (no more `scoreboard players set`)
+- ✅ `if` / `else` / `for` / `foreach` control flow
+- ✅ `@tick` / `@load` / `@on(Event)` decorators
+- ✅ `foreach (p in @a) at @s` — iterate entities with execute context
+- ✅ f-strings like `f"Score: {points}"` for dynamic output
+- ✅ One file → ready-to-use datapack
 
 ---
 
@@ -199,7 +200,8 @@ if (hp <= 0) {
 }
 
 for (let i: int = 0; i < 10; i = i + 1) {
-    summon("minecraft:zombie", (i, 64, 0));
+    say(f"Spawning wave {i}");
+    summon("minecraft:zombie", ~0, ~0, ~0);
 }
 
 foreach (player in @a) {

package/README.zh.md

@@ -20,55 +20,56 @@
 
 ### 🚀 [在线试用 — 无需安装！](https://redscript-ide.pages.dev)
 
+<img src="./demo.gif" alt="RedScript Demo" width="400" />
+
+*↑ 每 tick 在玩家位置生成粒子 — 纯原版，无需 MOD！仅 30 行 RedScript，包含完整控制流：`if`、`foreach`、`@tick`、f-strings 等。*
+
 </div>
 
 ---
 
 ### RedScript 是什么？
 
-你想做一个 Minecraft 小游戏——倒计时、击杀计数、复活逻辑、记分板显示。用原版 MC 的话，这意味着 40+ 个 `.mcfunction` 文件、几百条 `execute if score` 命令，还要花一个周末调试。
+RedScript 是一门编译到原版 Minecraft 数据包的脚本语言。用变量、函数、循环、事件写代码，RedScript 帮你生成记分板命令和 `.mcfunction` 文件。
 
-用 RedScript，就是这样：
+**上面的演示？** 只有 30 行：
 
 ```rs
-// pvp_game.mcrs
-import "stdlib/player.mcrs"
-
-const GAME_TIME: int = 300;
-
-@tick(rate=20)
-fn every_second() {
-    let time: int = scoreboard_get(#game, #timer);
-
-    if (time <= 0) {
-        end_game();
-        return;
+let counter: int = 0;
+let running: bool = false;
+
+@tick fn demo_tick() {
+    if (!running) { return; }
+    counter = counter + 1;
+    
+    foreach (p in @a) at @s {
+        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
+    }
+    
+    if (counter % 20 == 0) {
+        say(f"已运行 {counter} ticks");
     }
-
-    scoreboard_set(#game, #timer, time - 1);
-    actionbar(@a, "⏱ 剩余 ${time} 秒");
-}
-
-fn start_game() {
-    scoreboard_set(#game, #timer, GAME_TIME);
-    scoreboard_set(#game, #running, 1);
-    title(@a, "开始战斗！", "游戏已开始");
-    tp(@a, (0, 64, 0));
 }
 
-fn end_game() {
-    scoreboard_set(#game, #running, 0);
-    title(@a, "游戏结束！");
-    announce("感谢游玩！");
+@keep fn start() {
+    running = true;
+    counter = 0;
+    say(f"Demo 已启动！");
 }
 
-@on_death
-fn on_kill() {
-    scoreboard_add(@s, #kills, 1);
+@keep fn stop() {
+    running = false;
+    say(f"Demo 已停止，共运行 {counter} ticks。");
 }
 ```
 
-一个文件，几秒钟编译出可以直接用的 datapack。
+**你得到：**
+- ✅ `let` / `const` 变量（告别 `scoreboard players set`）
+- ✅ `if` / `else` / `for` / `foreach` 完整控制流
+- ✅ `@tick` / `@load` / `@on(Event)` 装饰器
+- ✅ `foreach (p in @a) at @s` — 遍历实体并设置执行上下文
+- ✅ f-strings 如 `f"分数: {points}"` 动态输出
+- ✅ 一个文件 → 可直接使用的 datapack
 
 ---
 
@@ -199,7 +200,8 @@ if (hp <= 0) {
 }
 
 for (let i: int = 0; i < 10; i = i + 1) {
-    summon("minecraft:zombie", (i, 64, 0));
+    say(f"生成第 {i} 波");
+    summon("minecraft:zombie", ~0, ~0, ~0);
 }
 
 foreach (player in @a) {

package/dist/ast/types.d.ts

@@ -275,6 +275,12 @@ export type Stmt = {
     kind: 'return';
     value?: Expr;
     span?: Span;
+} | {
+    kind: 'break';
+    span?: Span;
+} | {
+    kind: 'continue';
+    span?: Span;
 } | {
     kind: 'if';
     cond: Expr;

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  *
  * Main entry point for programmatic usage.
  */
-export declare const version = "1.2.9";
+export declare const version = "1.2.10";
 import type { Warning } from './lowering';
 import { DatapackFile } from './codegen/mcfunction';
 import type { IRModule } from './ir/types';

package/dist/index.js

@@ -9,7 +9,7 @@ exports.MCCommandValidator = exports.generateDatapack = exports.optimize = expor
 exports.compile = compile;
 exports.check = check;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-exports.version = '1.2.9';
+exports.version = '1.2.10';
 const lexer_1 = require("./lexer");
 const parser_1 = require("./parser");
 const typechecker_1 = require("./typechecker");

package/dist/lexer/index.d.ts

@@ -5,7 +5,7 @@
  * Handles special cases like entity selectors vs decorators,
  * range literals, and raw commands.
  */
-export type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'int' | 'bool' | 'float' | 'string' | 'void' | 'BlockPos' | 'true' | 'false' | 'selector' | 'decorator' | 'int_lit' | 'float_lit' | 'byte_lit' | 'short_lit' | 'long_lit' | 'double_lit' | 'string_lit' | 'f_string' | 'range_lit' | 'rel_coord' | 'local_coord' | '+' | '-' | '*' | '/' | '%' | '~' | '^' | '==' | '!=' | '<' | '<=' | '>' | '>=' | '&&' | '||' | '!' | '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '{' | '}' | '(' | ')' | '[' | ']' | ',' | ';' | ':' | '::' | '->' | '=>' | '.' | 'ident' | 'mc_name' | 'raw_cmd' | 'eof';
+export type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'break' | 'continue' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'int' | 'bool' | 'float' | 'string' | 'void' | 'BlockPos' | 'true' | 'false' | 'selector' | 'decorator' | 'int_lit' | 'float_lit' | 'byte_lit' | 'short_lit' | 'long_lit' | 'double_lit' | 'string_lit' | 'f_string' | 'range_lit' | 'rel_coord' | 'local_coord' | '+' | '-' | '*' | '/' | '%' | '~' | '^' | '==' | '!=' | '<' | '<=' | '>' | '>=' | '&&' | '||' | '!' | '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '{' | '}' | '(' | ')' | '[' | ']' | ',' | ';' | ':' | '::' | '->' | '=>' | '.' | 'ident' | 'mc_name' | 'raw_cmd' | 'eof';
 export interface Token {
     kind: TokenKind;
     value: string;

package/dist/lexer/index.js

@@ -23,6 +23,8 @@ const KEYWORDS = {
     foreach: 'foreach',
     match: 'match',
     return: 'return',
+    break: 'break',
+    continue: 'continue',
     as: 'as',
     at: 'at',
     in: 'in',

package/dist/lowering/index.d.ts

@@ -45,6 +45,7 @@ export declare class Lowering {
     private varTypes;
     private floatVars;
     private worldObjCounter;
+    private loopStack;
     constructor(namespace: string, sourceRanges?: SourceRange[]);
     lower(program: Program): IRModule;
     private lowerFn;
@@ -54,6 +55,8 @@ export declare class Lowering {
     private lowerStmt;
     private lowerLetStmt;
     private lowerReturnStmt;
+    private lowerBreakStmt;
+    private lowerContinueStmt;
     private lowerIfStmt;
     private lowerIsCheckIfStmt;
     private lowerWhileStmt;

package/dist/lowering/index.js

@@ -209,6 +209,8 @@ class Lowering {
         this.floatVars = new Set();
         // World object counter for unique tags
         this.worldObjCounter = 0;
+        // Loop context stack for break/continue
+        this.loopStack = [];
         this.namespace = namespace;
         this.sourceRanges = sourceRanges;
         LoweringBuilder.resetTempCounter();
@@ -462,6 +464,12 @@ class Lowering {
             case 'return':
                 this.lowerReturnStmt(stmt);
                 break;
+            case 'break':
+                this.lowerBreakStmt();
+                break;
+            case 'continue':
+                this.lowerContinueStmt();
+                break;
             case 'if':
                 this.lowerIfStmt(stmt);
                 break;
@@ -599,6 +607,20 @@ class Lowering {
             this.builder.emitReturn();
         }
     }
+    lowerBreakStmt() {
+        if (this.loopStack.length === 0) {
+            throw new diagnostics_1.DiagnosticError('LoweringError', 'break statement outside of loop', { line: 1, col: 1 });
+        }
+        const loop = this.loopStack[this.loopStack.length - 1];
+        this.builder.emitJump(loop.breakLabel);
+    }
+    lowerContinueStmt() {
+        if (this.loopStack.length === 0) {
+            throw new diagnostics_1.DiagnosticError('LoweringError', 'continue statement outside of loop', { line: 1, col: 1 });
+        }
+        const loop = this.loopStack[this.loopStack.length - 1];
+        this.builder.emitJump(loop.continueLabel);
+    }
     lowerIfStmt(stmt) {
         if (stmt.cond.kind === 'is_check') {
             this.lowerIsCheckIfStmt(stmt);
@@ -671,12 +693,16 @@ class Lowering {
         const condVar = this.lowerExpr(stmt.cond);
         const condName = this.operandToVar(condVar);
         this.builder.emitJumpIf(condName, bodyLabel, exitLabel);
+        // Push loop context for break/continue (while has no step, so continue goes to check)
+        this.loopStack.push({ breakLabel: exitLabel, continueLabel: checkLabel });
         // Body block
         this.builder.startBlock(bodyLabel);
         this.lowerBlock(stmt.body);
         if (!this.builder.isBlockSealed()) {
             this.builder.emitJump(checkLabel);
         }
+        // Pop loop context
+        this.loopStack.pop();
         // Exit block
         this.builder.startBlock(exitLabel);
     }
@@ -688,6 +714,7 @@ class Lowering {
         }
         const checkLabel = this.builder.freshLabel('for_check');
         const bodyLabel = this.builder.freshLabel('for_body');
+        const continueLabel = this.builder.freshLabel('for_continue');
         const exitLabel = this.builder.freshLabel('for_exit');
         this.builder.emitJump(checkLabel);
         // Check block
@@ -695,14 +722,20 @@ class Lowering {
         const condVar = this.lowerExpr(stmt.cond);
         const condName = this.operandToVar(condVar);
         this.builder.emitJumpIf(condName, bodyLabel, exitLabel);
+        // Push loop context for break/continue
+        this.loopStack.push({ breakLabel: exitLabel, continueLabel });
         // Body block
         this.builder.startBlock(bodyLabel);
         this.lowerBlock(stmt.body);
-        // Step expression
-        this.lowerExpr(stmt.step);
         if (!this.builder.isBlockSealed()) {
-            this.builder.emitJump(checkLabel);
+            this.builder.emitJump(continueLabel);
         }
+        // Continue block (step + loop back)
+        this.builder.startBlock(continueLabel);
+        this.lowerExpr(stmt.step);
+        this.builder.emitJump(checkLabel);
+        // Pop loop context
+        this.loopStack.pop();
         // Exit block
         this.builder.startBlock(exitLabel);
     }
@@ -794,12 +827,32 @@ class Lowering {
                 defaultArm = arm;
                 continue;
             }
-            const patternValue = this.lowerExpr(arm.pattern);
-            if (patternValue.kind !== 'const') {
-                throw new Error('Match patterns must lower to compile-time constants');
+            // Handle range patterns specially
+            let matchCondition;
+            if (arm.pattern.kind === 'range_lit') {
+                const range = arm.pattern.range;
+                if (range.min !== undefined && range.max !== undefined) {
+                    matchCondition = `${range.min}..${range.max}`;
+                }
+                else if (range.min !== undefined) {
+                    matchCondition = `${range.min}..`;
+                }
+                else if (range.max !== undefined) {
+                    matchCondition = `..${range.max}`;
+                }
+                else {
+                    matchCondition = '0..'; // Match any
+                }
+            }
+            else {
+                const patternValue = this.lowerExpr(arm.pattern);
+                if (patternValue.kind !== 'const') {
+                    throw new Error('Match patterns must lower to compile-time constants');
+                }
+                matchCondition = String(patternValue.value);
             }
             const subFnName = `${this.currentFn}/match_${this.foreachCounter++}`;
-            this.builder.emitRaw(`execute if score ${matchedVar} rs matches ..0 if score ${subject} rs matches ${patternValue.value} run function ${this.namespace}:${subFnName}`);
+            this.builder.emitRaw(`execute if score ${matchedVar} rs matches ..0 if score ${subject} rs matches ${matchCondition} run function ${this.namespace}:${subFnName}`);
             this.emitMatchArmSubFunction(subFnName, matchedVar, arm.body, true);
         }
         if (defaultArm) {

package/dist/optimizer/dce.js

@@ -241,6 +241,8 @@ class DeadCodeEliminator {
                 this.collectNestedStmtRefs(stmt, scope);
                 break;
             case 'raw':
+            case 'break':
+            case 'continue':
                 break;
         }
     }
@@ -508,6 +510,10 @@ class DeadCodeEliminator {
                 return [copySpan({ ...stmt, body: this.transformBlock(stmt.body, scope) }, stmt)];
             case 'raw':
                 return [stmt];
+            case 'break':
+                return [stmt];
+            case 'continue':
+                return [stmt];
         }
     }
     transformExpr(expr, scope) {

package/dist/parser/index.js

@@ -397,6 +397,18 @@ class Parser {
         if (this.check('return')) {
             return this.parseReturnStmt();
         }
+        // Break statement
+        if (this.check('break')) {
+            const token = this.advance();
+            this.match(';');
+            return this.withLoc({ kind: 'break' }, token);
+        }
+        // Continue statement
+        if (this.check('continue')) {
+            const token = this.advance();
+            this.match(';');
+            return this.withLoc({ kind: 'continue' }, token);
+        }
         // If statement
         if (this.check('if')) {
             return this.parseIfStmt();

package/package.json

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

package/src/ast/types.ts

@@ -189,6 +189,8 @@ export type Stmt =
   | { kind: 'let';        name: string; type?: TypeNode; init: Expr; span?: Span }
   | { kind: 'expr';       expr: Expr; span?: Span }
   | { kind: 'return';     value?: Expr; span?: Span }
+  | { kind: 'break';      span?: Span }
+  | { kind: 'continue';   span?: Span }
   | { 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 }

package/src/index.ts

@@ -5,7 +5,7 @@
  */
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-export const version = '1.2.9'
+export const version = '1.2.10'
 
 import { Lexer } from './lexer'
 import { Parser } from './parser'

package/src/lexer/index.ts

@@ -15,7 +15,7 @@ import { DiagnosticError } from '../diagnostics'
 export type TokenKind =
   // Keywords
   | 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match'
-  | 'return' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace'
+  | 'return' | 'break' | 'continue' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace'
   | 'execute' | 'run' | 'unless'
   // Types
   | 'int' | 'bool' | 'float' | 'string' | 'void'
@@ -75,6 +75,8 @@ const KEYWORDS: Record<string, TokenKind> = {
   foreach: 'foreach',
   match: 'match',
   return: 'return',
+  break: 'break',
+  continue: 'continue',
   as: 'as',
   at: 'at',
   in: 'in',

package/src/lowering/index.ts

@@ -224,6 +224,9 @@ export class Lowering {
   // World object counter for unique tags
   private worldObjCounter: number = 0
 
+  // Loop context stack for break/continue
+  private loopStack: Array<{ breakLabel: string; continueLabel: string; stepFn?: () => void }> = []
+
   constructor(namespace: string, sourceRanges: SourceRange[] = []) {
     this.namespace = namespace
     this.sourceRanges = sourceRanges
@@ -530,6 +533,12 @@ export class Lowering {
       case 'return':
         this.lowerReturnStmt(stmt)
         break
+      case 'break':
+        this.lowerBreakStmt()
+        break
+      case 'continue':
+        this.lowerContinueStmt()
+        break
       case 'if':
         this.lowerIfStmt(stmt)
         break
@@ -682,6 +691,22 @@ export class Lowering {
     }
   }
 
+  private lowerBreakStmt(): void {
+    if (this.loopStack.length === 0) {
+      throw new DiagnosticError('LoweringError', 'break statement outside of loop', { line: 1, col: 1 })
+    }
+    const loop = this.loopStack[this.loopStack.length - 1]
+    this.builder.emitJump(loop.breakLabel)
+  }
+
+  private lowerContinueStmt(): void {
+    if (this.loopStack.length === 0) {
+      throw new DiagnosticError('LoweringError', 'continue statement outside of loop', { line: 1, col: 1 })
+    }
+    const loop = this.loopStack[this.loopStack.length - 1]
+    this.builder.emitJump(loop.continueLabel)
+  }
+
   private lowerIfStmt(stmt: Extract<Stmt, { kind: 'if' }>): void {
     if (stmt.cond.kind === 'is_check') {
       this.lowerIsCheckIfStmt(stmt)
@@ -790,6 +815,9 @@ export class Lowering {
     const condName = this.operandToVar(condVar)
     this.builder.emitJumpIf(condName, bodyLabel, exitLabel)
 
+    // Push loop context for break/continue (while has no step, so continue goes to check)
+    this.loopStack.push({ breakLabel: exitLabel, continueLabel: checkLabel })
+
     // Body block
     this.builder.startBlock(bodyLabel)
     this.lowerBlock(stmt.body)
@@ -797,6 +825,9 @@ export class Lowering {
       this.builder.emitJump(checkLabel)
     }
 
+    // Pop loop context
+    this.loopStack.pop()
+
     // Exit block
     this.builder.startBlock(exitLabel)
   }
@@ -811,6 +842,7 @@ export class Lowering {
 
     const checkLabel = this.builder.freshLabel('for_check')
     const bodyLabel = this.builder.freshLabel('for_body')
+    const continueLabel = this.builder.freshLabel('for_continue')
     const exitLabel = this.builder.freshLabel('for_exit')
 
     this.builder.emitJump(checkLabel)
@@ -821,15 +853,24 @@ export class Lowering {
     const condName = this.operandToVar(condVar)
     this.builder.emitJumpIf(condName, bodyLabel, exitLabel)
 
+    // Push loop context for break/continue
+    this.loopStack.push({ breakLabel: exitLabel, continueLabel })
+
     // Body block
     this.builder.startBlock(bodyLabel)
     this.lowerBlock(stmt.body)
-    // Step expression
-    this.lowerExpr(stmt.step)
     if (!this.builder.isBlockSealed()) {
-      this.builder.emitJump(checkLabel)
+      this.builder.emitJump(continueLabel)
     }
 
+    // Continue block (step + loop back)
+    this.builder.startBlock(continueLabel)
+    this.lowerExpr(stmt.step)
+    this.builder.emitJump(checkLabel)
+
+    // Pop loop context
+    this.loopStack.pop()
+
     // Exit block
     this.builder.startBlock(exitLabel)
   }
@@ -945,13 +986,29 @@ export class Lowering {
         continue
       }
 
-      const patternValue = this.lowerExpr(arm.pattern)
-      if (patternValue.kind !== 'const') {
-        throw new Error('Match patterns must lower to compile-time constants')
+      // Handle range patterns specially
+      let matchCondition: string
+      if (arm.pattern.kind === 'range_lit') {
+        const range = arm.pattern.range
+        if (range.min !== undefined && range.max !== undefined) {
+          matchCondition = `${range.min}..${range.max}`
+        } else if (range.min !== undefined) {
+          matchCondition = `${range.min}..`
+        } else if (range.max !== undefined) {
+          matchCondition = `..${range.max}`
+        } else {
+          matchCondition = '0..'  // Match any
+        }
+      } else {
+        const patternValue = this.lowerExpr(arm.pattern)
+        if (patternValue.kind !== 'const') {
+          throw new Error('Match patterns must lower to compile-time constants')
+        }
+        matchCondition = String(patternValue.value)
       }
 
       const subFnName = `${this.currentFn}/match_${this.foreachCounter++}`
-      this.builder.emitRaw(`execute if score ${matchedVar} rs matches ..0 if score ${subject} rs matches ${patternValue.value} run function ${this.namespace}:${subFnName}`)
+      this.builder.emitRaw(`execute if score ${matchedVar} rs matches ..0 if score ${subject} rs matches ${matchCondition} run function ${this.namespace}:${subFnName}`)
       this.emitMatchArmSubFunction(subFnName, matchedVar, arm.body, true)
     }
 

package/src/optimizer/dce.ts

@@ -267,6 +267,8 @@ export class DeadCodeEliminator {
         this.collectNestedStmtRefs(stmt, scope)
         break
       case 'raw':
+      case 'break':
+      case 'continue':
         break
     }
   }
@@ -542,6 +544,10 @@ export class DeadCodeEliminator {
         return [copySpan({ ...stmt, body: this.transformBlock(stmt.body, scope) }, stmt)]
       case 'raw':
         return [stmt]
+      case 'break':
+        return [stmt]
+      case 'continue':
+        return [stmt]
     }
   }
 

package/src/parser/index.ts

@@ -470,6 +470,20 @@ export class Parser {
       return this.parseReturnStmt()
     }
 
+    // Break statement
+    if (this.check('break')) {
+      const token = this.advance()
+      this.match(';')
+      return this.withLoc({ kind: 'break' }, token)
+    }
+
+    // Continue statement
+    if (this.check('continue')) {
+      const token = this.advance()
+      this.match(';')
+      return this.withLoc({ kind: 'continue' }, token)
+    }
+
     // If statement
     if (this.check('if')) {
       return this.parseIfStmt()