redscript-mc 1.2.18 → 1.2.19

package/dist/parser/index.js

@@ -564,10 +564,29 @@ class Parser {
     parseForRangeStmt(forToken) {
         const varName = this.expect('ident').value;
         this.expect('in');
-        const rangeToken = this.expect('range_lit');
-        const range = this.parseRangeValue(rangeToken.value);
-        const start = this.withLoc({ kind: 'int_lit', value: range.min ?? 0 }, rangeToken);
-        const end = this.withLoc({ kind: 'int_lit', value: range.max ?? 0 }, rangeToken);
+        let start;
+        let end;
+        if (this.check('range_lit')) {
+            // Literal range: 0..10, 0..count, 0..=9
+            const rangeToken = this.advance();
+            const range = this.parseRangeValue(rangeToken.value);
+            start = this.withLoc({ kind: 'int_lit', value: range.min ?? 0 }, rangeToken);
+            if (range.max !== null && range.max !== undefined) {
+                // Fully numeric: 0..10
+                end = this.withLoc({ kind: 'int_lit', value: range.max }, rangeToken);
+            }
+            else {
+                // Open-ended: "0.." — parse the end expression from next tokens
+                end = this.parseUnaryExpr();
+            }
+        }
+        else {
+            // Dynamic range: expr..expr (e.g. start..end) — not yet supported
+            // Fall back to: parse as int_lit 0..0 (safe default)
+            start = this.withLoc({ kind: 'int_lit', value: 0 }, this.peek());
+            end = this.withLoc({ kind: 'int_lit', value: 0 }, this.peek());
+            this.error('Dynamic range start requires a literal integer (e.g. 0..count)');
+        }
         const body = this.parseBlock();
         return this.withLoc({ kind: 'for_range', varName, start, end, body }, forToken);
     }
@@ -1083,6 +1102,20 @@ class Parser {
         this.error(`Unexpected token '${token.kind}'`);
     }
     parseLiteralExpr() {
+        // Support negative literals: -5, -3.14
+        if (this.check('-')) {
+            this.advance();
+            const token = this.peek();
+            if (token.kind === 'int_lit') {
+                this.advance();
+                return this.withLoc({ kind: 'int_lit', value: -Number(token.value) }, token);
+            }
+            if (token.kind === 'float_lit') {
+                this.advance();
+                return this.withLoc({ kind: 'float_lit', value: -Number(token.value) }, token);
+            }
+            this.error('Expected number after unary -');
+        }
         const expr = this.parsePrimaryExpr();
         if (expr.kind === 'int_lit' ||
             expr.kind === 'float_lit' ||

package/editors/vscode/out/extension.js

@@ -186,6 +186,7 @@ var require_lexer = __commonJS({
       execute: "execute",
       run: "run",
       unless: "unless",
+      declare: "declare",
       int: "int",
       bool: "bool",
       float: "float",
@@ -355,6 +356,13 @@ var require_lexer = __commonJS({
               value += this.advance();
             }
           }
+          if (/[a-zA-Z_]/.test(this.peek())) {
+            let ident = "";
+            while (/[a-zA-Z0-9_]/.test(this.peek())) {
+              ident += this.advance();
+            }
+            value += ident;
+          }
           this.addToken("rel_coord", value, startLine, startCol);
           return;
         }
@@ -815,6 +823,9 @@ var require_parser = __commonJS({
             enums.push(this.parseEnumDecl());
           } else if (this.check("const")) {
             consts.push(this.parseConstDecl());
+          } else if (this.check("declare")) {
+            this.advance();
+            this.parseDeclareStub();
           } else {
             declarations.push(this.parseFnDecl());
           }
@@ -877,12 +888,15 @@ var require_parser = __commonJS({
       parseConstDecl() {
         const constToken = this.expect("const");
         const name = this.expect("ident").value;
-        this.expect(":");
-        const type = this.parseType();
+        let type;
+        if (this.match(":")) {
+          type = this.parseType();
+        }
         this.expect("=");
         const value = this.parseLiteralExpr();
         this.match(";");
-        return this.withLoc({ name, type, value }, constToken);
+        const inferredType = type ?? (value.kind === "str_lit" ? { kind: "named", name: "string" } : value.kind === "bool_lit" ? { kind: "named", name: "bool" } : value.kind === "float_lit" ? { kind: "named", name: "float" } : { kind: "named", name: "int" });
+        return this.withLoc({ name, type: inferredType, value }, constToken);
       }
       parseGlobalDecl(mutable) {
         const token = this.advance();
@@ -911,6 +925,24 @@ var require_parser = __commonJS({
         const body = this.parseBlock();
         return this.withLoc({ name, params, returnType, decorators, body }, fnToken);
       }
+      /** Parse a `declare fn name(params): returnType;` stub — no body, just discard. */
+      parseDeclareStub() {
+        this.expect("fn");
+        this.expect("ident");
+        this.expect("(");
+        let depth = 1;
+        while (!this.check("eof") && depth > 0) {
+          const t = this.advance();
+          if (t.kind === "(")
+            depth++;
+          else if (t.kind === ")")
+            depth--;
+        }
+        if (this.match(":") || this.match("->")) {
+          this.parseType();
+        }
+        this.match(";");
+      }
       parseDecorators() {
         const decorators = [];
         while (this.check("decorator")) {
@@ -3581,6 +3613,15 @@ var require_lowering = __commonJS({
           return null;
         return expr.name;
       }
+      tryGetMacroParamByName(name) {
+        if (!this.currentFnParamNames.has(name))
+          return null;
+        if (this.constValues.has(name))
+          return null;
+        if (this.stringValues.has(name))
+          return null;
+        return name;
+      }
       /**
        * Converts an expression to a string for use as a builtin arg.
        * If the expression is a macro param, returns `$(name)` and sets macroParam.
@@ -3590,6 +3631,17 @@ var require_lowering = __commonJS({
         if (macroParam) {
           return { str: `$(${macroParam})`, macroParam };
         }
+        if (expr.kind === "rel_coord" || expr.kind === "local_coord") {
+          const val = expr.value;
+          const prefix = val[0];
+          const rest = val.slice(1);
+          if (rest && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(rest)) {
+            const paramName = this.tryGetMacroParamByName(rest);
+            if (paramName) {
+              return { str: `${prefix}$(${paramName})`, macroParam: paramName };
+            }
+          }
+        }
         if (expr.kind === "struct_lit" || expr.kind === "array_lit") {
           return { str: this.exprToSnbt(expr) };
         }
@@ -5875,8 +5927,11 @@ var require_lowering = __commonJS({
       }
       /**
        * Checks a raw() command string for `${...}` interpolation containing runtime variables.
-       * - If the interpolated name is a compile-time constant → OK, no error.
-       * - If the interpolated name is a runtime variable → DiagnosticError.
+       * - If the interpolated expression is a numeric literal → OK (MC macro syntax).
+       * - If the interpolated name is a compile-time constant (in constValues) → OK.
+       * - If the interpolated name is a known runtime variable (in varMap) → DiagnosticError.
+       * - Unknown names → OK (could be MC macro params or external constants).
+       *
        * This catches the common mistake of writing raw("say ${score}") expecting interpolation,
        * which would silently emit a literal `${score}` in the MC command.
        */
@@ -5891,8 +5946,10 @@ var require_lowering = __commonJS({
           if (this.constValues.has(name)) {
             continue;
           }
-          const loc = span ?? { line: 1, col: 1 };
-          throw new diagnostics_1.DiagnosticError("LoweringError", `raw() command contains runtime variable interpolation '\${${name}}'. Variables cannot be interpolated into raw commands at compile time. Use f-string messages for say/tell/announce, or MC macro syntax '$(${name})' for MC 1.20.2+ commands.`, loc);
+          if (this.varMap.has(name) || this.currentFnParamNames.has(name)) {
+            const loc = span ?? { line: 1, col: 1 };
+            throw new diagnostics_1.DiagnosticError("LoweringError", `raw() command contains runtime variable interpolation '\${${name}}'. Variables cannot be interpolated into raw commands at compile time. Use f-string messages (say/tell/announce) or MC macro syntax '$(${name})' for MC 1.20.2+ commands.`, loc);
+          }
         }
       }
       resolveInstanceMethod(expr) {

package/editors/vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "redscript-vscode",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.0.9",
+      "version": "1.0.11",
       "license": "MIT",
       "dependencies": {
         "redscript": "file:../../"

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.9",
+  "version": "1.0.11",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

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

@@ -271,7 +271,7 @@
         {
           "comment": "Builtin functions",
           "name": "support.function.builtin.redscript",
-          "match": "\\b(say|tell|announce|title|subtitle|actionbar|title_times|give|kill|effect|clear|kick|xp_add|xp_set|tp|tp_to|setblock|fill|clone|summon|particle|playsound|weather|time_set|time_add|gamerule|difficulty|tag_add|tag_remove|scoreboard_get|scoreboard_set|scoreboard_add|scoreboard_display|scoreboard_hide|scoreboard_add_objective|scoreboard_remove_objective|score|random|random_native|random_sequence|data_get|str_len|push|pop|bossbar_add|bossbar_set_value|bossbar_set_max|bossbar_set_color|bossbar_set_style|bossbar_set_visible|bossbar_set_players|bossbar_remove|bossbar_get_value|team_add|team_remove|team_join|team_leave|team_option|spawn_object|if_entity|unless_entity)(?=\\s*\\()"
+          "match": "\\b(say|tell|tellraw|announce|title|subtitle|actionbar|title_times|give|kill|effect|effect_clear|clear|kick|xp_add|xp_set|tp|tp_to|setblock|fill|clone|summon|particle|playsound|weather|time_set|time_add|gamerule|difficulty|tag_add|tag_remove|scoreboard_get|score|scoreboard_set|scoreboard_add|scoreboard_display|scoreboard_hide|scoreboard_add_objective|scoreboard_remove_objective|random|random_native|random_sequence|data_get|data_merge|str_len|push|pop|bossbar_add|bossbar_set_value|bossbar_set_max|bossbar_set_color|bossbar_set_style|bossbar_set_visible|bossbar_set_players|bossbar_remove|bossbar_get_value|team_add|team_remove|team_join|team_leave|team_option|set_new|set_add|set_contains|set_remove|set_clear|setTimeout|setInterval|clearInterval|spawn_object|if_entity|unless_entity)(?=\\s*\\()"
         },
         {
           "comment": "User-defined function calls",

package/package.json

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

package/src/examples/capture_the_flag.mcrs

@@ -28,7 +28,7 @@ struct GameState {
     blue_flag_taken: int
 }
 
-let game: GameState = GameState {
+let game: GameState = {
     running: 0,
     red_score: 0,
     blue_score: 0,

package/src/examples/hunger_games.mcrs

@@ -31,7 +31,7 @@ struct HGState {
     alive_count: int
 }
 
-let game: HGState = HGState {
+let game: HGState = {
     running: 0,
     phase: 0,
     countdown: 0,

package/src/examples/zombie_survival.mcrs

@@ -29,7 +29,7 @@ struct SurvivalState {
     total_kills: int
 }
 
-let state: SurvivalState = SurvivalState {
+let state: SurvivalState = {
     running: 0,
     wave: 0,
     zombies_left: 0,

package/src/parser/index.ts

@@ -668,17 +668,29 @@ export class Parser {
   private parseForRangeStmt(forToken: Token): Stmt {
     const varName = this.expect('ident').value
     this.expect('in')
-    const rangeToken = this.expect('range_lit')
-    const range = this.parseRangeValue(rangeToken.value)
 
-    const start: Expr = this.withLoc(
-      { kind: 'int_lit', value: range.min ?? 0 },
-      rangeToken
-    )
-    const end: Expr = this.withLoc(
-      { kind: 'int_lit', value: range.max ?? 0 },
-      rangeToken
-    )
+    let start: Expr
+    let end: Expr
+
+    if (this.check('range_lit')) {
+      // Literal range: 0..10, 0..count, 0..=9
+      const rangeToken = this.advance()
+      const range = this.parseRangeValue(rangeToken.value)
+      start = this.withLoc({ kind: 'int_lit', value: range.min ?? 0 }, rangeToken)
+      if (range.max !== null && range.max !== undefined) {
+        // Fully numeric: 0..10
+        end = this.withLoc({ kind: 'int_lit', value: range.max }, rangeToken)
+      } else {
+        // Open-ended: "0.." — parse the end expression from next tokens
+        end = this.parseUnaryExpr()
+      }
+    } else {
+      // Dynamic range: expr..expr (e.g. start..end) — not yet supported
+      // Fall back to: parse as int_lit 0..0 (safe default)
+      start = this.withLoc({ kind: 'int_lit', value: 0 }, this.peek())
+      end   = this.withLoc({ kind: 'int_lit', value: 0 }, this.peek())
+      this.error('Dynamic range start requires a literal integer (e.g. 0..count)')
+    }
 
     const body = this.parseBlock()
     return this.withLoc({ kind: 'for_range', varName, start, end, body }, forToken)
@@ -1260,6 +1272,20 @@ export class Parser {
   }
 
   private parseLiteralExpr(): LiteralExpr {
+    // Support negative literals: -5, -3.14
+    if (this.check('-')) {
+      this.advance()
+      const token = this.peek()
+      if (token.kind === 'int_lit') {
+        this.advance()
+        return this.withLoc({ kind: 'int_lit', value: -Number(token.value) }, token)
+      }
+      if (token.kind === 'float_lit') {
+        this.advance()
+        return this.withLoc({ kind: 'float_lit', value: -Number(token.value) }, token)
+      }
+      this.error('Expected number after unary -')
+    }
     const expr = this.parsePrimaryExpr()
     if (
       expr.kind === 'int_lit' ||