@razdolbai/merls 1.3.0 → 1.3.1

package/dist/src/asm/parser.js

@@ -57,7 +57,8 @@ function parseStructuredLine(text, tokens) {
             text
         };
     }
-    if (token.kind === "expressionOperator" && token.lexeme === "=") {
+    if ((token.kind === "expressionOperator" && token.lexeme === "=") ||
+        (token.kind === "directive" && token.lexeme.toLowerCase() === "equ")) {
         if (label === null) {
             throw new Error("equate requires a label");
         }

package/dist/test/definition-references.test.js

@@ -107,7 +107,7 @@ async function runDefinitionReferencesTest() {
         });
         const definition = definitionResponse.result;
         strict_1.default.equal(definition.uri, mainUri);
-        strict_1.default.equal(definition.range.start.line, 69);
+        strict_1.default.equal(definition.range.start.line, 70);
         const referencesResponse = await sendRequest("textDocument/references", {
             textDocument: { uri: mainUri },
             position: positionOf(text, "GetKey  ldx"),
@@ -117,8 +117,8 @@ async function runDefinitionReferencesTest() {
         });
         const references = referencesResponse.result;
         strict_1.default.equal(Array.isArray(references), true);
-        strict_1.default.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 69), true);
         strict_1.default.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 70), true);
