Remove errx and errors.hpp (#1737)

2025-11-20 18:22:07 +00:00 · 2025-07-09 11:04:23 -04:00
parent 9acba4b412
commit 5e43ece578
179 changed files with 366 additions and 393 deletions
--- a/test/asm/align-large-ofs.err
+++ b/test/asm/align-large-ofs.err
@@ -1,3 +1,3 @@
 error: align-large-ofs.asm(2):
    The absolute alignment offset (2) must be less than alignment size (2)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/align-large.err
+++ b/test/asm/align-large.err
@@ -2,4 +2,4 @@ error: align-large.asm(1):
    Alignment must be between 0 and 16, not 17
 error: align-large.asm(2):
    Alignment must be between 0 and 16, not 17
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/align-offset.err
+++ b/test/asm/align-offset.err
@@ -2,4 +2,4 @@ error: align-offset.asm(4):
    The absolute alignment offset (18) must be less than alignment size (16)
 error: align-offset.asm(6):
    The absolute alignment offset (20) must be less than alignment size (16)
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/align-pc-outside-section.err
+++ b/test/asm/align-pc-outside-section.err
@@ -1,3 +1,3 @@
 error: align-pc-outside-section.asm(1):
    Cannot output data outside of a SECTION
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/align-unattainable.err
+++ b/test/asm/align-unattainable.err
@@ -1,3 +1,3 @@
 error: align-unattainable.asm(3):
    Section "X"'s alignment cannot be attained in WRAM0
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/anon-label-bad.err
+++ b/test/asm/anon-label-bad.err
@@ -8,4 +8,4 @@ error: anon-label-bad.asm(10):
    syntax error, unexpected anonymous label, expecting symbol or label or local label
 error: anon-label-bad.asm(22):
    syntax error, unexpected ::
-error: Assembly aborted (5 errors)!
+Assembly aborted with 5 errors!
--- a/test/asm/assert-nosect-bank.err
+++ b/test/asm/assert-nosect-bank.err
@@ -1,3 +1,3 @@
 error: assert-nosect-bank.asm(1):
    PC has no bank outside of a section
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/assert@-no-sect.err
+++ b/test/asm/assert@-no-sect.err
@@ -1,3 +1,3 @@
 error: assert@-no-sect.asm(1):
    PC has no value outside of a section
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/bank.err
+++ b/test/asm/bank.err
@@ -20,4 +20,4 @@ error: bank.asm(22) -> bank.asm::def_sect(8):
    Expected constant expression: "Label_u12"'s bank is not known
 error: bank.asm(26):
    BANK argument must be a label
-error: Assembly aborted (11 errors)!
+Assembly aborted with 11 errors!
--- a/test/asm/block-comment-termination-error.err
+++ b/test/asm/block-comment-termination-error.err
@@ -2,4 +2,4 @@ error: block-comment-termination-error.asm(1):
    Unterminated block comment
 error: block-comment-termination-error.asm(1):
    syntax error, unexpected end of buffer
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/bracketed-macro-args.err
+++ b/test/asm/bracketed-macro-args.err
@@ -10,4 +10,4 @@ error: bracketed-macro-args.asm(33) -> bracketed-macro-args.asm::bad(30):
    Macro argument '\<2>' not defined
 error: bracketed-macro-args.asm(39) -> bracketed-macro-args.asm::toolong(36):
    Bracketed symbol "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" does not exist
-error: Assembly aborted (6 errors)!
+Assembly aborted with 6 errors!
--- a/test/asm/bracketed-symbols.err
+++ b/test/asm/bracketed-symbols.err
@@ -4,4 +4,4 @@ error: bracketed-symbols.asm(20):
    "Label" does not have a constant value
 error: bracketed-symbols.asm(21):
    PC does not have a constant value; the current section is not fixed
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/builtin-overwrite.err
+++ b/test/asm/builtin-overwrite.err
@@ -54,4 +54,4 @@ error: builtin-overwrite.asm(37) -> builtin-overwrite.asm::tickle(29):
    Built-in symbol '__ISO_8601_UTC__' cannot be redefined
 error: builtin-overwrite.asm(37) -> builtin-overwrite.asm::tickle(30):
    Built-in symbol '__ISO_8601_UTC__' cannot be redefined
-error: Assembly aborted (28 errors)!
+Assembly aborted with 28 errors!
--- a/test/asm/builtin-reserved.err
+++ b/test/asm/builtin-reserved.err
@@ -30,4 +30,4 @@ error: builtin-reserved.asm(29):
    '.' is reserved for a built-in symbol
 error: builtin-reserved.asm(32):
    "." has no value outside of a label scope
-error: Assembly aborted (16 errors)!
+Assembly aborted with 16 errors!
--- a/test/asm/character-escape-at-end.err
+++ b/test/asm/character-escape-at-end.err
@@ -2,4 +2,4 @@ error: character-escape-at-end.asm(1):
    Illegal character escape at end of input
 error: character-escape-at-end.asm(1):
    Unterminated string
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/character-escapes.err
+++ b/test/asm/character-escapes.err
@@ -4,4 +4,4 @@ error: character-escapes.asm(10) -> character-escapes.asm::m(7):
    Invalid character in bracketed macro argument '\'
 error: character-escapes.asm(10) -> character-escapes.asm::m(8):
    Invalid character in bracketed macro argument '\t'
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/charmap-empty.err
+++ b/test/asm/charmap-empty.err
@@ -2,4 +2,4 @@ error: charmap-empty.asm(1):
    Cannot map an empty string
 error: charmap-empty.asm(2):
    syntax error, unexpected end of line
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/charmap-inheritance.err
+++ b/test/asm/charmap-inheritance.err
@@ -1,3 +1,3 @@
 error: charmap-inheritance.asm(26):
    Base charmap 'eggs' doesn't exist
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/charsize.err
+++ b/test/asm/charsize.err
@@ -6,4 +6,4 @@ error: charsize.asm(19):
    CHARSIZE: No character mapping for "abcdef"
 error: charsize.asm(20):
    CHARSIZE: No character mapping for "é"
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/charval.err
+++ b/test/asm/charval.err
@@ -8,4 +8,4 @@ warning: charval.asm(22): [-Wbuiltin-args]
    CHARVAL: Index starts at 0
 warning: charval.asm(23): [-Wbuiltin-args]
    CHARVAL: Index 10 is past the end of the character mapping
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/code-after-endm-endr-endc.err
+++ b/test/asm/code-after-endm-endr-endc.err
@@ -12,4 +12,4 @@ error: code-after-endm-endr-endc.asm(23):
    syntax error, unexpected PRINTLN, expecting end of line
 error: code-after-endm-endr-endc.asm(25):
    syntax error, unexpected PRINTLN, expecting end of line or end of buffer
-error: Assembly aborted (7 errors)!
+Assembly aborted with 7 errors!
--- a/test/asm/command-line-symbols.err
+++ b/test/asm/command-line-symbols.err
@@ -1,4 +1,4 @@
 error: command-line-symbols.asm(3):
    'FOO' already defined at <command-line>
    (should it be {interpolated} to define its contents "hello"?)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/compound-assignment.err
+++ b/test/asm/compound-assignment.err
@@ -1,3 +1,3 @@
 error: compound-assignment.asm(35):
    Expected constant expression: 'UnDeFiNeD' is not constant at assembly time
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/const-and.err
+++ b/test/asm/const-and.err
@@ -6,4 +6,4 @@ error: const-and.asm(17):
    Expected constant expression: PC is not constant at assembly time
 error: const-and.asm(20):
    Expected constant expression: 'Floating' is not constant at assembly time
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/const-not.err
+++ b/test/asm/const-not.err
@@ -1,3 +1,3 @@
 error: const-not.asm(3):
    Assertion failed
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/const-zero.err
+++ b/test/asm/const-zero.err
@@ -1,3 +1,3 @@
 error: const-zero.asm(21) -> const-zero.asm::test_or(14):
    Expected constant expression: PC is not constant at assembly time
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/data-in-ram.err
+++ b/test/asm/data-in-ram.err
@@ -2,4 +2,4 @@ error: data-in-ram.asm(2):
    Section 'code' cannot contain code or data (not ROM0 or ROMX)
 error: data-in-ram.asm(4):
    Section 'data' cannot contain code or data (not ROM0 or ROMX)
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/def-scoped.err
+++ b/test/asm/def-scoped.err
@@ -4,4 +4,4 @@ error: def-scoped.asm(13):
    syntax error, unexpected local label, expecting symbol
 error: def-scoped.asm(16):
    syntax error, unexpected local label, expecting symbol
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/def.err
+++ b/test/asm/def.err
@@ -8,4 +8,4 @@ error: def.asm(38):
 error: def.asm(42):
    'name' already defined at def.asm(40)
    (should it be {interpolated} to define its contents "mac2"?)
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/diff-marks.err
+++ b/test/asm/diff-marks.err
@@ -2,4 +2,4 @@ error: diff-marks.asm(2):
    syntax error, unexpected - at the beginning of the line (is it a leftover diff mark?)
 error: diff-marks.asm(3):
    syntax error, unexpected + at the beginning of the line (is it a leftover diff mark?)
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/double-purge.err
+++ b/test/asm/double-purge.err
@@ -1,3 +1,3 @@
 error: double-purge.asm(3):
    'n' was already purged
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/ds-bad.err
+++ b/test/asm/ds-bad.err
@@ -2,4 +2,4 @@ error: ds-bad.asm(3):
    Expected constant expression: 'unknown' is not constant at assembly time
 warning: ds-bad.asm(4): [-Wtruncation]
    Expression must be 8-bit; use LOW() to force 8-bit
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/empty-raw-identifier.err
+++ b/test/asm/empty-raw-identifier.err
@@ -2,4 +2,4 @@ error: empty-raw-identifier.asm(5) -> empty-raw-identifier.asm::macro(3):
    Invalid character in bracketed macro argument '?'
 error: empty-raw-identifier.asm(5) -> empty-raw-identifier.asm::macro(3):
    Empty raw symbol in bracketed macro argument
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/endsection-in-load.err
+++ b/test/asm/endsection-in-load.err
@@ -2,4 +2,4 @@ warning: endsection-in-load.asm(3): [-Wunterminated-load]
    `LOAD` block without `ENDL` terminated by `ENDSECTION`
 error: endsection-in-load.asm(4):
    Found `ENDL` outside of a `LOAD` block
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/endsection.err
+++ b/test/asm/endsection.err
@@ -1,3 +1,3 @@
 error: endsection.asm(4):
    Cannot output data outside of a SECTION
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/error-limit.err
+++ b/test/asm/error-limit.err
@@ -1,3 +1,3 @@
 error: error-limit.asm(2):
    'x' already defined at error-limit.asm(1)
-error: The maximum of 1 error was reached (configure with "-X/--max-errors"); assembly aborted!
+Assembly aborted after the maximum of 1 error! (configure with '-X/--max-errors')
--- a/test/asm/error-recovery.err
+++ b/test/asm/error-recovery.err
@@ -6,4 +6,4 @@ error: error-recovery.asm(5) -> error-recovery.asm::REPT~2(7):
    syntax error, unexpected symbol
 error: error-recovery.asm(5) -> error-recovery.asm::REPT~3(7):
    syntax error, unexpected symbol
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/expand-empty-string.err
+++ b/test/asm/expand-empty-string.err
@@ -1,3 +1,3 @@
 error: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
    syntax error, unexpected number
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/export.err
+++ b/test/asm/export.err
@@ -1,3 +1,3 @@
 error: export.asm(18):
    syntax error, unexpected EQUS
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/ff00+c-bad.err
+++ b/test/asm/ff00+c-bad.err
@@ -4,4 +4,4 @@ error: ff00+c-bad.asm(9):
    Expected constant expression: 'xyz' is not constant at assembly time
 error: ff00+c-bad.asm(9):
    Base value must be equal to $FF00 for $FF00+C
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/fixed-oob.err
+++ b/test/asm/fixed-oob.err
@@ -12,4 +12,4 @@ error: fixed-oob.asm(13):
    Section "OAM"'s fixed address $0cab is outside of range [$fe00; $fe9f]
 error: fixed-oob.asm(15):
    Section "HRAM"'s fixed address $0bad is outside of range [$ff80; $fffe]
-error: Assembly aborted (7 errors)!
+Assembly aborted with 7 errors!
--- a/test/asm/fixed-point-precision.err
+++ b/test/asm/fixed-point-precision.err
@@ -2,4 +2,4 @@ error: fixed-point-precision.asm(22):
    Fixed-point constant precision must be between 1 and 31
 error: fixed-point-precision.asm(23):
    Fixed-point constant precision 0 invalid, defaulting to 16
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/for-loop-variable.err
+++ b/test/asm/for-loop-variable.err
@@ -1,3 +1,3 @@
 error: for-loop-variable.asm(12):
    'y' already defined as constant at for-loop-variable.asm(8)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/format-truncation.err
+++ b/test/asm/format-truncation.err
@@ -2,4 +2,4 @@ error: format-truncation.asm(9):
    Fractional width 260 too long, limiting to 255
 error: format-truncation.asm(15):
    Fractional width 260 too long, limiting to 255
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/fragment-align.err
+++ b/test/asm/fragment-align.err
@@ -1,3 +1,3 @@
 error: fragment-align.asm(25):
    Section is misaligned ($0004 bytes into the section, expected ALIGN[2, 0], got ALIGN[2, 1])
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/garbage_char.err
+++ b/test/asm/garbage_char.err
@@ -1,3 +1,3 @@
 error: garbage_char.asm(1):
    Unknown character 0xFF
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/garbage_sequence.err
+++ b/test/asm/garbage_sequence.err
@@ -8,4 +8,4 @@ error: garbage_sequence.asm(3):
    Unknown character '#'
 error: garbage_sequence.asm(3):
    Unknown characters '#', '?', '?'
-error: Assembly aborted (5 errors)!
+Assembly aborted with 5 errors!
--- a/test/asm/impossible-bank.err
+++ b/test/asm/impossible-bank.err
@@ -1,3 +1,3 @@
 error: impossible-bank.asm(1):
    BANK only allowed for ROMX, WRAMX, SRAM, or VRAM sections
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/incbin-empty-bad.err
+++ b/test/asm/incbin-empty-bad.err
@@ -1,3 +1,3 @@
 error: incbin-empty-bad.asm(3):
    Specified range in INCBIN file 'empty.bin' is out of bounds (0 + 1 > 0)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/incbin-end-0.err
+++ b/test/asm/incbin-end-0.err
@@ -1,3 +1,3 @@
 error: incbin-end-0.asm(1):
    Cannot output data outside of a SECTION
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/incbin-end-bad.err
+++ b/test/asm/incbin-end-bad.err
@@ -1,3 +1,3 @@
 error: incbin-end-bad.asm(3):
    Specified range in INCBIN file 'data.bin' is out of bounds (123 + 1 > 123)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/interpolation-overflow.err
+++ b/test/asm/interpolation-overflow.err
@@ -7,4 +7,4 @@ error: interpolation-overflow.asm(4):
    '\1' cannot be used outside of a macro
 error: interpolation-overflow.asm(4):
    syntax error, unexpected number
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/interpolation.err
+++ b/test/asm/interpolation.err
@@ -6,4 +6,4 @@ error: interpolation.asm(29):
    Interpolated symbol "foo" is not a numeric or string symbol
 error: interpolation.asm(32):
    Interpolated symbol "xor" is a reserved keyword; add a '#' prefix to use it as a raw symbol
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/invalid-alignment.err
+++ b/test/asm/invalid-alignment.err
@@ -12,4 +12,4 @@ error: invalid-alignment.asm(21):
    Section "e"'s fixed address doesn't match its alignment
 error: invalid-alignment.asm(23):
    Section "f"'s fixed address doesn't match its alignment
-error: Assembly aborted (7 errors)!
+Assembly aborted with 7 errors!
--- a/test/asm/invalid-bank.err
+++ b/test/asm/invalid-bank.err
@@ -1,3 +1,3 @@
 error: invalid-bank.asm(1):
    VRAM bank value $0002 out of range ($0000 to $0001)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/invalid-empty-macro-arg.err
+++ b/test/asm/invalid-empty-macro-arg.err
@@ -1,3 +1,3 @@
 error: invalid-empty-macro-arg.asm(1):
    Empty bracketed macro argument
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/invalid-format.err
+++ b/test/asm/invalid-format.err
@@ -28,4 +28,4 @@ error: invalid-format.asm(17):
    Formatting type 'd' with fractional width
 error: invalid-format.asm(18):
    Formatting type 'd' with fractional precision
-error: Assembly aborted (15 errors)!
+Assembly aborted with 15 errors!
--- a/test/asm/invalid-instructions.err
+++ b/test/asm/invalid-instructions.err
@@ -32,4 +32,4 @@ error: invalid-instructions.asm(20):
    syntax error, unexpected af
 error: invalid-instructions.asm(21):
    syntax error, unexpected af
-error: Assembly aborted (16 errors)!
+Assembly aborted with 16 errors!
--- a/test/asm/invalid-jr.err
+++ b/test/asm/invalid-jr.err
@@ -1,3 +1,3 @@
 error: invalid-jr.asm(3):
    JR target must be between -128 and 127 bytes away, not -258; use JP instead
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/invalid-macro-arg-character.err
+++ b/test/asm/invalid-macro-arg-character.err
@@ -2,4 +2,4 @@ error: invalid-macro-arg-character.asm(1):
    Invalid character in bracketed macro argument '!'
 error: invalid-macro-arg-character.asm(1):
    syntax error, unexpected >
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/invalid-macro-arg-symbol.err
+++ b/test/asm/invalid-macro-arg-symbol.err
@@ -1,3 +1,3 @@
 error: invalid-macro-arg-symbol.asm(1):
    Bracketed symbol "foo" does not exist
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/invalid-numbers.err
+++ b/test/asm/invalid-numbers.err
@@ -22,4 +22,4 @@ error: invalid-numbers.asm(16):
    Invalid fixed-point constant, no significant digits after 'q'
 error: invalid-numbers.asm(19):
    Fixed-point constant precision must be between 1 and 31
-error: Assembly aborted (7 errors)!
+Assembly aborted with 7 errors!
--- a/test/asm/invalid-opt.err
+++ b/test/asm/invalid-opt.err
@@ -36,4 +36,4 @@ error: invalid-opt.asm(18):
    syntax error, unexpected end of line, expecting string
 error: invalid-opt.asm(19):
    No entries in the option stack
-error: Assembly aborted (19 errors)!
+Assembly aborted with 19 errors!
--- a/test/asm/invalid-union.err
+++ b/test/asm/invalid-union.err
@@ -6,4 +6,4 @@ error: invalid-union.asm(3):
    UNIONs must be inside a SECTION
 error: invalid-union.asm(7):
    Unterminated UNION construct
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/invalid-utf-8-strings.err
+++ b/test/asm/invalid-utf-8-strings.err
@@ -58,4 +58,4 @@ error: invalid-utf-8-strings.asm(54):
    STRSUB: Incomplete UTF-8 character
 error: invalid-utf-8-strings.asm(57):
    STRSLICE: Incomplete UTF-8 character
-error: Assembly aborted (30 errors)!
+Assembly aborted with 30 errors!
--- a/test/asm/invalid-utf-8.err
+++ b/test/asm/invalid-utf-8.err
@@ -1,3 +1,3 @@
 error: invalid-utf-8.asm(6) -> invalid-utf-8.asm::m(4):
    Unknown characters 0xCF, 0xD3
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/isconst.err
+++ b/test/asm/isconst.err
@@ -10,4 +10,4 @@ error: isconst.asm(28) -> isconst.asm::test_expr(9):
    Expected constant expression: 'FloatingLabel' is not constant at assembly time
 warning: isconst.asm(29) -> isconst.asm::test_expr(10): [-Wuser]
    Test #6: Compile-time constant
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/label-diff.err
+++ b/test/asm/label-diff.err
@@ -34,4 +34,4 @@ error: label-diff.asm(58) -> label-diff.asm::print_diff(19):
    Expected constant expression: 'Unknown' is not constant at assembly time
 error: label-diff.asm(58) -> label-diff.asm::print_diff(20):
    Expected constant expression: PC is not constant at assembly time
-error: Assembly aborted (18 errors)!
+Assembly aborted with 18 errors!
--- a/test/asm/label-macro-arg.err
+++ b/test/asm/label-macro-arg.err
@@ -14,4 +14,4 @@ error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
    Invalid format spec 'sizeof_'
 error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
    Interpolated symbol "something" does not exist
-error: Assembly aborted (7 errors)!
+Assembly aborted with 7 errors!
--- a/test/asm/label-outside-section.err
+++ b/test/asm/label-outside-section.err
@@ -1,3 +1,3 @@
 error: label-outside-section.asm(1):
    Label "bad" created outside of a SECTION
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/label-redefinition.err
+++ b/test/asm/label-redefinition.err
@@ -1,3 +1,3 @@
 error: label-redefinition.asm(7):
    'Sym' already defined at label-redefinition.asm(6) -> label-redefinition.asm::m(4)
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/label-scope.err
+++ b/test/asm/label-scope.err
@@ -10,4 +10,4 @@ error: label-scope.asm(12):
    Built-in symbol '.' cannot be purged
 error: label-scope.asm(12):
    Built-in symbol '..' cannot be purged
-error: Assembly aborted (6 errors)!
+Assembly aborted with 6 errors!
--- a/test/asm/lexer-hack.err
+++ b/test/asm/lexer-hack.err
@@ -6,4 +6,4 @@ error: lexer-hack.asm(27):
    Macro "undef" not defined
 error: lexer-hack.asm(28):
    Macro "undef" not defined
-error: Assembly aborted (4 errors)!
+Assembly aborted with 4 errors!
--- a/test/asm/line-continuation-whitespace.err
+++ b/test/asm/line-continuation-whitespace.err
@@ -1,3 +1,3 @@
 error: line-continuation-whitespace.asm(7):
    Label "foo" created outside of a SECTION
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/line-continuation.err
+++ b/test/asm/line-continuation.err
@@ -4,4 +4,4 @@ warning: line-continuation.asm(6) -> line-continuation.asm::spam(4): [-Wuser]
    spam
 error: line-continuation.asm(14):
    Label "foo" created outside of a SECTION
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/load-in-load.err
+++ b/test/asm/load-in-load.err
@@ -2,4 +2,4 @@ warning: load-in-load.asm(3): [-Wunterminated-load]
    `LOAD` block without `ENDL` terminated by `LOAD`
 error: load-in-load.asm(5):
    Found `ENDL` outside of a `LOAD` block
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/load-overflow.err
+++ b/test/asm/load-overflow.err
@@ -12,4 +12,4 @@ error: load-overflow.asm(26):
    Section 'hmm' grew too big (max size = 0x2000 bytes, reached 0x4000)
 error: load-overflow.asm(26):
    Section 'lol' grew too big (max size = 0x2000 bytes, reached 0x3000)
-error: Assembly aborted (5 errors)!
+Assembly aborted with 5 errors!
--- a/test/asm/load-rom.err
+++ b/test/asm/load-rom.err
@@ -2,4 +2,4 @@ error: load-rom.asm(3):
    `LOAD` blocks cannot create a ROM section
 error: load-rom.asm(5):
    Found `ENDL` outside of a `LOAD` block
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/local-purge.err
+++ b/test/asm/local-purge.err
@@ -2,4 +2,4 @@ warning: local-purge.asm(7): [-Wpurge]
    Purging a label ".loc"
 error: local-purge.asm(8):
    Interpolated symbol ".loc" does not exist; it was purged
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/macro-@.err
+++ b/test/asm/macro-@.err
@@ -2,4 +2,4 @@ error: macro-@.asm(1):
    Label "foo" created outside of a SECTION
 error: macro-@.asm(1):
    "@" is not a macro
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/macro-arg-0.err
+++ b/test/asm/macro-arg-0.err
@@ -2,4 +2,4 @@ error: macro-arg-0.asm(5) -> macro-arg-0.asm::m(2):
    Begun line continuation, but encountered character '0'
 error: macro-arg-0.asm(5) -> macro-arg-0.asm::m(3):
    Invalid bracketed macro argument '\<0>'
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/macro-arg-illegal-escape.err
+++ b/test/asm/macro-arg-illegal-escape.err
@@ -2,4 +2,4 @@ error: macro-arg-illegal-escape.asm(5):
    Illegal character escape 'w'
 error: macro-arg-illegal-escape.asm(5):
    Illegal character escape at end of input
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/macro-arg-in-string.err
+++ b/test/asm/macro-arg-in-string.err
@@ -1,3 +1,3 @@
 error: macro-arg-in-string.asm(12):
    Illegal character escape '!'
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/macro-args-outside-macro.err
+++ b/test/asm/macro-args-outside-macro.err
@@ -4,4 +4,4 @@ error: macro-args-outside-macro.asm(2):
    '\<2>' cannot be used outside of a macro
 error: macro-args-outside-macro.asm(3):
    '\#' cannot be used outside of a macro
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/macro-syntax.err
+++ b/test/asm/macro-syntax.err
@@ -8,4 +8,4 @@ error: macro-syntax.asm(9):
    syntax error, unexpected ENDM
 error: macro-syntax.asm(11):
    "old" is not a macro
-error: Assembly aborted (5 errors)!
+Assembly aborted with 5 errors!
--- a/test/asm/max-errors.err
+++ b/test/asm/max-errors.err
@@ -1,3 +1,3 @@
 error: max-errors.asm(3):
    Expected constant expression: PC is not constant at assembly time
-error: The maximum of 1 error was reached (configure with "-X/--max-errors"); assembly aborted!
+Assembly aborted after the maximum of 1 error! (configure with '-X/--max-errors')
--- a/test/asm/multi-line-strings.err
+++ b/test/asm/multi-line-strings.err
@@ -2,4 +2,4 @@ error: multi-line-strings.asm(23):
    Unterminated string
 warning: multi-line-strings.asm(35): [-Wuser]
    check the line number
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/multiple-charmaps.err
+++ b/test/asm/multiple-charmaps.err
@@ -18,4 +18,4 @@ error: multiple-charmaps.asm(108) -> multiple-charmaps.asm::set_(15):
    Charmap 'map5' doesn't exist
 error: multiple-charmaps.asm(110) -> multiple-charmaps.asm::pop_(30):
    No entries in the charmap stack
-error: Assembly aborted (3 errors)!
+Assembly aborted with 3 errors!
--- a/test/asm/negative-macro-args.err
+++ b/test/asm/negative-macro-args.err
@@ -23,4 +23,4 @@ while expanding symbol "2147483648"
 error: negative-macro-args.asm(21) -> negative-macro-args.asm::mac(18):
    Number in bracketed macro argument is too large
 while expanding symbol "4294967295"
-error: Assembly aborted (11 errors)!
+Assembly aborted with 11 errors!
--- a/test/asm/nested-bad-interpolation.err
+++ b/test/asm/nested-bad-interpolation.err
@@ -14,4 +14,4 @@ error: nested-bad-interpolation.asm(3):
    Interpolated symbol "" does not exist
 warning: nested-bad-interpolation.asm(3): [-Wobsolete]
    Treating multi-unit strings as numbers is deprecated
-error: Assembly aborted (6 errors)!
+Assembly aborted with 6 errors!
--- a/test/asm/nested-brackets.err
+++ b/test/asm/nested-brackets.err
@@ -1,3 +1,3 @@
 error: nested-brackets.asm(5):
    Missing }
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/nested-expansions.err
+++ b/test/asm/nested-expansions.err
@@ -1,3 +1,3 @@
 error: nested-expansions.asm(6) -> nested-expansions.asm::test(4):
    Macro "qux" not defined
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/nested-macrodef.err
+++ b/test/asm/nested-macrodef.err
@@ -4,4 +4,4 @@ error: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(24):
    Unterminated macro definition
 error: nested-macrodef.asm(27):
    Macro "inner" not defined
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/non-numeric-symbol.err
+++ b/test/asm/non-numeric-symbol.err
@@ -10,4 +10,4 @@ error: non-numeric-symbol.asm(10):
    'mac' is not a numeric symbol
 error: non-numeric-symbol.asm(11):
    'mac' is not a numeric symbol
