b43-asm: Terminate instructions with ; instead of |

[b43-tools.git] / assembler / scanner.l

diff --git a/assembler/scanner.l b/assembler/scanner.l
index ab4821c751659a17f274c0a3c5fcf28b91c13d1b..bb866a93d1c7d302959d1e3617274dfb8a574414 100644 (file)
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -48,13 +48,12 @@ NEWLINE             ((\r)|(\n)|(\r\n))
 
 {WS}+                  { update_lineinfo(); /* whitespace */ }
 {NEWLINE}              { cur_lineinfo.lineno++; update_lineinfo(); }
-;.*$                   { update_lineinfo(); /* comment */ }
 
 ^{WS}*"%"{WS}*arch     { update_lineinfo(); return ASM_ARCH; }
 ^{WS}*"%"{WS}*start    { update_lineinfo(); return ASM_START; }
 
-^{WS}*\.text{WS}*$                             { update_lineinfo(); return SECTION_TEXT; }
-^{WS}*\.initvals/\({IDENTIFIER}\){WS}*{NEWLINE}        { update_lineinfo(); return SECTION_IVALS; }
+^{WS}*\.text{WS}*$                     { update_lineinfo(); return SECTION_TEXT; }
+^{WS}*\.initvals/\({IDENTIFIER}\)      { update_lineinfo(); return SECTION_IVALS; }
 
 spr[0-9a-fA-F]{3,3}    { update_lineinfo(); return SPR; }
 r/([0-9]|([1-5][0-9])|(6[0-3]))        { update_lineinfo(); return GPR; }
@@ -62,6 +61,7 @@ off/[0-6]             { update_lineinfo(); return OFFR; }
 lr/[0-3]               { update_lineinfo(); return LR; }
 
 ,                      { update_lineinfo(); return COMMA; }
+;                      { update_lineinfo(); return SEMICOLON; }
 \[                     { update_lineinfo(); return BRACK_OPEN; }
 \]                     { update_lineinfo(); return BRACK_CLOSE; }
 \(                     { update_lineinfo(); return PAREN_OPEN; }
@@ -193,9 +193,6 @@ static void interpret_cppinfo(const char *str)
               min(sizeof(cur_lineinfo.file) - 1,
                   (int)(found - str)));
 
-       if (strcmp(cur_lineinfo.file, "<stdin>") == 0)
-               strcpy(cur_lineinfo.file, "Input File");
-
        return;
 error:
        fprintf(stderr, "Invalid CPP line directive:  %s\n", orig);