+        strict_1.default.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 71), true);
     }
     finally {
         child.kill();

package/dist/test/local-labels.test.js

@@ -14,30 +14,30 @@ function runLocalLabelScopeTest() {
     const source = node_fs_1.default.readFileSync(fixturePath, "utf8");
     const document = (0, document_1.parseDocument)(source);
     const scope = (0, local_labels_1.resolveLocalLabels)(document);
-    strict_1.default.deepEqual(scope.definitions.get("]loop@69"), {
+    strict_1.default.deepEqual(scope.definitions.get("]loop@70"), {
         name: "]loop",
-        line: 71,
+        line: 72,
         anchor: "GetKey",
-        qualifiedName: "]loop@69"
+        qualifiedName: "]loop@70"
     });
-    strict_1.default.deepEqual(scope.references.get("]loop@73"), {
+    strict_1.default.deepEqual(scope.references.get("]loop@74"), {
         name: "]loop",
-        line: 73,
+        line: 74,
         anchor: "GetKey",
-        qualifiedName: "]loop@69",
-        targetLine: 71
+        qualifiedName: "]loop@70",
+        targetLine: 72
     });
-    strict_1.default.deepEqual(scope.definitions.get(":err@69"), {
+    strict_1.default.deepEqual(scope.definitions.get(":err@70"), {
         name: ":err",
-        line: 82,
+        line: 83,
         anchor: "GetKey",
-        qualifiedName: ":err@69"
+        qualifiedName: ":err@70"
     });
-    strict_1.default.deepEqual(scope.references.get(":good@81"), {
+    strict_1.default.deepEqual(scope.references.get(":good@82"), {
         name: ":good",
-        line: 81,
+        line: 82,
         anchor: "GetKey",
-        qualifiedName: ":good@69",
-        targetLine: 84
+        qualifiedName: ":good@70",
+        targetLine: 85
     });
 }

package/dist/test/symbols.test.js

@@ -22,16 +22,21 @@ function runSymbolsTest() {
     strict_1.default.deepEqual(symbols.get("TEST_START"), {
         name: "TEST_START",
         kind: "label",
-        line: 31
+        line: 32
     });
     strict_1.default.deepEqual(symbols.get("dum0"), {
         name: "dum0",
         kind: "data",
-        line: 17
+        line: 18
     });
     strict_1.default.deepEqual(symbols.get("_num1"), {
         name: "_num1",
         kind: "data",
-        line: 25
+        line: 26
+    });
+    strict_1.default.deepEqual(symbols.get("MY_VAL"), {
+        name: "MY_VAL",
+        kind: "equate",
+        line: 15
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@razdolbai/merls",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Language server for Merlin-style 6502 assembly.",
   "license": "MIT",
   "type": "commonjs",

package/src/asm/parser.ts

@@ -127,7 +127,10 @@ function parseStructuredLine(text: string, tokens: readonly Token[]): ParsedLine
     };
   }
 
-  if (token.kind === "expressionOperator" && token.lexeme === "=") {
+  if (
+    (token.kind === "expressionOperator" && token.lexeme === "=") ||
+    (token.kind === "directive" && token.lexeme.toLowerCase() === "equ")
+  ) {
     if (label === null) {
       throw new Error("equate requires a label");
     }

package/test/definition-references.test.ts

@@ -132,7 +132,7 @@ export async function runDefinitionReferencesTest(): Promise<void> {
 
     const definition = definitionResponse.result as { uri: string; range: { start: { line: number } } };
     assert.equal(definition.uri, mainUri);
-    assert.equal(definition.range.start.line, 69);
+    assert.equal(definition.range.start.line, 70);
 
     const referencesResponse = await sendRequest("textDocument/references", {
       textDocument: { uri: mainUri },
@@ -144,8 +144,8 @@ export async function runDefinitionReferencesTest(): Promise<void> {
 
     const references = referencesResponse.result as Array<{ uri: string; range: { start: { line: number } } }>;
     assert.equal(Array.isArray(references), true);
-    assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 69), true);
     assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 70), true);
+    assert.equal(references.some((reference) => reference.uri === mainUri && reference.range.start.line === 71), true);
   } finally {
     child.kill();
   }

package/test/fixtures/valid/merlin32-main-6502.S

@@ -13,6 +13,7 @@ TEXT    =   $FB39
 CROUT   =   $FD8E
 DOSWARM =   $3D0
 TSTADDR =   $1000
+MY_VAL  EQU $42
 
         DUM 0
 dum0    ds  1

package/test/local-labels.test.ts

@@ -15,33 +15,33 @@ export function runLocalLabelScopeTest(): void {
   const document = parseDocument(source);
   const scope = resolveLocalLabels(document);
 
-  assert.deepEqual(scope.definitions.get("]loop@69"), {
+  assert.deepEqual(scope.definitions.get("]loop@70"), {
     name: "]loop",
-    line: 71,
+    line: 72,
     anchor: "GetKey",
-    qualifiedName: "]loop@69"
+    qualifiedName: "]loop@70"
   });
 
-  assert.deepEqual(scope.references.get("]loop@73"), {
+  assert.deepEqual(scope.references.get("]loop@74"), {
     name: "]loop",
-    line: 73,
+    line: 74,
     anchor: "GetKey",
-    qualifiedName: "]loop@69",
-    targetLine: 71
+    qualifiedName: "]loop@70",
+    targetLine: 72
   });
 
-  assert.deepEqual(scope.definitions.get(":err@69"), {
+  assert.deepEqual(scope.definitions.get(":err@70"), {
     name: ":err",
-    line: 82,
+    line: 83,
     anchor: "GetKey",
-    qualifiedName: ":err@69"
+    qualifiedName: ":err@70"
   });
 
-  assert.deepEqual(scope.references.get(":good@81"), {
+  assert.deepEqual(scope.references.get(":good@82"), {
     name: ":good",
-    line: 81,
+    line: 82,
     anchor: "GetKey",
-    qualifiedName: ":good@69",
-    targetLine: 84
+    qualifiedName: ":good@70",
+    targetLine: 85
   });
 }

package/test/symbols.test.ts

@@ -24,18 +24,24 @@ export function runSymbolsTest(): void {
   assert.deepEqual(symbols.get("TEST_START"), {
     name: "TEST_START",
     kind: "label",
-    line: 31
+    line: 32
   });
 
   assert.deepEqual(symbols.get("dum0"), {
     name: "dum0",
     kind: "data",
-    line: 17
+    line: 18
   });
 
   assert.deepEqual(symbols.get("_num1"), {
     name: "_num1",
     kind: "data",
-    line: 25
+    line: 26
+  });
+
+  assert.deepEqual(symbols.get("MY_VAL"), {
+    name: "MY_VAL",
+    kind: "equate",
+    line: 15
   });
 }