@jhlagado/azm 0.2.2 → 0.2.3

package/dist/src/core/compile.js

@@ -26,19 +26,7 @@ export function parseNextSourceItems(lines, options = {}) {
         if (afterTopLevelEnd && !isPostEndParseAllowed(line.text)) {
             continue;
         }
-        const colonLayoutHeader = /^([A-Za-z_][A-Za-z0-9_]*):\s*\.(type|union)\s*$/.exec(stripLineComment(line.text).trim());
-        if (colonLayoutHeader) {
-            const directive = colonLayoutHeader[2] ?? 'type';
-            diagnostics.push(parseDiagnostic(line, `Use "${colonLayoutHeader[1] ?? ''} .${directive}" for layouts; colon labels mark addresses.`));
-            const endDirective = directive === 'union' ? '.endunion' : '.endtype';
-            for (index += 1; index < pendingLines.length; index += 1) {
-                if (stripLineComment(pendingLines[index].text).trim() === endDirective) {
-                    break;
-                }
-            }
-            continue;
-        }
-        const nameLeftTypeAlias = /^([A-Za-z_][A-Za-z0-9_]*)\s+\.typealias\s+(.+)$/.exec(stripLineComment(line.text).trim());
+        const nameLeftTypeAlias = /^([A-Za-z_][A-Za-z0-9_]*)(?::\s*|\s+)\.typealias\s+(.+)$/.exec(stripLineComment(line.text).trim());
         if (nameLeftTypeAlias) {
             const typeExprText = nameLeftTypeAlias[2] ?? '';
             const typeExpr = parseTypeExpr(typeExprText);
@@ -60,7 +48,7 @@ export function parseNextSourceItems(lines, options = {}) {
             diagnostics.push(parseDiagnostic(line, `Use "${typeAlias[1] ?? ''} .typealias ..." for type aliases.`));
             continue;
         }
-        const nameLeftLayoutHeader = /^([A-Za-z_][A-Za-z0-9_]*)\s+\.(type|union)\s*$/.exec(stripLineComment(line.text).trim());
+        const nameLeftLayoutHeader = /^([A-Za-z_][A-Za-z0-9_]*)(?::\s*|\s+)\.(type|union)\s*$/.exec(stripLineComment(line.text).trim());
         const prefixLayoutHeader = /^\.(type|union)\s+([A-Za-z_][A-Za-z0-9_]*)\s*$/.exec(stripLineComment(line.text).trim());
         if (prefixLayoutHeader) {
             const directive = prefixLayoutHeader[1] ?? 'type';
@@ -202,11 +190,7 @@ function evaluateConditionalExpression(line, expressionText, equates, locationDe
 }
 function recordConditionalEquate(line, equates, locationDependentEquates, directiveAliasPolicy) {
     const text = normalizeDirectiveAlias(stripLineComment(line.text), directiveAliasPolicy).trim();
-    const statement = /^(@?[A-Za-z_.$?][A-Za-z0-9_.$?]*):\s*(.+)$/.exec(text);
-    if (statement && /^\.equ\b/.test(statement[2] ?? '')) {
-        return;
-    }
-    const equ = /^([A-Za-z_.$?][A-Za-z0-9_.$?]*)\s+\.equ\s+(.+)$/.exec(text);
+    const equ = /^([A-Za-z_.$?][A-Za-z0-9_.$?]*)(?::\s*|\s+)\.equ\s+(.+)$/.exec(text);
     if (!equ) {
         return;
     }

package/dist/src/syntax/parse-line.js

@@ -14,9 +14,9 @@ export function parseLogicalLine(line, options = {}) {
         const labelName = normalizeEntryLabelName(rawLabel);
         const isEntry = rawLabel.startsWith('@');
         const statementText = labelWithStatement[2] ?? '';
-        const invalidDeclaration = parseColonDeclarationError(labelName, statementText);
-        if (invalidDeclaration) {
-            return { items: [], diagnostics: [parseError(line, invalidDeclaration)] };
+        const declaration = parseColonDeclaration(line, labelName, statementText, span);
+        if (declaration) {
+            return withLineComment(line, declaration);
         }
         const parsedStatement = parseCanonicalStatement(line, statementText, span);
         return withLineComment(line, {
@@ -254,21 +254,14 @@ function parseCanonicalStatement(line, text, span) {
     }
     return { items: [], diagnostics: [parseError(line, `unsupported source line: ${text}`)] };
 }
-function parseColonDeclarationError(name, statementText) {
-    if (/^\.equ\b/.test(statementText)) {
-        return `Use "${name} .equ ..." for constants; colon labels mark addresses.`;
-    }
-    if (/^\.enum\b/.test(statementText)) {
-        return `Use "${name} .enum ..." for enums; colon labels mark addresses.`;
-    }
-    if (/^\.typealias\b/.test(statementText)) {
-        return `Use "${name} .typealias ..." for type aliases; colon labels mark addresses.`;
-    }
-    if (/^\.type\b/.test(statementText)) {
-        return `Use "${name} .type" for layouts; colon labels mark addresses.`;
+function parseColonDeclaration(line, name, statementText, span) {
+    const equ = /^\.equ\s+(.+)$/.exec(statementText);
+    if (equ) {
+        return parseEquItem(line, name, equ[1] ?? '', span);
     }
-    if (/^\.union\b/.test(statementText)) {
-        return `Use "${name} .union" for layouts; colon labels mark addresses.`;
+    const enumDecl = /^\.enum\s+(.+)$/.exec(statementText);
+    if (enumDecl) {
+        return parseEnumItem(line, name, enumDecl[1] ?? '', span);
     }
     return undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jhlagado/azm",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "AZM assembler for the Z80 family (Node.js CLI)",
   "license": "GPL-3.0-only",
   "engines": {