redscript-mc 1.2.4 → 1.2.6

package/dist/codegen/structure/index.js

@@ -260,7 +260,8 @@ function compileToStructure(source, namespace, filePath, options = {}) {
     const preprocessedSource = (0, compile_1.preprocessSource)(source, { filePath });
     const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
     const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
-    const ast = options.dce ?? true ? (0, dce_1.eliminateDeadCode)(parsedAst) : parsedAst;
+    const dceResult = options.dce ?? true ? (0, dce_1.eliminateDeadCode)(parsedAst) : { program: parsedAst, warnings: [] };
+    const ast = dceResult.program;
     const ir = new lowering_1.Lowering(namespace).lower(ast);
     const stats = (0, commands_1.createEmptyOptimizationStats)();
     const optimizedIRFunctions = ir.functions.map(fn => {

package/dist/compile.js

@@ -137,7 +137,8 @@ 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 ast = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : parsedAst;
+        const dceResult = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : { program: parsedAst, warnings: [] };
+        const ast = dceResult.program;
         // Lowering
         const ir = new lowering_1.Lowering(namespace, preprocessed.ranges).lower(ast);
         // Optimization

package/dist/index.js

@@ -36,7 +36,8 @@ 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 ast = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : parsedAst;
+    const dceResult = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : { program: parsedAst, warnings: [] };
+    const ast = dceResult.program;
     // Type checking (warn mode - collect errors but don't block)
     let typeErrors;
     if (shouldTypeCheck) {
@@ -90,7 +91,7 @@ function compile(source, options = {}) {
         ast,
         ir: optimizedIR,
         typeErrors,
-        warnings: lowering.warnings,
+        warnings: [...dceResult.warnings, ...lowering.warnings],
         stats: optimizationStats,
     };
 }

package/dist/optimizer/dce.d.ts

@@ -1,4 +1,10 @@
 import type { Program } from '../ast/types';
+export interface DCEWarning {
+    message: string;
+    code: string;
+    line?: number;
+    col?: number;
+}
 export declare class DeadCodeEliminator {
     private readonly functionMap;
     private readonly reachableFunctions;
@@ -6,6 +12,7 @@ export declare class DeadCodeEliminator {
     private readonly localReads;
     private readonly localDeclIds;
     private localIdCounter;
+    readonly warnings: DCEWarning[];
     eliminate(program: Program): Program;
     private findEntryPoints;
     private markReachable;
@@ -20,4 +27,7 @@ export declare class DeadCodeEliminator {
     private transformStmt;
     private transformExpr;
 }
-export declare function eliminateDeadCode(program: Program): Program;
+export declare function eliminateDeadCode(program: Program): {
+    program: Program;
+    warnings: DCEWarning[];
+};

package/dist/optimizer/dce.js

@@ -69,6 +69,7 @@ class DeadCodeEliminator {
         this.localReads = new Set();
         this.localDeclIds = new WeakMap();
         this.localIdCounter = 0;
+        this.warnings = [];
     }
     eliminate(program) {
         this.functionMap.clear();
@@ -76,6 +77,7 @@ class DeadCodeEliminator {
         this.usedConstants.clear();
         this.localReads.clear();
         this.localIdCounter = 0;
+        this.warnings.length = 0;
         for (const fn of program.declarations) {
             this.functionMap.set(fn.name, fn);
         }
@@ -402,6 +404,13 @@ class DeadCodeEliminator {
                     }
                     return [copySpan({ ...stmt, init }, stmt)];
                 }
+                // Unused variable - emit warning
+                this.warnings.push({
+                    message: `Unused variable '${stmt.name}'`,
+                    code: 'W_UNUSED_VAR',
+                    line: stmt.span?.line,
+                    col: stmt.span?.col,
+                });
                 if (isPureExpr(init)) {
                     return [];
                 }
@@ -587,6 +596,8 @@ class DeadCodeEliminator {
 }
 exports.DeadCodeEliminator = DeadCodeEliminator;
 function eliminateDeadCode(program) {
-    return new DeadCodeEliminator().eliminate(program);
+    const eliminator = new DeadCodeEliminator();
+    const result = eliminator.eliminate(program);
+    return { program: result, warnings: eliminator.warnings };
 }
 //# sourceMappingURL=dce.js.map

package/editors/vscode/out/extension.js

@@ -1163,8 +1163,17 @@ var require_parser = __commonJS({
         this.expect("in");
         const iterable = this.parseExpr();
         this.expect(")");
+        let executeContext;
+        const execIdentKeywords = ["positioned", "rotated", "facing", "anchored", "align"];
+        if (this.check("at") || this.check("in") || this.check("ident") && execIdentKeywords.includes(this.peek().value)) {
+          let context = "";
+          while (!this.check("{") && !this.check("eof")) {
+            context += this.advance().value + " ";
+          }
+          executeContext = context.trim();
+        }
         const body = this.parseBlock();
-        return this.withLoc({ kind: "foreach", binding, iterable, body }, foreachToken);
+        return this.withLoc({ kind: "foreach", binding, iterable, body, executeContext }, foreachToken);
       }
       parseMatchStmt() {
         const matchToken = this.expect("match");
@@ -3799,7 +3808,8 @@ var require_lowering = __commonJS({
         }
         const subFnName = `${this.currentFn}/foreach_${this.foreachCounter++}`;
         const selector = this.exprToString(stmt.iterable);
-        this.builder.emitRaw(`execute as ${selector} run function ${this.namespace}:${subFnName}`);
+        const execContext = stmt.executeContext ? ` ${stmt.executeContext}` : "";
+        this.builder.emitRaw(`execute as ${selector}${execContext} run function ${this.namespace}:${subFnName}`);
         const savedBuilder = this.builder;
         const savedVarMap = new Map(this.varMap);
         const savedContext = this.currentContext;
@@ -6122,7 +6132,8 @@ var require_passes = __commonJS({
         ...block,
         instrs: block.instrs.filter((instr) => {
           if (instr.op === "assign" || instr.op === "binop" || instr.op === "cmp") {
-            const keep = readVars.has(instr.dst);
+            const isTemp = /^\$t\d+$/.test(instr.dst) || /^\$p\d+$/.test(instr.dst) || /^\$_\d+$/.test(instr.dst);
+            const keep = !isTemp || readVars.has(instr.dst);
             if (!keep)
               removed++;
             return keep;

package/editors/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "redscript-vscode",
   "displayName": "RedScript for Minecraft",
   "description": "Syntax highlighting, error diagnostics, and language support for RedScript — a compiler targeting Minecraft Java Edition",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

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

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

package/package.json

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

package/src/codegen/structure/index.ts

@@ -329,7 +329,8 @@ export function compileToStructure(
   const preprocessedSource = preprocessSource(source, { filePath })
   const tokens = new Lexer(preprocessedSource, filePath).tokenize()
   const parsedAst = new Parser(tokens, preprocessedSource, filePath).parse(namespace)
-  const ast = options.dce ?? true ? eliminateDeadCode(parsedAst) : parsedAst
+  const dceResult = options.dce ?? true ? eliminateDeadCode(parsedAst) : { program: parsedAst, warnings: [] }
+  const ast = dceResult.program
   const ir = new Lowering(namespace).lower(ast)
   const stats = createEmptyOptimizationStats()
   const optimizedIRFunctions = ir.functions.map(fn => {

package/src/compile.ts

@@ -175,7 +175,8 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
 
     // Parsing
     const parsedAst = new Parser(tokens, preprocessedSource, filePath).parse(namespace)
-    const ast = shouldRunDce ? eliminateDeadCode(parsedAst) : parsedAst
+    const dceResult = shouldRunDce ? eliminateDeadCode(parsedAst) : { program: parsedAst, warnings: [] }
+    const ast = dceResult.program
 
     // Lowering
     const ir = new Lowering(namespace, preprocessed.ranges).lower(ast)

package/src/index.ts

@@ -65,7 +65,8 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
 
   // Parsing
   const parsedAst = new Parser(tokens, preprocessedSource, filePath).parse(namespace)
-  const ast = shouldRunDce ? eliminateDeadCode(parsedAst) : parsedAst
+  const dceResult = shouldRunDce ? eliminateDeadCode(parsedAst) : { program: parsedAst, warnings: [] }
+  const ast = dceResult.program
 
   // Type checking (warn mode - collect errors but don't block)
   let typeErrors: DiagnosticError[] | undefined
@@ -129,7 +130,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     ast,
     ir: optimizedIR,
     typeErrors,
-    warnings: lowering.warnings,
+    warnings: [...dceResult.warnings, ...lowering.warnings],
     stats: optimizationStats,
   }
 }

package/src/optimizer/dce.ts

@@ -67,6 +67,13 @@ function isPureExpr(expr: Expr): boolean {
   }
 }
 
+export interface DCEWarning {
+  message: string
+  code: string
+  line?: number
+  col?: number
+}
+
 export class DeadCodeEliminator {
   private readonly functionMap = new Map<string, FnDecl>()
   private readonly reachableFunctions = new Set<string>()
@@ -74,6 +81,7 @@ export class DeadCodeEliminator {
   private readonly localReads = new Set<string>()
   private readonly localDeclIds = new WeakMap<Stmt, string>()
   private localIdCounter = 0
+  readonly warnings: DCEWarning[] = []
 
   eliminate(program: Program): Program {
     this.functionMap.clear()
@@ -81,6 +89,7 @@ export class DeadCodeEliminator {
     this.usedConstants.clear()
     this.localReads.clear()
     this.localIdCounter = 0
+    this.warnings.length = 0
 
     for (const fn of program.declarations) {
       this.functionMap.set(fn.name, fn)
@@ -429,6 +438,13 @@ export class DeadCodeEliminator {
           }
           return [copySpan({ ...stmt, init }, stmt)]
         }
+        // Unused variable - emit warning
+        this.warnings.push({
+          message: `Unused variable '${stmt.name}'`,
+          code: 'W_UNUSED_VAR',
+          line: stmt.span?.line,
+          col: stmt.span?.col,
+        })
         if (isPureExpr(init)) {
           return []
         }
@@ -614,6 +630,8 @@ export class DeadCodeEliminator {
   }
 }
 
-export function eliminateDeadCode(program: Program): Program {
-  return new DeadCodeEliminator().eliminate(program)
+export function eliminateDeadCode(program: Program): { program: Program; warnings: DCEWarning[] } {
+  const eliminator = new DeadCodeEliminator()
+  const result = eliminator.eliminate(program)
+  return { program: result, warnings: eliminator.warnings }
 }