redscript-mc 2.1.0 → 2.2.1

package/src/optimizer/coroutine.ts

@@ -40,6 +40,8 @@ export interface CoroutineResult {
   module: MIRModule
   /** Names of generated @tick dispatcher functions (caller must add to tick list). */
   generatedTickFunctions: string[]
+  /** Warning messages for skipped transforms. */
+  warnings: string[]
 }
 
 /**
@@ -51,11 +53,12 @@ export function coroutineTransform(
   mod: MIRModule,
   infos: CoroutineInfo[],
 ): CoroutineResult {
-  if (infos.length === 0) return { module: mod, generatedTickFunctions: [] }
+  if (infos.length === 0) return { module: mod, generatedTickFunctions: [], warnings: [] }
 
   const infoMap = new Map(infos.map(i => [i.fnName, i]))
   const newFunctions: MIRFunction[] = []
   const tickFns: string[] = []
+  const warnings: string[] = []
 
   for (const fn of mod.functions) {
     const info = infoMap.get(fn.name)
@@ -64,6 +67,17 @@ export function coroutineTransform(
       continue
     }
 
+    // Skip transform if function contains macro calls — continuations are called
+    // directly (not via `function ... with storage`) so macro variables like
+    // ${px} would not be substituted, causing MC parse errors.
+    if (fnContainsMacroCalls(fn)) {
+      warnings.push(
+        `@coroutine cannot be applied to functions containing macro calls (skipped: ${fn.name})`,
+      )
+      newFunctions.push(fn)
+      continue
+    }
+
     const transformed = transformCoroutine(fn, info, mod.objective)
     newFunctions.push(transformed.initFn)
     newFunctions.push(...transformed.continuations)
@@ -74,7 +88,29 @@ export function coroutineTransform(
   return {
     module: { ...mod, functions: newFunctions },
     generatedTickFunctions: tickFns,
+    warnings,
+  }
+}
+
+/**
+ * Returns true if any instruction in the function requires macro processing.
+ * This includes:
+ *   - call_macro: explicit macro function invocations
+ *   - call with fn = '__raw:\x01...': builtin calls (particle, summon, etc.) with macro params
+ *   - call with fn = '__raw:<cmd>' where cmd contains '${': raw() commands with variable interpolation
+ */
+function fnContainsMacroCalls(fn: MIRFunction): boolean {
+  for (const block of fn.blocks) {
+    for (const instr of [...block.instrs, block.term]) {
+      if (instr.kind === 'call_macro') return true
+      if (instr.kind === 'call' && instr.fn.startsWith('__raw:')) {
+        const cmd = instr.fn.slice(6)
+        // \x01 sentinel: builtin with macro params; '${': raw() with variable interpolation
+        if (cmd.startsWith('\x01') || cmd.includes('${')) return true
+      }
+    }
   }
+  return false
 }
 
 // ---------------------------------------------------------------------------

package/src/optimizer/dce.ts

@@ -78,7 +78,8 @@ function recomputePreds(blocks: MIRBlock[]): MIRBlock[] {
 
 function hasSideEffects(instr: MIRInstr): boolean {
   if (instr.kind === 'call' || instr.kind === 'call_macro' ||
-    instr.kind === 'call_context' || instr.kind === 'nbt_write') return true
+    instr.kind === 'call_context' || instr.kind === 'nbt_write' ||
+    instr.kind === 'score_write') return true
   // Return field temps (__rf_) write to global return slots — not dead even if unused locally
   // Option slot temps (__opt_) write observable scoreboard state — preserve even if var unused
   const dst = getDst(instr)
@@ -104,6 +105,8 @@ function getDst(instr: MIRInstr): Temp | null {
       return instr.dst
     case 'call': case 'call_macro':
       return instr.dst
+    case 'score_read':
+      return instr.dst
     default:
       return null
   }
@@ -129,6 +132,8 @@ function getUsedTemps(instr: MIRInstr): Temp[] {
       addOp(instr.cond); break
     case 'return':
       if (instr.value) addOp(instr.value); break
+    case 'score_write':
+      addOp(instr.src); break
   }
   return temps
 }

package/src/optimizer/lir/const_imm.ts

