Unify the z-macro syntax between the CP/M assembler and zif.

Author: davidgiven

apps/adm3atst.asm

@@ -3,7 +3,7 @@
 .label test_string
 .label BIOS
 
-.zproc start
+zproc start
     lda #<test_string
     ldx #>test_string
     ldy #BDOS_PRINTSTRING
@@ -20,7 +20,7 @@ BIOS:
     jsr $1234
 
     rts
-.zendproc
+zendproc
 
 test_string:
     .byte 26, "ADM-3A TEST - Screen cleared", 11,11, 13,10

apps/asm.c

@@ -1440,23 +1440,29 @@ static void consumeInclude()
     token = currentByte = ';';
 }
 
-static void lookupAndCall(const SymbolCallbackEntry* entries)
+static bool lookupAndCall(const SymbolCallbackEntry* entries)
 {
     for (;;)
     {
         if (strcmp(entries->string, parseBuffer) == 0)
         {
             consumeToken();
             entries->callback();
-            return;
+            return true;
         }
         entries++;
 
         if (!entries->string)
-            fatal("unknown pseudo-op");
+            return false;
     }
 }
 
+static void lookupAndCallOrFail(const SymbolCallbackEntry* entries)
+{
+    if (!lookupAndCall(entries))
+        fatal("unknown pseudo-op");
+}
+
 static void parse()
 {
     top = cpm_ram;
@@ -1469,6 +1475,11 @@ static void parse()
         {"fill", consumeDotFill},
         {"expand", consumeDotExpand},
         {"label", consumeDotLabel},
+        {"include", consumeInclude},
+        {}
+    };
+
+    static const SymbolCallbackEntry nondotEntries[] = {
         {"zproc", consumeZproc},
         {"zendproc", consumeZendproc},
         {"zloop", consumeZloop},
@@ -1479,7 +1490,6 @@ static void parse()
         {"zuntil", consumeZuntil},
         {"zif", consumeZif},
         {"zendif", consumeZendif},
-        {"include", consumeInclude},
         {}
     };
 
@@ -1497,10 +1507,15 @@ static void parse()
             case '.':
                 consumeToken();
                 expect(TOKEN_ID);
-                lookupAndCall(dotEntries);
+                lookupAndCallOrFail(dotEntries);
                 break;
 
             case TOKEN_ID:
+                /* Pseudooperations. */
+
+                if (lookupAndCall(nondotEntries))
+                    break;
+
                 /* Process instructions. */
 
                 if (tokenLength == 3)