-error: Assembly aborted (6 errors)!
+Assembly aborted with 6 errors!
--- a/test/asm/nonexist-include.err
+++ b/test/asm/nonexist-include.err
@@ -1,3 +1,3 @@
 error: nonexist-include.asm(1):
    Unable to open included file 'nonexist-include.inc': No such file or directory
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/notexist.err
+++ b/test/asm/notexist.err
@@ -1,4 +1 @@
-error: at top level:
-    Failed to stat file "notexist.asm": No such file or directory
-FATAL: at top level:
-    Failed to open main file
+FATAL: Failed to stat file "notexist.asm": No such file or directory
--- a/test/asm/null-in-macro.err
+++ b/test/asm/null-in-macro.err
@@ -1,3 +1,3 @@
 error: null-in-macro.asm(4) -> null-in-macro.asm::foo(2):
    Unknown character '\0'
-error: Assembly aborted (1 error)!
+Assembly aborted with 1 error!
--- a/test/asm/null-outside-string.err
+++ b/test/asm/null-outside-string.err
@@ -14,4 +14,4 @@ error: null-outside-string.asm(7):
    Begun line continuation, but encountered character 'X'
 error: null-outside-string.asm(7):
    syntax error, unexpected symbol
-error: Assembly aborted (8 errors)!
+Assembly aborted with 8 errors!
--- a/test/asm/opt-Q.err
+++ b/test/asm/opt-Q.err
@@ -2,4 +2,4 @@ error: opt-Q.asm(17) -> opt-Q.asm::test(3):
    Argument for option 'Q' must be between 1 and 31
 error: opt-Q.asm(18) -> opt-Q.asm::test(3):
    Argument for option 'Q' must be between 1 and 31
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/test/asm/pc-bank.err
+++ b/test/asm/pc-bank.err
@@ -2,4 +2,4 @@ error: pc-bank.asm(2):
    Source address $2a00 not between $FF00 to $FFFF
 error: pc-bank.asm(11):
    Expected constant expression: Current section's bank is not known
-error: Assembly aborted (2 errors)!
+Assembly aborted with 2 errors!
--- a/Show More
+++ b/Show More