X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fscanner.l;h=bb866a93d1c7d302959d1e3617274dfb8a574414;hb=80d4431cde7dec47d2cd549ec581cc98dab67d5d;hp=346cbe6c1d81bbe402f279bdf73ab09164898b41;hpb=900539d3af0679acea61145f0e64254518d7fce7;p=b43-tools.git diff --git a/assembler/scanner.l b/assembler/scanner.l index 346cbe6..bb866a9 100644 --- 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; }