ignore labels and comments when resolving line numbers

mlogjs · Mar 16, 2024 · 6d8762f · 6d8762f
1 parent 1d25199
commit 6d8762f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/compiler/src/instructions/InstructionBase.ts b/compiler/src/instructions/InstructionBase.ts
@@ -8,12 +8,16 @@ export class InstructionBase implements IInstruction {
   alwaysRuns = true;
 
   protected _hidden = false;
+
   public get hidden() {
     return this._hidden;
   }
   public set hidden(value) {
     this._hidden = value;
   }
+
+  ignoredByParser = false;
+
   args: (string | IValue | null)[];
 
   source?: SourceLocation;

diff --git a/compiler/src/instructions/ZeroSpaceInstruction.ts b/compiler/src/instructions/ZeroSpaceInstruction.ts
diff --git a/compiler/src/instructions/index.ts b/compiler/src/instructions/index.ts
@@ -5,5 +5,4 @@ export * from "./EndInstruction";
 export * from "./AddressResolver";
 export * from "./JumpInstruction";
 export * from "./SetCounterInstruction";
-export * from "./ZeroSpaceInstruction";
 export * from "./ControlInstructions";
diff --git a/compiler/src/macros/Asm.ts b/compiler/src/macros/Asm.ts
@@ -1,7 +1,7 @@
 import { CompilerError } from "../CompilerError";
-import { ZeroSpaceInstruction } from "../instructions";
+import { InstructionBase } from "../instructions";
 import { IInstruction, IValue } from "../types";
-import { isTemplateObjectArray } from "../utils";
+import { formatInstructionArgs, isTemplateObjectArray } from "../utils";
 import { LiteralValue } from "../values";
 import { MacroFunction } from "./Function";
 
@@ -55,7 +55,7 @@ function formatInstructions(args: (string | IValue)[]) {
     const params = [...buffer, segments[0]];
 
     if (validateInstructionArgs(params)) {
-      instructions.push(new ZeroSpaceInstruction(...params));
+      instructions.push(new AsmInstruction(...params));
       buffer = [];
     }
 
@@ -67,7 +67,7 @@ function formatInstructions(args: (string | IValue)[]) {
     for (let i = 1; i < segments.length - 1; i++) {
       const trimmed = segments[i].trim();
       if (trimmed.length == 0) continue;
-      instructions.push(new ZeroSpaceInstruction(trimmed));
+      instructions.push(new AsmInstruction(trimmed));
     }
 
     if (segments.length > 1) {
@@ -76,7 +76,7 @@ function formatInstructions(args: (string | IValue)[]) {
   }
 
   if (buffer.length > 0 && validateInstructionArgs(buffer)) {
-    instructions.push(new ZeroSpaceInstruction(...buffer));
+    instructions.push(new AsmInstruction(...buffer));
   }
 
   return instructions;
@@ -101,3 +101,18 @@ function validateInstructionArgs(args: (string | IValue)[]) {
   if (typeof last === "string") args[args.length - 1] = last.trimEnd();
   return true;
 }
+
+class AsmInstruction extends InstructionBase {
+  constructor(...args: (string | IValue)[]) {
+    super(...args);
+
+    const [first] = args;
+    if (typeof first === "string") {
+      this.ignoredByParser = /^(\s*#|\S+:)/.test(first);
+    }
+  }
+
+  toString() {
+    return formatInstructionArgs(this.args).join("");
+  }
+}