redscript-mc 1.2.19 → 1.2.21

package/dist/__tests__/compile-all.test.d.ts

@@ -2,7 +2,8 @@
  * Compile-all smoke test
  *
  * Finds every .mcrs file in the repo (excluding declaration files and node_modules)
- * and verifies that each one compiles without throwing an error.
+ * and verifies that each one compiles without errors via the CLI (which handles
+ * `import` statements, unlike the bare `compile()` function).
  *
  * This catches regressions where a language change breaks existing source files.
  */

package/dist/__tests__/compile-all.test.js

@@ -3,7 +3,8 @@
  * Compile-all smoke test
  *
  * Finds every .mcrs file in the repo (excluding declaration files and node_modules)
- * and verifies that each one compiles without throwing an error.
+ * and verifies that each one compiles without errors via the CLI (which handles
+ * `import` statements, unlike the bare `compile()` function).
  *
  * This catches regressions where a language change breaks existing source files.
  */
@@ -43,8 +44,15 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const compile_1 = require("../compile");
+const child_process_1 = require("child_process");
+const os = __importStar(require("os"));
 const REPO_ROOT = path.resolve(__dirname, '../../');
+const CLI = path.join(REPO_ROOT, 'dist', 'cli.js');
+// Ensure dist/cli.js exists — build first if not (e.g. in CI)
+if (!fs.existsSync(CLI)) {
+    console.log('[compile-all] dist/cli.js not found, running npm run build...');
+    (0, child_process_1.execSync)('npm run build', { cwd: REPO_ROOT, stdio: 'inherit' });
+}
 /** Patterns to skip */
 const SKIP_GLOBS = [
     'node_modules',
@@ -72,18 +80,28 @@ function findMcrsFiles(dir) {
     return results;
 }
 const mcrsFiles = findMcrsFiles(REPO_ROOT);
-describe('compile-all: every .mcrs file should compile without errors', () => {
+const TMP_OUT = path.join(os.tmpdir(), 'redscript-compile-all');
+describe('compile-all: every .mcrs file should compile without errors (CLI)', () => {
     test('found at least one .mcrs file', () => {
         expect(mcrsFiles.length).toBeGreaterThan(0);
     });
     for (const filePath of mcrsFiles) {
         const label = path.relative(REPO_ROOT, filePath);
         test(label, () => {
-            const source = fs.readFileSync(filePath, 'utf8');
-            // Should not throw
-            expect(() => {
-                (0, compile_1.compile)(source, { namespace: 'smoke_test', optimize: false });
-            }).not.toThrow();
+            const outDir = path.join(TMP_OUT, label.replace(/[^a-zA-Z0-9]/g, '_'));
+            let stdout = '';
+            let stderr = '';
+            try {
+                const result = (0, child_process_1.execSync)(`node "${CLI}" compile "${filePath}" -o "${outDir}"`, { encoding: 'utf8', stdio: 'pipe' });
+                stdout = result;
+            }
+            catch (err) {
+                stdout = err.stdout ?? '';
+                stderr = err.stderr ?? '';
+                const output = (stdout + stderr).trim();
+                // Fail with the compiler error message
+                throw new Error(`Compile failed for ${label}:\n${output}`);
+            }
         });
     }
 });

package/dist/cli.js

@@ -51,6 +51,8 @@ const repl_1 = require("./repl");
 const metadata_1 = require("./builtins/metadata");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const https = __importStar(require("https"));
+const child_process_1 = require("child_process");
 // Parse command line arguments
 const args = process.argv.slice(2);
 function printUsage() {
@@ -74,6 +76,7 @@ Commands:
   generate-dts  Generate builtin function declaration file (builtins.d.mcrs)
   repl          Start an interactive RedScript REPL
   version       Print the RedScript version
+  upgrade       Upgrade to the latest version (npm install -g redscript-mc@latest)
 
 Options:
   -o, --output <path>    Output directory or file path, depending on target
@@ -92,15 +95,90 @@ Targets:
   structure Generate a Minecraft structure .nbt file with command blocks
 `);
 }
-function printVersion() {
+function getLocalVersion() {
     const packagePath = path.join(__dirname, '..', 'package.json');
     try {
         const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf-8'));
-        console.log(`RedScript v${pkg.version}`);
+        return pkg.version ?? '0.0.0';
     }
     catch {
-        console.log('RedScript v0.1.0');
+        return '0.0.0';
+    }
+}
+function printVersion() {
+    console.log(`RedScript v${getLocalVersion()}`);
+}
+/** Fetch latest version from npm registry (non-blocking, best-effort). */
+function fetchLatestVersion() {
+    return new Promise(resolve => {
+        const req = https.get('https://registry.npmjs.org/redscript-mc/latest', { timeout: 3000 }, res => {
+            let data = '';
+            res.on('data', chunk => { data += chunk; });
+            res.on('end', () => {
+                try {
+                    const json = JSON.parse(data);
+                    resolve(json.version ?? null);
+                }
+                catch {
+                    resolve(null);
+                }
+            });
+        });
+        req.on('error', () => resolve(null));
+        req.on('timeout', () => { req.destroy(); resolve(null); });
+    });
+}
+/** Compare semver strings. Returns true if b > a. */
+function isNewer(current, latest) {
+    const parse = (v) => v.replace(/^v/, '').split('.').map(Number);
+    const [ca, cb, cc] = parse(current);
+    const [la, lb, lc] = parse(latest);
+    if (la !== ca)
+        return la > ca;
+    if (lb !== cb)
+        return lb > cb;
+    return lc > cc;
+}
+/**
+ * Check for a newer version and print a notice if one exists.
+ * Runs in background — does NOT block normal CLI operation.
+ */
+async function checkForUpdates(silent = false) {
+    const current = getLocalVersion();
+    const latest = await fetchLatestVersion();
+    if (latest && isNewer(current, latest)) {
+        console.log(`\n💡 New version available: v${current} → v${latest}`);
+        console.log(`   Run: redscript upgrade\n`);
     }
+    else if (!silent && latest) {
+        // Only print when explicitly running 'version' or 'upgrade'
+        // No output for normal commands — keep startup noise-free
+    }
+}
+/** Run npm install -g to upgrade to latest. */
+function upgradeCommand() {
+    const current = getLocalVersion();
+    console.log(`Current version: v${current}`);
+    console.log('Checking latest version...');
+    fetchLatestVersion().then(latest => {
+        if (!latest) {
+            console.error('Could not fetch latest version from npm.');
+            process.exit(1);
+        }
+        if (!isNewer(current, latest)) {
+            console.log(`✅ Already up to date (v${current})`);
+            return;
+        }
+        console.log(`Upgrading v${current} → v${latest}...`);
+        try {
+            (0, child_process_1.execSync)('npm install -g redscript-mc@latest', { stdio: 'inherit' });
+            console.log(`✅ Upgraded to v${latest}`);
+        }
+        catch {
+            console.error('Upgrade failed. Try manually: npm install -g redscript-mc@latest');
+            process.exit(1);
+        }
+    });
 }
 function parseArgs(args) {
     const result = { dce: true };
@@ -163,7 +241,13 @@ function printWarnings(warnings) {
         return;
     }
     for (const warning of warnings) {
-        console.error(`Warning [${warning.code}]: ${warning.message}`);
+        const loc = warning.filePath
+            ? `${warning.filePath}:${warning.line ?? '?'}`
+            : warning.line != null
+                ? `line ${warning.line}`
+                : null;
+        const locStr = loc ? ` (${loc})` : '';
+        console.error(`Warning [${warning.code}]: ${warning.message}${locStr}`);
     }
 }
 function formatReduction(before, after) {
@@ -369,6 +453,12 @@ async function main() {
         printUsage();
         process.exit(parsed.help ? 0 : 1);
     }
+    // Background update check — non-blocking, only shows notice if newer version exists
+    // Skip for repl/upgrade/version to avoid double-printing
+    const noCheckCmds = new Set(['upgrade', 'update', 'version', 'repl']);
+    if (!noCheckCmds.has(parsed.command ?? '')) {
+        checkForUpdates().catch(() => { });
+    }
     switch (parsed.command) {
         case 'compile':
             if (!parsed.file) {
@@ -429,6 +519,11 @@ async function main() {
             break;
         case 'version':
             printVersion();
+            await checkForUpdates();
+            break;
+        case 'upgrade':
+        case 'update':
+            upgradeCommand();
             break;
         default:
             console.error(`Error: Unknown command '${parsed.command}'`);

package/dist/compile.d.ts

@@ -30,6 +30,14 @@ export interface PreprocessedSource {
     source: string;
     ranges: SourceRange[];
 }
+/**
+ * Resolve a combined-source line number back to the original file and line.
+ * Returns { filePath, line } if a mapping is found, otherwise returns the input unchanged.
+ */
+export declare function resolveSourceLine(combinedLine: number, ranges: SourceRange[], fallbackFile?: string): {
+    filePath?: string;
+    line: number;
+};
 interface PreprocessOptions {
     filePath?: string;
     seen?: Set<string>;

package/dist/compile.js

@@ -38,6 +38,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSourceLine = resolveSourceLine;
 exports.preprocessSourceWithMetadata = preprocessSourceWithMetadata;
 exports.preprocessSource = preprocessSource;
 exports.compile = compile;
@@ -51,6 +52,19 @@ const passes_1 = require("./optimizer/passes");
 const dce_1 = require("./optimizer/dce");
 const mcfunction_1 = require("./codegen/mcfunction");
 const diagnostics_1 = require("./diagnostics");
+/**
+ * Resolve a combined-source line number back to the original file and line.
+ * Returns { filePath, line } if a mapping is found, otherwise returns the input unchanged.
+ */
+function resolveSourceLine(combinedLine, ranges, fallbackFile) {
+    for (const range of ranges) {
+        if (combinedLine >= range.startLine && combinedLine <= range.endLine) {
+            const localLine = combinedLine - range.startLine + 1;
+            return { filePath: range.filePath, line: localLine };
+        }
+    }
+    return { filePath: fallbackFile, line: combinedLine };
+}
 const IMPORT_RE = /^\s*import\s+"([^"]+)"\s*;?\s*$/;
 function countLines(source) {
     return source === '' ? 0 : source.split('\n').length;

package/dist/index.js

@@ -38,7 +38,7 @@ function compile(source, options = {}) {
     const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
     // Parsing
     const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
-    const dceResult = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : { program: parsedAst, warnings: [] };
+    const dceResult = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst, preprocessed.ranges) : { program: parsedAst, warnings: [] };
     const ast = dceResult.program;
     // Type checking (warn mode - collect errors but don't block)
     let typeErrors;

package/dist/optimizer/dce.d.ts

@@ -4,6 +4,7 @@ export interface DCEWarning {
     code: string;
     line?: number;
     col?: number;
+    filePath?: string;
 }
 export declare class DeadCodeEliminator {
     private readonly functionMap;
@@ -27,7 +28,7 @@ export declare class DeadCodeEliminator {
     private transformStmt;
     private transformExpr;
 }
-export declare function eliminateDeadCode(program: Program): {
+export declare function eliminateDeadCode(program: Program, sourceRanges?: import('../compile').SourceRange[]): {
     program: Program;
     warnings: DCEWarning[];
 };

package/dist/optimizer/dce.js

@@ -604,9 +604,20 @@ class DeadCodeEliminator {
     }
 }
 exports.DeadCodeEliminator = DeadCodeEliminator;
-function eliminateDeadCode(program) {
+function eliminateDeadCode(program, sourceRanges) {
     const eliminator = new DeadCodeEliminator();
     const result = eliminator.eliminate(program);
-    return { program: result, warnings: eliminator.warnings };
+    let warnings = eliminator.warnings;
+    // Resolve combined-source line numbers back to original file + line
+    if (sourceRanges && sourceRanges.length > 0) {
+        const { resolveSourceLine } = require('../compile');
+        warnings = warnings.map(w => {
+            if (w.line == null)
+                return w;
+            const resolved = resolveSourceLine(w.line, sourceRanges);
+            return { ...w, line: resolved.line, filePath: resolved.filePath ?? w.filePath };
+        });
+    }
+    return { program: result, warnings };
 }
 //# sourceMappingURL=dce.js.map

package/editors/vscode/out/extension.js

@@ -1193,10 +1193,22 @@ var require_parser = __commonJS({
       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")) {
+          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 !== void 0) {
+            end = this.withLoc({ kind: "int_lit", value: range.max }, rangeToken);
+          } else {
+            end = this.parseUnaryExpr();
+          }
+        } else {
+          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);
       }
@@ -1656,6 +1668,19 @@ var require_parser = __commonJS({
         this.error(`Unexpected token '${token.kind}'`);
       }
       parseLiteralExpr() {
+        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" || expr.kind === "bool_lit" || expr.kind === "str_lit") {
           return expr;

package/editors/vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "redscript-vscode",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.0.11",
+      "version": "1.0.12",
       "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.11",
+  "version": "1.0.12",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

package/package.json

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

package/src/__tests__/compile-all.test.ts

@@ -2,16 +2,25 @@
  * Compile-all smoke test
  *
  * Finds every .mcrs file in the repo (excluding declaration files and node_modules)
- * and verifies that each one compiles without throwing an error.
+ * and verifies that each one compiles without errors via the CLI (which handles
+ * `import` statements, unlike the bare `compile()` function).
  *
  * This catches regressions where a language change breaks existing source files.
  */
 
 import * as fs from 'fs'
 import * as path from 'path'
-import { compile } from '../compile'
+import { execSync } from 'child_process'
+import * as os from 'os'
 
 const REPO_ROOT = path.resolve(__dirname, '../../')
+const CLI = path.join(REPO_ROOT, 'dist', 'cli.js')
+
+// Ensure dist/cli.js exists — build first if not (e.g. in CI)
+if (!fs.existsSync(CLI)) {
+  console.log('[compile-all] dist/cli.js not found, running npm run build...')
+  execSync('npm run build', { cwd: REPO_ROOT, stdio: 'inherit' })
+}
 
 /** Patterns to skip */
 const SKIP_GLOBS = [
@@ -41,8 +50,9 @@ function findMcrsFiles(dir: string): string[] {
 }
 
 const mcrsFiles = findMcrsFiles(REPO_ROOT)
+const TMP_OUT = path.join(os.tmpdir(), 'redscript-compile-all')
 
-describe('compile-all: every .mcrs file should compile without errors', () => {
+describe('compile-all: every .mcrs file should compile without errors (CLI)', () => {
   test('found at least one .mcrs file', () => {
     expect(mcrsFiles.length).toBeGreaterThan(0)
   })
@@ -50,11 +60,22 @@ describe('compile-all: every .mcrs file should compile without errors', () => {
   for (const filePath of mcrsFiles) {
     const label = path.relative(REPO_ROOT, filePath)
     test(label, () => {
-      const source = fs.readFileSync(filePath, 'utf8')
-      // Should not throw
-      expect(() => {
-        compile(source, { namespace: 'smoke_test', optimize: false })
-      }).not.toThrow()
+      const outDir = path.join(TMP_OUT, label.replace(/[^a-zA-Z0-9]/g, '_'))
+      let stdout = ''
+      let stderr = ''
+      try {
+        const result = execSync(
+          `node "${CLI}" compile "${filePath}" -o "${outDir}"`,
+          { encoding: 'utf8', stdio: 'pipe' }
+        )
+        stdout = result
+      } catch (err: any) {
+        stdout = err.stdout ?? ''
+        stderr = err.stderr ?? ''
+        const output = (stdout + stderr).trim()
+        // Fail with the compiler error message
+        throw new Error(`Compile failed for ${label}:\n${output}`)
+      }
     })
   }
 })

package/src/cli.ts

@@ -18,6 +18,8 @@ import { generateDts } from './builtins/metadata'
 import type { OptimizationStats } from './optimizer/commands'
 import * as fs from 'fs'
 import * as path from 'path'
+import * as https from 'https'
+import { execSync } from 'child_process'
 
 // Parse command line arguments
 const args = process.argv.slice(2)
@@ -43,6 +45,7 @@ Commands:
   generate-dts  Generate builtin function declaration file (builtins.d.mcrs)
   repl          Start an interactive RedScript REPL
   version       Print the RedScript version
+  upgrade       Upgrade to the latest version (npm install -g redscript-mc@latest)
 
 Options:
   -o, --output <path>    Output directory or file path, depending on target
@@ -62,16 +65,96 @@ Targets:
 `)
 }
 
-function printVersion(): void {
+function getLocalVersion(): string {
   const packagePath = path.join(__dirname, '..', 'package.json')
   try {
     const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf-8'))
-    console.log(`RedScript v${pkg.version}`)
+    return pkg.version ?? '0.0.0'
   } catch {
-    console.log('RedScript v0.1.0')
+    return '0.0.0'
+  }
+}
+
+function printVersion(): void {
+  console.log(`RedScript v${getLocalVersion()}`)
+}
+
+/** Fetch latest version from npm registry (non-blocking, best-effort). */
+function fetchLatestVersion(): Promise<string | null> {
+  return new Promise(resolve => {
+    const req = https.get(
+      'https://registry.npmjs.org/redscript-mc/latest',
+      { timeout: 3000 },
+      res => {
+        let data = ''
+        res.on('data', chunk => { data += chunk })
+        res.on('end', () => {
+          try {
+            const json = JSON.parse(data)
+            resolve(json.version ?? null)
+          } catch {
+            resolve(null)
+          }
+        })
+      }
+    )
+    req.on('error', () => resolve(null))
+    req.on('timeout', () => { req.destroy(); resolve(null) })
+  })
+}
+
+/** Compare semver strings. Returns true if b > a. */
+function isNewer(current: string, latest: string): boolean {
+  const parse = (v: string) => v.replace(/^v/, '').split('.').map(Number)
+  const [ca, cb, cc] = parse(current)
+  const [la, lb, lc] = parse(latest)
+  if (la !== ca) return la > ca
+  if (lb !== cb) return lb > cb
+  return lc > cc
+}
+
+/**
+ * Check for a newer version and print a notice if one exists.
+ * Runs in background — does NOT block normal CLI operation.
+ */
+async function checkForUpdates(silent = false): Promise<void> {
+  const current = getLocalVersion()
+  const latest = await fetchLatestVersion()
+  if (latest && isNewer(current, latest)) {
+    console.log(`\n💡 New version available: v${current} → v${latest}`)
+    console.log(`   Run: redscript upgrade\n`)
+  } else if (!silent && latest) {
+    // Only print when explicitly running 'version' or 'upgrade'
+    // No output for normal commands — keep startup noise-free
   }
 }
 
+/** Run npm install -g to upgrade to latest. */
+function upgradeCommand(): void {
+  const current = getLocalVersion()
+  console.log(`Current version: v${current}`)
+  console.log('Checking latest version...')
+
+  fetchLatestVersion().then(latest => {
+    if (!latest) {
+      console.error('Could not fetch latest version from npm.')
+      process.exit(1)
+    }
+    if (!isNewer(current, latest)) {
+      console.log(`✅ Already up to date (v${current})`)
+      return
+    }
+    console.log(`Upgrading v${current} → v${latest}...`)
+    try {
+      execSync('npm install -g redscript-mc@latest', { stdio: 'inherit' })
+      console.log(`✅ Upgraded to v${latest}`)
+    } catch {
+      console.error('Upgrade failed. Try manually: npm install -g redscript-mc@latest')
+      process.exit(1)
+    }
+  })
+}
+
 function parseArgs(args: string[]): {
   command?: string
   file?: string
@@ -134,13 +217,19 @@ function deriveNamespace(filePath: string): string {
   return basename.toLowerCase().replace(/[^a-z0-9]/g, '_')
 }
 
-function printWarnings(warnings: Array<{ code: string; message: string }> | undefined): void {
+function printWarnings(warnings: Array<{ code: string; message: string; line?: number; col?: number; filePath?: string }> | undefined): void {
   if (!warnings || warnings.length === 0) {
     return
   }
 
   for (const warning of warnings) {
-    console.error(`Warning [${warning.code}]: ${warning.message}`)
+    const loc = warning.filePath
+      ? `${warning.filePath}:${warning.line ?? '?'}`
+      : warning.line != null
+        ? `line ${warning.line}`
+        : null
+    const locStr = loc ? ` (${loc})` : ''
+    console.error(`Warning [${warning.code}]: ${warning.message}${locStr}`)
   }
 }
 
@@ -378,6 +467,13 @@ async function main(): Promise<void> {
     process.exit(parsed.help ? 0 : 1)
   }
 
+  // Background update check — non-blocking, only shows notice if newer version exists
+  // Skip for repl/upgrade/version to avoid double-printing
+  const noCheckCmds = new Set(['upgrade', 'update', 'version', 'repl'])
+  if (!noCheckCmds.has(parsed.command ?? '')) {
+    checkForUpdates().catch(() => { /* ignore */ })
+  }
+
   switch (parsed.command) {
     case 'compile':
       if (!parsed.file) {
@@ -458,6 +554,12 @@ async function main(): Promise<void> {
 
     case 'version':
       printVersion()
+      await checkForUpdates()
+      break
+
+    case 'upgrade':
+    case 'update':
+      upgradeCommand()
       break
 
     default:

package/src/compile.ts

@@ -52,6 +52,24 @@ export interface PreprocessedSource {
   ranges: SourceRange[]
 }
 
+/**
+ * Resolve a combined-source line number back to the original file and line.
+ * Returns { filePath, line } if a mapping is found, otherwise returns the input unchanged.
+ */
+export function resolveSourceLine(
+  combinedLine: number,
+  ranges: SourceRange[],
+  fallbackFile?: string
+): { filePath?: string; line: number } {
+  for (const range of ranges) {
+    if (combinedLine >= range.startLine && combinedLine <= range.endLine) {
+      const localLine = combinedLine - range.startLine + 1
+      return { filePath: range.filePath, line: localLine }
+    }
+  }
+  return { filePath: fallbackFile, line: combinedLine }
+}
+
 const IMPORT_RE = /^\s*import\s+"([^"]+)"\s*;?\s*$/
 
 interface PreprocessOptions {

package/src/examples/hunger_games.mcrs

@@ -204,7 +204,7 @@ fn check_border_damage() {
     // 需要检查玩家是否在边界外
     foreach (p in @a) {
         // 简化：使用 execute positioned
-        let dist: int = 0;  // 需要计算距离中心的距离
+        let _dist: int = 0;  // TODO: calculate distance from center
         // 如果超出边界，造成伤害
         // effect(p, "minecraft:wither", 1, 0);
     }

package/src/examples/zombie_survival.mcrs

@@ -1,8 +1,8 @@
 // ============================================
-// Zombie Survival - 僵尸生存模式
+// Zombie Survival - Zombie Survival Mode
 // ============================================
-// 场景：玩家在竞技场中心抵御一波波僵尸
-// 每波结束后可以购买装备升级
+// Scenario: Players defend against waves of zombies in the arena center
+// Players can purchase equipment upgrades between waves
 // Scenario: Survive zombie waves, buy upgrades between rounds
 // ============================================
 
@@ -12,19 +12,19 @@ import "../stdlib/inventory.mcrs"
 import "../stdlib/bossbar.mcrs"
 import "../stdlib/particles.mcrs"
 
-// ===== 配置 =====
+// ===== Configuration =====
 const ARENA_X: int = 0;
 const ARENA_Y: int = 64;
 const ARENA_Z: int = 0;
 const ARENA_RADIUS: int = 30;
-const WAVE_DELAY: int = 200;  // 10秒准备时间
+const WAVE_DELAY: int = 200;  // 10-second preparation time
 
-// ===== 游戏状态 =====
+// ===== Game State =====
 struct SurvivalState {
     running: int,
     wave: int,
     zombies_left: int,
-    phase: int,         // 0=准备, 1=战斗
+    phase: int,         // 0=prep, 1=combat
     prep_timer: int,
     total_kills: int
 }
@@ -38,33 +38,33 @@ let state: SurvivalState = {
     total_kills: 0
 };
 
-// ===== 玩家数据 =====
-// 金币记分板: zs_coins
-// 击杀数: zs_kills
+// ===== Player Data =====
+// Coin scoreboard: zs_coins
+// Kill count: zs_kills
 
-// ===== 初始化 =====
+// ===== Initialization =====
 @load
 fn init() {
     scoreboard_add_objective("zs_coins", "dummy");
     scoreboard_add_objective("zs_kills", "dummy");
     scoreboard_add_objective("zs_display", "dummy");
     
-    // 显示记分板
+    // Display scoreboard
     scoreboard_display("sidebar", "zs_display");
     
     set_night();
     disable_mob_griefing();
     
-    announce("§4[僵尸生存] §f已加载！输入 /trigger start 开始");
+    announce("§4[Zombie Survival] §fLoaded! Type /trigger start to begin");
 }
 
-// ===== 开始游戏 =====
+// ===== Start Game =====
 fn start_game() {
     state.running = 1;
     state.wave = 0;
     state.total_kills = 0;
     
-    // 初始化玩家
+    // Initialize players
     foreach (p in @a) {
         scoreboard_set(p, "zs_coins", 0);
         scoreboard_set(p, "zs_kills", 0);
@@ -74,74 +74,74 @@ fn start_game() {
         tp(p, ARENA_X, ARENA_Y, ARENA_Z);
     }
     
-    // 创建 bossbar
-    create_progress_bar("zs_wave", "§c僵尸剩余", 10);
+    // Create bossbar
+    create_progress_bar("zs_wave", "§cZombies Remaining", 10);
     
-    title(@a, "§4僵尸生存");
-    subtitle(@a, "§7准备战斗...");
+    title(@a, "§4Zombie Survival");
+    subtitle(@a, "§7Prepare for battle...");
     
-    // 开始第一波
+    // Start first wave
     start_prep_phase();
 }
 
-// ===== 阶段控制 =====
+// ===== Phase Control =====
 fn start_prep_phase() {
     state.phase = 0;
     state.prep_timer = WAVE_DELAY;
     state.wave = state.wave + 1;
     
-    announce("§4[僵尸生存] §e第 " + state.wave + " 波即将来袭！");
-    announce("§7准备时间 10 秒...");
+    announce("§4[Zombie Survival] §eWave " + state.wave + " incoming!");
+    announce("§7Preparation time: 10 seconds...");
     
-    // 商店提示
+    // Shop hint
     if (state.wave > 1) {
-        announce("§a[商店] §f输入 /trigger buy 购买装备");
+        announce("§a[Shop] §fType /trigger buy to purchase equipment");
     }
 }
 
 fn start_combat_phase() {
     state.phase = 1;
     
-    // 计算僵尸数量 (每波增加)
+    // Calculate zombie count (increases each wave)
     let zombie_count: int = 3 + (state.wave * 2);
     state.zombies_left = zombie_count;
     
-    // 更新 bossbar
+    // Update bossbar
     bossbar_set_max("zs_wave", zombie_count);
     bossbar_set_value("zs_wave", zombie_count);
     
-    title(@a, "§c第 " + state.wave + " 波");
+    title(@a, "§cWave " + state.wave);
     
-    // 生成僵尸
+    // Spawn zombies
     spawn_zombies(zombie_count);
 }
 
 fn spawn_zombies(count: int) {
     for i in 0..count {
-        // 在竞技场边缘随机生成
-        let angle: int = i * 30;  // 分散生成
+        // Spawn randomly at arena edge
+        let _angle: int = i * 30;  // spread spawning
         let spawn_x: int = ARENA_X + (ARENA_RADIUS - 5);
         let spawn_z: int = ARENA_Z;
         
-        // 根据波数增加僵尸强度
+        // Increase zombie difficulty based on wave number
         if (state.wave < 3) {
             summon("minecraft:zombie", spawn_x, ARENA_Y, spawn_z);
         } else {
             if (state.wave < 5) {
-                // 穿盔甲的僵尸
+                // Armored zombies
                 summon("minecraft:zombie", spawn_x, ARENA_Y, spawn_z, 
                     {ArmorItems: [{}, {}, {id: "iron_chestplate", Count: 1}, {}]});
             } else {
-                // 快速僵尸
+                // Fast zombies
                 summon("minecraft:husk", spawn_x, ARENA_Y, spawn_z);
             }
         }
     }
     
-    announce("§c" + count + " 只僵尸出现了！");
+    announce("§c" + count + " zombies have appeared!");
 }
 
-// ===== 每 tick =====
+// ===== Every Tick =====
 @tick
 fn game_tick() {
     if (state.running == 0) {
@@ -149,10 +149,10 @@ fn game_tick() {
     }
     
     if (state.phase == 0) {
-        // 准备阶段
+        // Preparation phase
         prep_tick();
     } else {
-        // 战斗阶段
+        // Combat phase
         combat_tick();
     }
     
@@ -162,15 +162,15 @@ fn game_tick() {
 fn prep_tick() {
     state.prep_timer = state.prep_timer - 1;
     
-    // 倒计时提示
+    // Countdown hints
     if (state.prep_timer == 100) {
-        actionbar(@a, "§e5 秒...");
+        actionbar(@a, "§e5 seconds...");
     }
     if (state.prep_timer == 60) {
-        actionbar(@a, "§e3 秒...");
+        actionbar(@a, "§e3 seconds...");
     }
     if (state.prep_timer == 20) {
-        actionbar(@a, "§c1 秒...");
+        actionbar(@a, "§c1 second...");
     }
     
     if (state.prep_timer <= 0) {
@@ -179,20 +179,20 @@ fn prep_tick() {
 }
 
 fn combat_tick() {
-    // 检查僵尸数量
+    // Check zombie count
     let zombies: int = count_entities(@e[type=zombie, distance=..50]);
     let husks: int = count_entities(@e[type=husk, distance=..50]);
     state.zombies_left = zombies + husks;
     
-    // 更新 bossbar
+    // Update bossbar
     update_bar("zs_wave", state.zombies_left);
     
-    // 检查波次完成
+    // Check wave completion
     if (state.zombies_left <= 0) {
         wave_complete();
     }
     
-    // 检查玩家存活
+    // Check player survival
     let alive: int = count_entities(@a[gamemode=survival]);
     if (alive <= 0) {
         game_over();
@@ -200,17 +200,17 @@ fn combat_tick() {
 }
 
 fn wave_complete() {
-    announce("§4[僵尸生存] §a第 " + state.wave + " 波完成！");
+    announce("§4[Zombie Survival] §aWave " + state.wave + " complete!");
     
-    // 奖励金币
+    // Reward coins
     let reward: int = 50 + (state.wave * 25);
     foreach (p in @a) {
         scoreboard_add(p, "zs_coins", reward);
         happy(p);
     }
-    announce("§6+" + reward + " 金币");
+    announce("§6+" + reward + " coins");
     
-    // 检查特殊波
+    // Check special wave
     if (state.wave == 10) {
         victory();
         return;
@@ -219,65 +219,65 @@ fn wave_complete() {
     start_prep_phase();
 }
 
-// ===== 商店系统 =====
+// ===== Shop System =====
 fn buy_item(player: selector, item_id: int) {
     let coins: int = scoreboard_get(player, "zs_coins");
     
     if (item_id == 1) {
-        // 铁剑 - 100 金币
+        // Iron sword - 100 coins
         if (coins >= 100) {
             scoreboard_add(player, "zs_coins", -100);
             give(player, "minecraft:iron_sword", 1);
-            tell(player, "§a购买成功：铁剑");
+            tell(player, "§aPurchased: Iron Sword");
         } else {
-            tell(player, "§c金币不足！需要 100");
+            tell(player, "§cNot enough coins! Need 100");
         }
     }
     
     if (item_id == 2) {
-        // 铁甲 - 200 金币
+        // Iron armor - 200 coins
         if (coins >= 200) {
             scoreboard_add(player, "zs_coins", -200);
             give(player, "minecraft:iron_chestplate", 1);
             give(player, "minecraft:iron_leggings", 1);
             give(player, "minecraft:iron_boots", 1);
-            tell(player, "§a购买成功：铁甲套装");
+            tell(player, "§aPurchased: Iron Armor Set");
         } else {
-            tell(player, "§c金币不足！需要 200");
+            tell(player, "§cNot enough coins! Need 200");
         }
     }
     
     if (item_id == 3) {
-        // 弓箭 - 150 金币
+        // Bow and arrows - 150 coins
         if (coins >= 150) {
             scoreboard_add(player, "zs_coins", -150);
             give(player, "minecraft:bow", 1);
             give(player, "minecraft:arrow", 32);
-            tell(player, "§a购买成功：弓 + 32 箭");
+            tell(player, "§aPurchased: Bow + 32 Arrows");
         } else {
-            tell(player, "§c金币不足！需要 150");
+            tell(player, "§cNot enough coins! Need 150");
         }
     }
     
     if (item_id == 4) {
-        // 金苹果 - 75 金币
+        // Golden apple - 75 coins
         if (coins >= 75) {
             scoreboard_add(player, "zs_coins", -75);
             give(player, "minecraft:golden_apple", 2);
-            tell(player, "§a购买成功：金苹果 x2");
+            tell(player, "§aPurchased: Golden Apple x2");
         } else {
-            tell(player, "§c金币不足！需要 75");
+            tell(player, "§cNot enough coins! Need 75");
         }
     }
 }
 
-// ===== 结束 =====
+// ===== End =====
 fn victory() {
     state.running = 0;
     
-    title(@a, "§6胜利！");
-    subtitle(@a, "§a你们生存了 10 波！");
-    announce("§4[僵尸生存] §6恭喜！完成全部 10 波！");
+    title(@a, "§6Victory!");
+    subtitle(@a, "§aYou survived 10 waves!");
+    announce("§4[Zombie Survival] §6Congratulations! Completed all 10 waves!");
     
     foreach (p in @a) {
         totem_effect(p);
@@ -290,11 +290,11 @@ fn victory() {
 fn game_over() {
     state.running = 0;
     
-    title(@a, "§c游戏结束");
-    subtitle(@a, "§7生存了 " + state.wave + " 波");
-    announce("§4[僵尸生存] §c全员阵亡！最高波数：" + state.wave);
+    title(@a, "§cGame Over");
+    subtitle(@a, "§7Survived " + state.wave + " waves");
+    announce("§4[Zombie Survival] §cAll players eliminated! Highest wave: " + state.wave);
     
-    // 清理僵尸
+    // Clean up zombies
     kill(@e[type=zombie]);
     kill(@e[type=husk]);
     
@@ -307,8 +307,8 @@ fn update_scoreboard() {
 }
 
 fn count_entities(sel: selector) -> int {
-    // 使用 execute store 计算实体数量
+    // Use execute store to count entities
     let count: int = 0;
-    // 实际实现需要 execute store
+    // Actual implementation requires execute store
     return count;
 }

package/src/index.ts

@@ -68,7 +68,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
 
   // Parsing
   const parsedAst = new Parser(tokens, preprocessedSource, filePath).parse(namespace)
-  const dceResult = shouldRunDce ? eliminateDeadCode(parsedAst) : { program: parsedAst, warnings: [] }
+  const dceResult = shouldRunDce ? eliminateDeadCode(parsedAst, preprocessed.ranges) : { program: parsedAst, warnings: [] }
   const ast = dceResult.program
 
   // Type checking (warn mode - collect errors but don't block)

package/src/optimizer/dce.ts

@@ -72,6 +72,7 @@ export interface DCEWarning {
   code: string
   line?: number
   col?: number
+  filePath?: string
 }
 
 export class DeadCodeEliminator {
@@ -639,8 +640,23 @@ export class DeadCodeEliminator {
   }
 }
 
-export function eliminateDeadCode(program: Program): { program: Program; warnings: DCEWarning[] } {
+export function eliminateDeadCode(
+  program: Program,
+  sourceRanges?: import('../compile').SourceRange[]
+): { program: Program; warnings: DCEWarning[] } {
   const eliminator = new DeadCodeEliminator()
   const result = eliminator.eliminate(program)
-  return { program: result, warnings: eliminator.warnings }
+  let warnings = eliminator.warnings
+
+  // Resolve combined-source line numbers back to original file + line
+  if (sourceRanges && sourceRanges.length > 0) {
+    const { resolveSourceLine } = require('../compile') as typeof import('../compile')
+    warnings = warnings.map(w => {
+      if (w.line == null) return w
+      const resolved = resolveSourceLine(w.line, sourceRanges)
+      return { ...w, line: resolved.line, filePath: resolved.filePath ?? w.filePath }
+    })
+  }
+
+  return { program: result, warnings }
 }