Merge pull request #586 from boriel/bugfix/preproc_asm_error_missing

Bugfix/preproc asm error missing

Author: boriel

src/zxbc/zxbc.py

@@ -153,7 +153,7 @@ def main(args=None, emitter=None):
 
     # Join all lines into a single string and ensures an INTRO at end of file
     asm_output = backend.emit(backend.MEMORY, optimize=OPTIONS.optimization_level > 0)
-    asm_output = arch.target.optimizer.optimize(asm_output) + "\n"  # invoke the -O3
+    asm_output = arch.target.optimizer.optimize(asm_output) + "\n"  # invoke the peephole optimizer
 
     asm_output = asm_output.split("\n")
     for i in range(len(asm_output)):

src/zxbpp/zxbasmpplex.py

@@ -74,6 +74,8 @@
     "line": "LINE",
     "require": "REQUIRE",
     "pragma": "PRAGMA",
+    "error": "ERROR",
+    "warning": "WARNING",
 }
 
 # List of token names.

src/zxbpp/zxbpp.py

@@ -17,6 +17,7 @@
 import re
 
 from dataclasses import dataclass
+from enum import Enum, unique
 
 from typing import Any
 from typing import Dict
@@ -45,6 +46,12 @@
 from src import arch
 
 
+@unique
+class PreprocMode(str, Enum):
+    BASIC = "BASIC"
+    ASM = "ASM"
+
+
 # Generated output
 OUTPUT = ""
 
@@ -143,17 +150,19 @@ def set_include_path():
     INCLUDEPATH = [os.path.join(pwd, "library"), os.path.join(pwd, "library-asm")]
 
 
-def setMode(mode: str) -> None:
+def setMode(mode: PreprocMode) -> None:
     global LEXER
 
     mode = mode.upper()
-    if mode not in ("ASM", "BASIC"):
+    if mode not in list(PreprocMode):
         raise PreprocError('Invalid mode "%s"' % mode, lineno=LEXER.lineno)
 
-    if mode == "ASM":
-        LEXER = zxbasmpplex.Lexer(defines_table=ID_TABLE)
-    else:
-        LEXER = zxbpplex.Lexer(defines_table=ID_TABLE)
+    lexers = {
+        PreprocMode.ASM: zxbasmpplex.Lexer(defines_table=ID_TABLE),
+        PreprocMode.BASIC: zxbpplex.Lexer(defines_table=ID_TABLE),
+    }
+
+    LEXER = lexers[PreprocMode(mode)]
 
 
 def search_filename(fname: str, lineno: int, local_first: bool) -> str:
@@ -862,7 +871,7 @@ def entry_point(args=None):
 
     config.init()
     init()
-    setMode("BASIC")
+    setMode(PreprocMode.BASIC)
 
     parser = argparse.ArgumentParser()
     parser.add_argument(
@@ -924,6 +933,10 @@ def entry_point(args=None):
         config.OPTIONS.stderr_filename = options.stderr
         config.OPTIONS.stderr = utils.open_file(config.OPTIONS.stderr_filename, "wt", "utf-8")
 
+    _, ext = os.path.splitext(options.input_file)
+    if ext.lower() == "asm":
+        setMode(PreprocMode.ASM)
+
     result = main([options.input_file] if options.input_file else [])
     if not global_.has_errors:  # ok?
         if options.output_file:

tests/functional/error_macro.asm

@@ -0,0 +1,4 @@
+#warning "this is a warning"
+#error "this is an error"
+nop
+

tests/functional/test_errmsg.txt

@@ -252,3 +252,7 @@ ND.Controls.bas:4: error: Invalid argument 'dirData'
 ND.Controls.bas:2: warning: [W150] Variable 'dirData' is never used
 >>> process_file('zx48k/bad_fname_err4.bas', ['-S', '-q'])
 ND.Controls.bas:2: error: sub 'Controls_LABEL' declared but not implemented
+
+>>> process_file('error_macro.asm')
+error_macro.asm:1: warning: this is a warning
+error_macro.asm:2: error: this is an error