@@ -28,7 +28,7 @@ function countSlotUses(instrs: LIRInstr[], target: string): number {
 
 function extractSlotsFromRaw(cmd: string): Slot[] {
   const slots: Slot[] = []
-  const re = /(\$[\w.]+)\s+(\S+)/g
+  const re = /(\$[\w.:]+)\s+(\S+)/g
   let m
   while ((m = re.exec(cmd)) !== null) {
     slots.push({ player: m[1], obj: m[2] })

package/src/optimizer/lir/dead_slot.ts

@@ -24,7 +24,7 @@ function slotKey(s: Slot): string {
 function extractSlotsFromRaw(cmd: string): Slot[] {
   const slots: Slot[] = []
   // Match $<player> <obj> patterns (scoreboard slot references)
-  const re = /(\$[\w.]+)\s+(\S+)/g
+  const re = /(\$[\w.:]+)\s+(\S+)/g
   let m
   while ((m = re.exec(cmd)) !== null) {
     slots.push({ player: m[1], obj: m[2] })

package/src/stdlib/timer.mcrs

@@ -1,11 +1,16 @@
 // Timer utilities with an OOP-style API.
 //
-// Timer state is stored in scoreboard-backed runtime state. Because RedScript
-// does not yet support dynamic scoreboard player/objective names for impl
-// methods, this API currently uses a single shared runtime slot.
+// Each Timer::new() call is statically allocated a unique compile-time ID
+// (0, 1, 2, ...). The compiler intercepts Timer method calls and inlines
+// them as direct scoreboard operations on per-instance slots:
+//   __timer_N_ticks, __timer_N_active  (stored in the namespace objective)
 //
-// The `_id` field is reserved for a future runtime-backed instance identifier.
-// Today it remains `0`, while persistence is shared across Timer values.
+// Restriction: Timer::new() must be called at the top level of a function,
+// not inside loops or if/else bodies (compile error enforced by TypeChecker).
+//
+// This file provides the struct definition and method stubs. The actual
+// scoreboard operations are generated by the MIR lowering pass and never
+// call these method bodies directly when the _id is statically known.
 
 struct Timer {
     _id: int,

package/src/typechecker/index.ts

@@ -138,6 +138,9 @@ export class TypeChecker {
   private scope: Map<string, ScopeSymbol> = new Map()
   // Stack for tracking @s type in different contexts
   private selfTypeStack: EntityTypeName[] = ['entity']
+  // Depth of loop/conditional nesting (for static-allocation enforcement)
+  private loopDepth = 0
+  private condDepth = 0
 
   private readonly richTextBuiltins = new Map<string, { messageIndex: number }>([
     ['say', { messageIndex: 0 }],
@@ -352,17 +355,23 @@ export class TypeChecker {
         break
       case 'if':
         this.checkExpr(stmt.cond)
+        this.condDepth++
         this.checkIfBranches(stmt)
+        this.condDepth--
         break
       case 'while':
         this.checkExpr(stmt.cond)
+        this.loopDepth++
         this.checkBlock(stmt.body)
+        this.loopDepth--
         break
       case 'for':
         if (stmt.init) this.checkStmt(stmt.init)
         this.checkExpr(stmt.cond)
         this.checkExpr(stmt.step)
+        this.loopDepth++
         this.checkBlock(stmt.body)
+        this.loopDepth--
         break
       case 'foreach':
         this.checkExpr(stmt.iterable)
@@ -375,7 +384,9 @@ export class TypeChecker {
           })
           // Push self type context for @s inside the loop
           this.pushSelfType(entityType)
+          this.loopDepth++
           this.checkBlock(stmt.body)
+          this.loopDepth--
           this.popSelfType()
         } else {
           const iterableType = this.inferType(stmt.iterable)
@@ -384,7 +395,9 @@ export class TypeChecker {
           } else {
             this.scope.set(stmt.binding, { type: { kind: 'named', name: 'void' }, mutable: true })
           }
+          this.loopDepth++
           this.checkBlock(stmt.body)
+          this.loopDepth--
         }
         break
       case 'match':
@@ -712,6 +725,19 @@ export class TypeChecker {
 
     const builtin = BUILTIN_SIGNATURES[expr.fn]
     if (builtin) {
+      if (expr.fn === 'setTimeout' || expr.fn === 'setInterval') {
+        if (this.loopDepth > 0) {
+          this.report(
+            `${expr.fn}() cannot be called inside a loop. Declare timers at the top level.`,
+            expr
+          )
+        } else if (this.condDepth > 0) {
+          this.report(
+            `${expr.fn}() cannot be called inside an if/else body. Declare timers at the top level.`,
+            expr
+          )
+        }
+      }
       this.checkFunctionCallArgs(expr.args, builtin.params, expr.fn, expr)
       return
     }
@@ -907,6 +933,19 @@ export class TypeChecker {
   }
 
   private checkStaticCallExpr(expr: Extract<Expr, { kind: 'static_call' }>): void {
+    if (expr.type === 'Timer' && expr.method === 'new') {
+      if (this.loopDepth > 0) {
+        this.report(
+          `Timer::new() cannot be called inside a loop. Declare timers at the top level.`,
+          expr
+        )
+      } else if (this.condDepth > 0) {
+        this.report(
+          `Timer::new() cannot be called inside an if/else body. Declare timers at the top level.`,
+          expr
+        )
+      }
+    }
     const method = this.implMethods.get(expr.type)?.get(expr.method)
     if (!method) {
       this.report(`Type '${expr.type}' has no static method '${expr.method}'`, expr)

package/examples/spiral.mcrs

@@ -1,43 +0,0 @@
-// ===== Simple Particle Demo =====
-// 展示: @tick, 状态管理, f-strings, 控制命令
-
-// 状态
-let counter: int = 0;
-let running: bool = false;
-
-// ===== 主循环 =====
-@tick fn demo_tick() {
-    if (!running) { return; }
-    
-    // 每 tick 增加计数器
-    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);
-    }
-    
-    // 每 20 ticks (1秒) 报告一次
-    if (counter % 20 == 0) {
-        say(f"Running for {counter} ticks");
-    }
-}
-
-// ===== 控制命令 =====
-// @keep 防止 DCE 删除
-@keep fn start() {
-    running = true;
-    counter = 0;
-    say(f"Demo started!");
-}
-
-@keep fn stop() {
-    running = false;
-    say(f"Demo stopped at {counter} ticks.");
-}
-
-@keep fn reset() {
-    running = false;
-    counter = 0;
-    say(f"Demo reset.");
-}

package/src/examples/arena.mcrs

@@ -1,44 +0,0 @@
-// PvP arena scoreboard tracker.
-// Reads the vanilla kills objective, announces the top score every 200 ticks,
-// and tells the current leader(s) directly.
-
-@tick
-fn arena_tick() {
-    let ticks: int = scoreboard_get("arena", #ticks);
-    ticks = ticks + 1;
-    scoreboard_set("arena", #ticks, ticks);
-
-    if (ticks % 200 == 0) {
-        announce_leaders();
-    }
-}
-
-fn announce_leaders() {
-    let top_kills: int = 0;
-
-    foreach (player in @a) {
-        let kills: int = scoreboard_get(player, #kills);
-        if (kills > top_kills) {
-            top_kills = kills;
-        }
-    }
-
-    if (top_kills > 0) {
-        announce("Arena update: leader check complete.");
-        title_times(@a, 10, 40, 10);
-        actionbar(@a, "Top kills updated");
-
-        foreach (player in @a) {
-            let kills: int = scoreboard_get(player, #kills);
-            if (kills == top_kills) {
-                tell(player, "You are leading the arena right now.");
-                title(player, "Arena Leader");
-                subtitle(player, "Hold the top score");
-                actionbar(player, "Stay alive to keep the lead");
-            }
-        }
-    } else {
-        announce("Arena update: no PvP kills yet.");
-        actionbar(@a, "No arena leader yet");
-    }
-}

package/src/examples/counter.mcrs

@@ -1,12 +0,0 @@
-// Tick counter that announces every 100 ticks.
-
-@tick
-fn counter_tick() {
-    let ticks = scoreboard_get("counter", #ticks);
-    ticks = ticks + 1;
-    scoreboard_set("counter", #ticks, ticks);
-
-    if (ticks % 100 == 0) {
-        say("Counter reached another 100 ticks");
-    }
-}

package/src/examples/new_features_demo.mcrs

@@ -1,193 +0,0 @@
-/**
- * RedScript New Features Demo
- * Showcasing language features added on 2026-03-12
- */
-
-// ============================================
-// 1. Type Inference
-// ============================================
-fn type_inference_demo() {
-    // No need to write `: int`, compiler infers automatically
-    let health = 100;
-    let name = "Steve";
-    let alive = true;
-    let speed = 1.5;
-    
-    // NBT suffixes can also be inferred
-    let damage = 20b;      // byte
-    let distance = 1000s;  // short
-    let bignum = 999999L;  // long
-    let precise = 3.14d;   // double
-    
-    say("Health: ${health}, Name: ${name}");
-}
-
-// ============================================
-// 2. For-Range Loops
-// ============================================
-fn for_range_demo() {
-    // Loop from 0 to 9
-    for i in 0..10 {
-        say("Count: ${i}");
-    }
-    
-    // Can be used for countdown
-    for sec in 0..5 {
-        title(@a, "Starting in ${sec}...");
-    }
-}
-
-// ============================================
-// 3. NBT Structured Params
-// ============================================
-fn nbt_params_demo() {
-    // Give item with NBT
-    give(@s, "minecraft:diamond_sword", 1, {
-        display: { Name: "Excalibur" },
-        Enchantments: [
-            { id: "minecraft:sharpness", lvl: 5 },
-            { id: "minecraft:unbreaking", lvl: 3 }
-        ]
-    });
-    
-    // Summon entity with attributes
-    summon("minecraft:zombie", @s, {
-        CustomName: "Boss Zombie",
-        Health: 100.0,
-        Attributes: [
-            { Name: "generic.max_health", Base: 100.0 }
-        ]
-    });
-}
-
-// ============================================
-// 4. Set Data Structure (Runtime Set)
-// ============================================
-fn set_demo() {
-    // Create set
-    let visited = set_new();
-    
-    // Add elements using method syntax
-    visited.add("spawn");
-    visited.add("castle");
-    visited.add("dungeon");
-    
-    // Check if exists
-    if (visited.contains("castle")) {
-        say("You've been to the castle!");
-    }
-    
-    // Remove element
-    visited.remove("spawn");
-    
-    // Clear set
-    visited.clear();
-}
-
-// ============================================
-// 5. Method Syntax Sugar
-// ============================================
-fn method_syntax_demo() {
-    let items: string[] = [];
-    
-    // obj.method(args) → method(obj, args)
-    items.push("sword");
-    items.push("shield");
-    items.push("potion");
-    
-    let count = items.len();
-    say("You have ${count} items");
-    
-    // Sets can also use method syntax
-    let tags = set_new();
-    tags.add("vip");
-    tags.add("admin");
-    
-    if (tags.contains("admin")) {
-        say("Welcome, admin!");
-    }
-}
-
-// ============================================
-// 6. #mc_name Syntax (MC Identifier Syntax)
-// ============================================
-fn mc_name_demo() {
-    // #name compiles to bare MC name (without quotes)
-    scoreboard_set(@s, #kills, 0);
-    scoreboard_add(@s, #deaths, 1);
-    
-    let score = scoreboard_get(@s, #points);
-    
-    // For tag
-    tag_add(@s, #vip);
-    
-    // For team
-    team_join(@s, #red);
-    
-    // Comparison: strings still need quotes
-    give(@s, "minecraft:diamond", 1);
-}
-
-// ============================================
-// 7. Block Comments
-// ============================================
-
-/* 
- * This is a block comment
- * Can span multiple lines
- */
-
-/**
- * This is a doc comment
- * @param player Target player
- */
-fn documented_function() {
-    say("Hello!");
-}
-
-// ============================================
-// Combined Example: Simple Game
-// ============================================
-
-struct Player {
-    score: int,
-    level: int,
-    visited: string  // set ID
-}
-
-fn init_player() {
-    let visited_set = set_new();
-    let p: Player = {
-        score: 0,
-        level: 1,
-        visited: visited_set
-    };
-    
-    // Record spawn point (using set_add since visited is a string ID)
-    set_add(p.visited, "spawn");
-    
-    scoreboard_set(@s, #score, p.score);
-    scoreboard_set(@s, #level, p.level);
-}
-
-@tick(rate=20)
-fn game_tick() {
-    // Check once per second
-    for i in 0..1 {
-        let score = scoreboard_get(@s, #score);
-        if (score >= 100) {
-            title(@s, "Level Up!");
-            scoreboard_set(@s, #level, 2);
-        }
-    }
-}
-
-fn reward_player(amount: int) {
-    // Type inference + NBT params
-    let bonus = amount * 2;
-    scoreboard_add(@s, #score, bonus);
-    
-    give(@s, "minecraft:gold_ingot", amount, {
-        display: { Name: "Reward Gold" }
-    });
-}

package/src/examples/rpg.mcrs

@@ -1,13 +0,0 @@
-import "../stdlib/math.mcrs"
-import "../stdlib/combat.mcrs"
-
-fn attack(enemy: string, base: int, bonus: int) {
-    let raw_damage = weapon_damage(base, bonus);
-    let damage = clamp(raw_damage, 1, 20);
-    apply_damage(enemy, damage);
-}
-
-@tick
-fn battle_tick() {
-    attack("goblin", 4, 2);
-}