b43-asm: Allow terminating lines with |

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

diff --git a/assembler/scanner.l b/assembler/scanner.l
index 34559c67c15e56cb6d60035369747b969b59c79f..1fa83d564b7e95183da999039edecb5b15ba954c 100644 (file)
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -53,8 +53,8 @@ NEWLINE               ((\r)|(\n)|(\r\n))
 ^{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; }
@@ -143,9 +143,6 @@ shm32                       { update_lineinfo(); return IVAL_SHM32; }
 0x[0-9a-fA-F]+         { update_lineinfo(); return HEXNUM; }
 -?[0-9]+               { update_lineinfo(); return DECNUM; }
 
-bcm43xx_newworld       { update_lineinfo(); return ARCH_NEWWORLD; }
-bcm43xx_oldworld       { update_lineinfo(); return ARCH_OLDWORLD; }
-
 {IDENTIFIER}:          { update_lineinfo(); return LABEL; }
 {IDENTIFIER}           { update_lineinfo(); return IDENT; }
 
@@ -196,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);