From 2666dcbc26c9fc2aba7768814421d8cd13b4ca53 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Wed, 10 Dec 2025 11:50:33 -0500 Subject: [PATCH] Remove exclamation marks and periods from error messages (#1874) --- src/asm/main.cpp | 2 +- src/asm/symbol.cpp | 2 +- src/asm/warning.cpp | 4 ++-- src/gfx/main.cpp | 18 +++++++++--------- src/gfx/process.cpp | 14 +++++++------- src/gfx/reverse.cpp | 19 ++++++++++--------- src/link/main.cpp | 2 +- src/link/object.cpp | 2 +- src/link/sdas_obj.cpp | 2 +- test/asm/align-large-ofs.err | 2 +- test/asm/align-large.err | 2 +- test/asm/align-offset.err | 2 +- test/asm/align-pc-outside-section.err | 2 +- test/asm/align-unattainable.err | 2 +- test/asm/anon-label-bad.err | 2 +- test/asm/assert-nosect-bank.err | 2 +- test/asm/assert@-no-sect.err | 2 +- test/asm/bad-precision.err | 2 +- test/asm/bank.err | 2 +- test/asm/block-comment-termination-error.err | 2 +- test/asm/blue-paint-limits.err | 2 +- test/asm/bracketed-macro-args.err | 2 +- test/asm/bracketed-symbols.err | 2 +- test/asm/builtin-overwrite.err | 2 +- test/asm/builtin-reserved.err | 2 +- test/asm/character-escape-at-end.err | 2 +- test/asm/character-escapes.err | 2 +- test/asm/character-literals.err | 2 +- test/asm/charmap-empty.err | 2 +- test/asm/charmap-inheritance.err | 2 +- test/asm/charsize.err | 2 +- test/asm/charval.err | 2 +- test/asm/command-line-symbols.err | 2 +- test/asm/compound-assignment.err | 2 +- test/asm/const-and.err | 2 +- test/asm/const-low.err | 2 +- test/asm/const-not.err | 2 +- test/asm/const-zero.err | 2 +- test/asm/data-in-ram.err | 2 +- test/asm/def-scoped.err | 2 +- test/asm/def.err | 2 +- test/asm/deprecated-functions.err | 2 +- test/asm/diff-marks.err | 2 +- test/asm/dots-constant.err | 2 +- test/asm/double-purge.err | 2 +- test/asm/ds-bad.err | 2 +- test/asm/empty-raw-identifier.err | 2 +- test/asm/endsection-in-load.err | 2 +- test/asm/endsection.err | 2 +- test/asm/error-limit.err | 2 +- test/asm/error-recovery.err | 2 +- test/asm/expand-empty-string.err | 2 +- test/asm/export.err | 2 +- test/asm/ff00+c-bad.err | 2 +- test/asm/fixed-oob.err | 2 +- test/asm/fixed-point-precision.err | 2 +- test/asm/for-loop-variable.err | 2 +- test/asm/format-truncation.err | 2 +- test/asm/fragment-align.err | 2 +- test/asm/garbage-before-eof.err | 2 +- test/asm/garbage_char.err | 2 +- test/asm/garbage_sequence.err | 2 +- test/asm/impossible-bank.err | 2 +- test/asm/incbin-empty-bad.err | 2 +- test/asm/incbin-end-0.err | 2 +- test/asm/incbin-end-bad.err | 2 +- test/asm/incbin-start-bad.err | 2 +- test/asm/include-slash.err | 2 +- test/asm/interpolation-after-string.err | 2 +- test/asm/interpolation-overflow.err | 2 +- test/asm/interpolation.err | 2 +- test/asm/invalid-alignment.err | 2 +- test/asm/invalid-bank.err | 2 +- test/asm/invalid-empty-macro-arg.err | 2 +- test/asm/invalid-format.err | 2 +- test/asm/invalid-instructions.err | 2 +- test/asm/invalid-jr.err | 2 +- test/asm/invalid-ldh.err | 2 +- test/asm/invalid-macro-arg-character.err | 2 +- test/asm/invalid-macro-arg-symbol.err | 2 +- test/asm/invalid-numbers.err | 2 +- test/asm/invalid-opt.err | 2 +- test/asm/invalid-underscore.err | 2 +- test/asm/invalid-union.err | 2 +- test/asm/invalid-utf-8-strings.err | 2 +- test/asm/invalid-utf-8.err | 2 +- test/asm/isconst.err | 2 +- test/asm/keyword-global.err | 2 +- test/asm/label-diff.err | 2 +- test/asm/label-macro-arg.err | 2 +- test/asm/label-outside-section.err | 2 +- test/asm/label-redefinition.err | 2 +- test/asm/label-scope.err | 2 +- test/asm/lex-label.err | 2 +- test/asm/lexer-hack.err | 2 +- test/asm/line-continuation-at-eof.err | 2 +- test/asm/line-continuation-block-comment.err | 2 +- test/asm/line-continuation-whitespace.err | 2 +- test/asm/line-continuation.err | 2 +- test/asm/load-in-load.err | 2 +- test/asm/load-overflow.err | 2 +- test/asm/load-rom.err | 2 +- test/asm/local-purge.err | 2 +- test/asm/macro-@.err | 2 +- test/asm/macro-arg-0.err | 2 +- test/asm/macro-arg-illegal-escape.err | 2 +- test/asm/macro-arg-in-string.err | 2 +- test/asm/macro-arg-recursion.err | 2 +- test/asm/macro-args-outside-macro.err | 2 +- test/asm/macro-syntax.err | 2 +- test/asm/max-errors.err | 2 +- test/asm/multi-line-strings.err | 2 +- test/asm/multiple-charmaps.err | 2 +- test/asm/negative-macro-args.err | 2 +- test/asm/nested-bad-interpolation.err | 2 +- test/asm/nested-brackets.err | 2 +- test/asm/nested-expansions.err | 2 +- test/asm/nested-macrodef.err | 2 +- test/asm/non-numeric-symbol.err | 2 +- test/asm/nonexist-include.err | 2 +- test/asm/nonexist-preinclude.err | 2 +- test/asm/null-in-macro.err | 2 +- test/asm/null-outside-string.err | 2 +- test/asm/opt-Q.err | 2 +- test/asm/pc-bank.err | 2 +- test/asm/pops-restore-no-section.err | 2 +- test/asm/purge-ref.err | 2 +- test/asm/purge-refs.err | 2 +- test/asm/purge.err | 2 +- test/asm/pushs.err | 2 +- test/asm/raw-macro-args.err | 2 +- test/asm/raw-string-symbol-errors.err | 2 +- test/asm/readfile-nonexist.err | 2 +- test/asm/redef-equ.err | 2 +- test/asm/redef-equs.err | 2 +- test/asm/ref-override-bad.err | 2 +- test/asm/reference-undefined-equs.err | 2 +- test/asm/rept-shift.err | 2 +- test/asm/rept-trace.err | 2 +- test/asm/revchar.err | 2 +- test/asm/rs-overwrite.err | 2 +- test/asm/section-align-large-ofs.err | 2 +- test/asm/section-in-load.err | 2 +- test/asm/section-sizeof-startof.err | 2 +- test/asm/section-union-data.err | 2 +- test/asm/shift-outside-macro.err | 2 +- test/asm/skip-expansions.err | 2 +- test/asm/strfmt.err | 2 +- test/asm/string-concat.err | 2 +- test/asm/string-literal-macro-arg.err | 2 +- test/asm/suggest-def.err | 2 +- test/asm/sym-collision.err | 2 +- test/asm/symbol-invalid-macro-arg.err | 2 +- test/asm/symbol-override.err | 2 +- test/asm/syntax-error-after-syntax-error.err | 2 +- test/asm/syntax-error-eof-newline.err | 2 +- test/asm/syntax-error-lexer-mode.err | 2 +- test/asm/syntax-error.err | 2 +- test/asm/undefined-builtins.err | 2 +- test/asm/undefined-opt.err | 2 +- test/asm/union-in-rom.err | 2 +- test/asm/unique-id.err | 2 +- test/asm/unterminated-rept.err | 2 +- test/asm/use-label-outside-section.err | 2 +- test/gfx/bad_slice.err | 2 +- test/gfx/bg_fuse.err | 2 +- test/gfx/bg_in_tile.err | 2 +- test/gfx/input_tileset_extra.err | 6 +++--- test/gfx/oob_slice_wh.err | 2 +- test/gfx/oob_slice_xy.err | 2 +- test/gfx/trans_bg_in_tile.err | 2 +- test/link/section-union/assert.out | 2 +- 172 files changed, 198 insertions(+), 197 deletions(-) diff --git a/src/asm/main.cpp b/src/asm/main.cpp index 8739260e..807d3412 100644 --- a/src/asm/main.cpp +++ b/src/asm/main.cpp @@ -490,7 +490,7 @@ static void verboseOutputConfig() { fputs("\tGenerate phony dependencies\n", stderr); } } - fputs("Ready.\n", stderr); + fputs("Ready for assembly\n", stderr); style_Reset(stderr); } diff --git a/src/asm/symbol.cpp b/src/asm/symbol.cpp index e6912c9e..5c26f010 100644 --- a/src/asm/symbol.cpp +++ b/src/asm/symbol.cpp @@ -587,7 +587,7 @@ static uint32_t anonLabelID = 0; Symbol *sym_AddAnonLabel() { if (anonLabelID == UINT32_MAX) { // LCOV_EXCL_START - error("Only %" PRIu32 " anonymous labels can be created!", anonLabelID); + error("Only %" PRIu32 " anonymous labels can be created", anonLabelID); return nullptr; // LCOV_EXCL_STOP } diff --git a/src/asm/warning.cpp b/src/asm/warning.cpp index 1a087c32..96472383 100644 --- a/src/asm/warning.cpp +++ b/src/asm/warning.cpp @@ -90,7 +90,7 @@ static void incrementErrors() { style_Set(stderr, STYLE_RED, true); fprintf( stderr, - "Assembly aborted after the maximum of %" PRIu64 " error%s!", + "Assembly aborted after the maximum of %" PRIu64 " error%s", warnings.nbErrors, warnings.nbErrors == 1 ? "" : "s" ); @@ -136,7 +136,7 @@ void requireZeroErrors() { style_Set(stderr, STYLE_RED, true); fprintf( stderr, - "Assembly aborted with %" PRIu64 " error%s!\n", + "Assembly aborted with %" PRIu64 " error%s\n", warnings.nbErrors, warnings.nbErrors == 1 ? "" : "s" ); diff --git a/src/gfx/main.cpp b/src/gfx/main.cpp index 48b1ce75..4146b9cf 100644 --- a/src/gfx/main.cpp +++ b/src/gfx/main.cpp @@ -126,7 +126,7 @@ static uint16_t readNumber(char const *&str, char const *errPrefix, uint16_t err error("%s: expected number, but found nothing", errPrefix); return errVal; } else if (*number > UINT16_MAX) { - error("%s: the number is too large!", errPrefix); + error("%s: the number is too large", errPrefix); return errVal; } else { return *number; @@ -239,7 +239,7 @@ static void parseArg(int ch, char *arg) { case 'L': options.inputSlice.left = readNumber(argPtr, "Input slice left coordinate"); if (options.inputSlice.left > INT16_MAX) { - error("Input slice left coordinate is out of range!"); + error("Input slice left coordinate is out of range"); break; } skipBlankSpace(argPtr); @@ -260,7 +260,7 @@ static void parseArg(int ch, char *arg) { options.inputSlice.width = readNumber(argPtr, "Input slice width"); skipBlankSpace(argPtr); if (options.inputSlice.width == 0) { - error("Input slice width may not be 0!"); + error("Input slice width may not be 0"); } if (*argPtr != ',') { error("Missing comma after width in \"%s\"", arg); @@ -270,7 +270,7 @@ static void parseArg(int ch, char *arg) { skipBlankSpace(argPtr); options.inputSlice.height = readNumber(argPtr, "Input slice height"); if (options.inputSlice.height == 0) { - error("Input slice height may not be 0!"); + error("Input slice height may not be 0"); } if (*argPtr != '\0') { error("Unexpected extra characters after slice spec in \"%s\"", arg); @@ -330,9 +330,9 @@ static void parseArg(int ch, char *arg) { error("Number of palettes ('-n') must be a valid number, not \"%s\"", arg); } if (number > 256) { - error("Number of palettes ('-n') must not exceed 256!"); + error("Number of palettes ('-n') must not exceed 256"); } else if (number == 0) { - error("Number of palettes ('-n') may not be 0!"); + error("Number of palettes ('-n') may not be 0"); } else { options.nbPalettes = number; } @@ -388,9 +388,9 @@ static void parseArg(int ch, char *arg) { error("Palette size ('-s') must be a valid number, not \"%s\"", arg); } if (options.nbColorsPerPal > 4) { - error("Palette size ('-s') must not exceed 4!"); + error("Palette size ('-s') must not exceed 4"); } else if (options.nbColorsPerPal == 0) { - error("Palette size ('-s') may not be 0!"); + error("Palette size ('-s') may not be 0"); } break; @@ -608,7 +608,7 @@ static void verboseOutputConfig() { if (localOptions.reverse) { fprintf(stderr, "\tReverse image width: %" PRIu16 " tiles\n", options.reversedWidth); } - fputs("Ready.\n", stderr); + fputs("Ready for conversion\n", stderr); style_Reset(stderr); } diff --git a/src/gfx/process.cpp b/src/gfx/process.cpp index 9e94dab6..280f4924 100644 --- a/src/gfx/process.cpp +++ b/src/gfx/process.cpp @@ -132,15 +132,15 @@ struct Image { // Validate input slice if (options.inputSlice.width == 0 && png.width % 8 != 0) { - fatal("Image width (%" PRIu32 " pixels) is not a multiple of 8!", png.width); + fatal("Image width (%" PRIu32 " pixels) is not a multiple of 8", png.width); } if (options.inputSlice.height == 0 && png.height % 8 != 0) { - fatal("Image height (%" PRIu32 " pixels) is not a multiple of 8!", png.height); + fatal("Image height (%" PRIu32 " pixels) is not a multiple of 8", png.height); } if (options.inputSlice.right() > png.width || options.inputSlice.bottom() > png.height) { error( "Image slice ((%" PRIu16 ", %" PRIu16 ") to (%" PRIu32 ", %" PRIu32 - ")) is outside the image bounds (%" PRIu32 "x%" PRIu32 ")!", + ")) is outside the image bounds (%" PRIu32 "x%" PRIu32 ")", options.inputSlice.left, options.inputSlice.top, options.inputSlice.right(), @@ -319,7 +319,7 @@ static void generatePalSpec(Image const &image) { // Generate a palette spec from the first few colors in the embedded palette std::vector const &embPal = image.png.palette; if (embPal.empty()) { - fatal("\"-c embedded\" was given, but the PNG does not have an embedded palette!"); + fatal("\"-c embedded\" was given, but the PNG does not have an embedded palette"); } // Ignore extraneous colors if they are unused @@ -821,7 +821,7 @@ static UniqueTiles dedupTiles( if (inputWithoutOutput && matchType == TileData::NOPE) { error( "Tile at (%" PRIu32 ", %" PRIu32 - ") is not within the input tileset, and '-o' was not given!", + ") is not within the input tileset, and '-o' was not given", tile.x, tile.y ); @@ -973,7 +973,7 @@ void process() { if (tileColors.size() > options.maxOpaqueColors()) { fatal( - "Tile at (%" PRIu32 ", %" PRIu32 ") has %zu colors, more than %" PRIu8 "!", + "Tile at (%" PRIu32 ", %" PRIu32 ") has %zu colors, more than %" PRIu8, tile.x, tile.y, tileColors.size(), @@ -1001,7 +1001,7 @@ void process() { continue; } fatal( - "Tile (%" PRIu32 ", %" PRIu32 ") contains the background color (#%08x)!", + "Tile (%" PRIu32 ", %" PRIu32 ") contains the background color (#%08x)", tile.x, tile.y, options.bgColor->toCSS() diff --git a/src/gfx/reverse.cpp b/src/gfx/reverse.cpp index 6c0e6505..8746952e 100644 --- a/src/gfx/reverse.cpp +++ b/src/gfx/reverse.cpp @@ -112,15 +112,15 @@ void reverse() { // Check for weird flag combinations if (options.output.empty()) { - fatal("Tile data must be provided when reversing an image!"); + fatal("Tile data must be provided when reversing an image"); } if (options.allowDedup && options.tilemap.empty()) { - warnx("Tile deduplication is enabled, but no tilemap is provided?"); + warnx("Tile deduplication is enabled, but no tilemap is provided"); } if (options.useColorCurve) { - warnx("The color curve is not yet supported in reverse mode..."); + warnx("The color curve is not yet supported in reverse mode"); } if (options.inputSlice.left != 0 || options.inputSlice.top != 0 @@ -149,13 +149,13 @@ void reverse() { // By default, assume tiles are not deduplicated, and add the (allegedly) trimmed tiles size_t const nbTiles = tiles.size() / tileSize; - verbosePrint(VERB_INFO, "Read %zu tiles.\n", nbTiles); + verbosePrint(VERB_INFO, "Read %zu tiles\n", nbTiles); size_t mapSize = nbTiles + options.trim; // Image size in tiles std::optional> tilemap; if (!options.tilemap.empty()) { tilemap = readInto(options.tilemap); mapSize = tilemap->size(); - verbosePrint(VERB_INFO, "Read %zu tilemap entries.\n", mapSize); + verbosePrint(VERB_INFO, "Read %zu tilemap entries\n", mapSize); } if (mapSize == 0) { @@ -224,7 +224,7 @@ void reverse() { break; } else if (nbRead != buf.size()) { fatal( - "Palette data size (%zu) is not a multiple of %zu bytes!\n", + "Palette data size (%zu) is not a multiple of %zu bytes\n", palettes.size() * buf.size() + nbRead, buf.size() ); @@ -250,7 +250,7 @@ void reverse() { } if (options.palSpecType == Options::EXPLICIT && palettes != options.palSpec) { - warnx("Colors in the palette file do not match those specified with '-c'!"); + warnx("Colors in the palette file do not match those specified with '-c'"); // This spacing aligns "...versus with `-c`" above the column of `-c` palettes fputs("Colors specified in the palette file: ...versus with '-c':\n", stderr); for (size_t i = 0; i < palettes.size() && i < options.palSpec.size(); ++i) { @@ -272,7 +272,7 @@ void reverse() { } } else if (options.palSpecType == Options::EMBEDDED) { warnx("An embedded palette was requested, but no palette file was specified; ignoring " - "request."); + "request"); } else if (options.palSpecType == Options::EXPLICIT) { palettes = std::move(options.palSpec); // We won't be using it again. } @@ -299,7 +299,8 @@ void reverse() { if (uint8_t palID = (attr & 0b111) - options.basePalID; palID > palettes.size()) { error( - "Attribute map references palette #%u at (%zu, %zu), but there are only %zu!", + "Attribute map references palette #%u at (%zu, %zu), but there are only %zu " + "palettes", palID, tx, ty, diff --git a/src/link/main.cpp b/src/link/main.cpp index 33ff3a48..3c19279f 100644 --- a/src/link/main.cpp +++ b/src/link/main.cpp @@ -407,7 +407,7 @@ static void verboseOutputConfig() { } // -n/--sym printPath("Output sym file", options.symFileName); - fputs("Ready.\n", stderr); + fputs("Ready for linking\n", stderr); style_Reset(stderr); } diff --git a/src/link/object.cpp b/src/link/object.cpp index 490b3e6a..433b1a1a 100644 --- a/src/link/object.cpp +++ b/src/link/object.cpp @@ -452,7 +452,7 @@ void obj_ReadFile(std::string const &filePath, size_t fileID) { // A single `ungetc` is guaranteed to work. switch (ungetc(getc(file), file)) { case EOF: - fatal("File \"%s\" is empty!", fileName); + fatal("File \"%s\" is empty", fileName); case 'X': case 'D': diff --git a/src/link/sdas_obj.cpp b/src/link/sdas_obj.cpp index 656295da..31bb8d61 100644 --- a/src/link/sdas_obj.cpp +++ b/src/link/sdas_obj.cpp @@ -296,7 +296,7 @@ void sdobj_ReadFile(FileStackNode const &src, FILE *file, std::vector &f if (tmp > UINT16_MAX) { fatalAt( where, - "Area \"%s\" is larger than the GB address space!?", + "Area \"%s\" is larger than the GB address space", curSection->name.c_str() ); } diff --git a/test/asm/align-large-ofs.err b/test/asm/align-large-ofs.err index e2d8ad32..0f0883bf 100644 --- a/test/asm/align-large-ofs.err +++ b/test/asm/align-large-ofs.err @@ -1,3 +1,3 @@ error: The absolute alignment offset (2) must be less than alignment size (2) at align-large-ofs.asm(2) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/align-large.err b/test/asm/align-large.err index 09a9ad7f..b256d9c6 100644 --- a/test/asm/align-large.err +++ b/test/asm/align-large.err @@ -2,4 +2,4 @@ error: Alignment must be between 0 and 16, not 17 at align-large.asm(1) error: Alignment must be between 0 and 16, not 17 at align-large.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/align-offset.err b/test/asm/align-offset.err index d7c9592b..857576d3 100644 --- a/test/asm/align-offset.err +++ b/test/asm/align-offset.err @@ -2,4 +2,4 @@ error: The absolute alignment offset (18) must be less than alignment size (16) at align-offset.asm(4) error: The absolute alignment offset (20) must be less than alignment size (16) at align-offset.asm(6) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/align-pc-outside-section.err b/test/asm/align-pc-outside-section.err index cc50ffa4..01beb722 100644 --- a/test/asm/align-pc-outside-section.err +++ b/test/asm/align-pc-outside-section.err @@ -1,3 +1,3 @@ error: Cannot output data outside of a `SECTION` at align-pc-outside-section.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/align-unattainable.err b/test/asm/align-unattainable.err index b4b90bd0..0b0765a3 100644 --- a/test/asm/align-unattainable.err +++ b/test/asm/align-unattainable.err @@ -1,3 +1,3 @@ error: Section "X"'s alignment cannot be attained in WRAM0 at align-unattainable.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/anon-label-bad.err b/test/asm/anon-label-bad.err index 8fd6d963..e4777723 100644 --- a/test/asm/anon-label-bad.err +++ b/test/asm/anon-label-bad.err @@ -8,4 +8,4 @@ error: syntax error, unexpected anonymous label, expecting symbol or label or lo at anon-label-bad.asm(10) error: syntax error, unexpected :: at anon-label-bad.asm(22) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/assert-nosect-bank.err b/test/asm/assert-nosect-bank.err index 8d3bafef..cd265dac 100644 --- a/test/asm/assert-nosect-bank.err +++ b/test/asm/assert-nosect-bank.err @@ -1,3 +1,3 @@ error: PC has no bank outside of a section at assert-nosect-bank.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/assert@-no-sect.err b/test/asm/assert@-no-sect.err index 7eae5281..8714d0aa 100644 --- a/test/asm/assert@-no-sect.err +++ b/test/asm/assert@-no-sect.err @@ -1,3 +1,3 @@ error: PC has no value outside of a section at assert@-no-sect.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/bad-precision.err b/test/asm/bad-precision.err index 7a4a6ddc..c0575726 100644 --- a/test/asm/bad-precision.err +++ b/test/asm/bad-precision.err @@ -1,3 +1,3 @@ error: Fixed-point precision must be between 1 and 31, not 42 at bad-precision.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/bank.err b/test/asm/bank.err index 988f8c5b..846d884b 100644 --- a/test/asm/bank.err +++ b/test/asm/bank.err @@ -20,4 +20,4 @@ error: Expected constant expression: `Label_u12`'s bank is not known at bank.asm::def_sect(8) <- bank.asm(22) error: `BANK` argument must be a label at bank.asm(26) -Assembly aborted with 11 errors! +Assembly aborted with 11 errors diff --git a/test/asm/block-comment-termination-error.err b/test/asm/block-comment-termination-error.err index da8156e5..376caf4a 100644 --- a/test/asm/block-comment-termination-error.err +++ b/test/asm/block-comment-termination-error.err @@ -2,4 +2,4 @@ error: Unterminated block comment at block-comment-termination-error.asm(1) error: syntax error, unexpected end of buffer at block-comment-termination-error.asm(1) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/blue-paint-limits.err b/test/asm/blue-paint-limits.err index a8672803..71e36711 100644 --- a/test/asm/blue-paint-limits.err +++ b/test/asm/blue-paint-limits.err @@ -1,3 +1,3 @@ error: Invalid character '2' after line continuation at blue-paint-limits.asm::nth(40) <- blue-paint-limits.asm(43) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/bracketed-macro-args.err b/test/asm/bracketed-macro-args.err index 4ed4b2c0..d7cdf9f1 100644 --- a/test/asm/bracketed-macro-args.err +++ b/test/asm/bracketed-macro-args.err @@ -10,4 +10,4 @@ error: Macro argument `\<2>` not defined at bracketed-macro-args.asm::bad(30) <- bracketed-macro-args.asm(33) error: Bracketed symbol `abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz` does not exist at bracketed-macro-args.asm::toolong(36) <- bracketed-macro-args.asm(39) -Assembly aborted with 6 errors! +Assembly aborted with 6 errors diff --git a/test/asm/bracketed-symbols.err b/test/asm/bracketed-symbols.err index 51208d5c..1ccde23c 100644 --- a/test/asm/bracketed-symbols.err +++ b/test/asm/bracketed-symbols.err @@ -4,4 +4,4 @@ error: `Label` does not have a constant value at bracketed-symbols.asm(20) error: PC does not have a constant value; the current section is not fixed at bracketed-symbols.asm(21) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/builtin-overwrite.err b/test/asm/builtin-overwrite.err index 9101307a..307615a1 100644 --- a/test/asm/builtin-overwrite.err +++ b/test/asm/builtin-overwrite.err @@ -54,4 +54,4 @@ error: Built-in symbol `__ISO_8601_UTC__` cannot be redefined at builtin-overwrite.asm::tickle(29) <- builtin-overwrite.asm(37) error: Built-in symbol `__ISO_8601_UTC__` cannot be redefined at builtin-overwrite.asm::tickle(30) <- builtin-overwrite.asm(37) -Assembly aborted with 28 errors! +Assembly aborted with 28 errors diff --git a/test/asm/builtin-reserved.err b/test/asm/builtin-reserved.err index c9ce4e28..27d1f5ba 100644 --- a/test/asm/builtin-reserved.err +++ b/test/asm/builtin-reserved.err @@ -30,4 +30,4 @@ error: `.` is reserved for a built-in symbol at builtin-reserved.asm(29) error: `.` has no value outside of a label scope at builtin-reserved.asm(32) -Assembly aborted with 16 errors! +Assembly aborted with 16 errors diff --git a/test/asm/character-escape-at-end.err b/test/asm/character-escape-at-end.err index 8e96c5e6..0e53363c 100644 --- a/test/asm/character-escape-at-end.err +++ b/test/asm/character-escape-at-end.err @@ -2,4 +2,4 @@ error: Illegal character escape '\' at end of input at character-escape-at-end.asm(1) error: Unterminated string at character-escape-at-end.asm(1) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/character-escapes.err b/test/asm/character-escapes.err index b13ca543..b22f51ed 100644 --- a/test/asm/character-escapes.err +++ b/test/asm/character-escapes.err @@ -4,4 +4,4 @@ error: Invalid character '\' in bracketed macro argument at character-escapes.asm::m(7) <- character-escapes.asm(10) error: Invalid character '\t' in bracketed macro argument at character-escapes.asm::m(8) <- character-escapes.asm(10) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/character-literals.err b/test/asm/character-literals.err index 0aea86bb..e8228e09 100644 --- a/test/asm/character-literals.err +++ b/test/asm/character-literals.err @@ -16,4 +16,4 @@ error: Unterminated character at character-literals.asm(35) error: Character literals must be a single charmap unit at character-literals.asm(35) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/charmap-empty.err b/test/asm/charmap-empty.err index 4acc6f5a..30563b2d 100644 --- a/test/asm/charmap-empty.err +++ b/test/asm/charmap-empty.err @@ -2,4 +2,4 @@ error: Cannot map an empty string at charmap-empty.asm(1) error: syntax error, unexpected end of line at charmap-empty.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/charmap-inheritance.err b/test/asm/charmap-inheritance.err index 44158181..c271151f 100644 --- a/test/asm/charmap-inheritance.err +++ b/test/asm/charmap-inheritance.err @@ -1,3 +1,3 @@ error: Undefined base charmap `eggs` at charmap-inheritance.asm(26) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/charsize.err b/test/asm/charsize.err index 7c9a23c3..9ecbcc29 100644 --- a/test/asm/charsize.err +++ b/test/asm/charsize.err @@ -6,4 +6,4 @@ error: CHARSIZE: No character mapping for "abcdef" at charsize.asm(19) error: CHARSIZE: No character mapping for "é" at charsize.asm(20) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/charval.err b/test/asm/charval.err index c77bfef2..2857cdaf 100644 --- a/test/asm/charval.err +++ b/test/asm/charval.err @@ -12,4 +12,4 @@ warning: CHARVAL: Index starts at 0 [-Wbuiltin-args] at charval.asm(28) warning: CHARVAL: Index 10 is past the end of the character mapping [-Wbuiltin-args] at charval.asm(29) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/command-line-symbols.err b/test/asm/command-line-symbols.err index c2fe437e..b7af4483 100644 --- a/test/asm/command-line-symbols.err +++ b/test/asm/command-line-symbols.err @@ -2,4 +2,4 @@ error: `FOO` already defined (should it be {interpolated} to define its contents at command-line-symbols.asm(3) and also: at -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/compound-assignment.err b/test/asm/compound-assignment.err index a76526a4..19dfb866 100644 --- a/test/asm/compound-assignment.err +++ b/test/asm/compound-assignment.err @@ -1,3 +1,3 @@ error: Expected constant expression: undefined symbol `UnDeFiNeD` at compound-assignment.asm(35) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/const-and.err b/test/asm/const-and.err index ef654bce..67549acf 100644 --- a/test/asm/const-and.err +++ b/test/asm/const-and.err @@ -6,4 +6,4 @@ error: Expected constant expression: PC is not constant at assembly time at const-and.asm(17) error: Expected constant expression: `Floating` is not constant at assembly time at const-and.asm(20) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/const-low.err b/test/asm/const-low.err index cd2bdc06..9d7981df 100644 --- a/test/asm/const-low.err +++ b/test/asm/const-low.err @@ -2,4 +2,4 @@ error: Expected constant expression: `Gamma` is not constant at assembly time at const-low.asm(10) error: Assertion failed at const-low.asm(10) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/const-not.err b/test/asm/const-not.err index 6f02547a..003c5b5c 100644 --- a/test/asm/const-not.err +++ b/test/asm/const-not.err @@ -1,3 +1,3 @@ error: Assertion failed at const-not.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/const-zero.err b/test/asm/const-zero.err index f12d8726..a103a671 100644 --- a/test/asm/const-zero.err +++ b/test/asm/const-zero.err @@ -1,3 +1,3 @@ error: Expected constant expression: PC is not constant at assembly time at const-zero.asm::test_or(14) <- const-zero.asm(21) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/data-in-ram.err b/test/asm/data-in-ram.err index 4072d25a..6e23b58f 100644 --- a/test/asm/data-in-ram.err +++ b/test/asm/data-in-ram.err @@ -2,4 +2,4 @@ error: Section "code" cannot contain code or data (not `ROM0` or `ROMX`) at data-in-ram.asm(2) error: Section "data" cannot contain code or data (not `ROM0` or `ROMX`) at data-in-ram.asm(4) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/def-scoped.err b/test/asm/def-scoped.err index 4ef24f26..ab613788 100644 --- a/test/asm/def-scoped.err +++ b/test/asm/def-scoped.err @@ -4,4 +4,4 @@ error: syntax error, unexpected local label, expecting symbol at def-scoped.asm(13) error: syntax error, unexpected local label, expecting symbol at def-scoped.asm(16) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/def.err b/test/asm/def.err index 1547cf19..c875c0a5 100644 --- a/test/asm/def.err +++ b/test/asm/def.err @@ -14,4 +14,4 @@ error: `name` already defined (should it be {interpolated} to define its content at def.asm(42) and also: at def.asm(40) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/deprecated-functions.err b/test/asm/deprecated-functions.err index 6835a0e7..8ebad784 100644 --- a/test/asm/deprecated-functions.err +++ b/test/asm/deprecated-functions.err @@ -52,4 +52,4 @@ warning: STRSUB: Position 12 is past the end of the string [-Wbuiltin-args] at deprecated-functions.asm(28) error: STRSUB: Incomplete UTF-8 character at deprecated-functions.asm(28) -Assembly aborted with 6 errors! +Assembly aborted with 6 errors diff --git a/test/asm/diff-marks.err b/test/asm/diff-marks.err index 6fc22a9a..e3549f5a 100644 --- a/test/asm/diff-marks.err +++ b/test/asm/diff-marks.err @@ -2,4 +2,4 @@ error: syntax error, unexpected '-' at the beginning of the line (is it a leftov at diff-marks.asm(2) error: syntax error, unexpected '+' at the beginning of the line (is it a leftover diff mark?) at diff-marks.asm(3) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/dots-constant.err b/test/asm/dots-constant.err index 8c64d28d..db626e8f 100644 --- a/test/asm/dots-constant.err +++ b/test/asm/dots-constant.err @@ -1,3 +1,3 @@ error: syntax error, unexpected local label, expecting symbol at dots-constant.asm(2) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/double-purge.err b/test/asm/double-purge.err index 064cca9a..9ee26498 100644 --- a/test/asm/double-purge.err +++ b/test/asm/double-purge.err @@ -1,3 +1,3 @@ error: Undefined symbol `n` was already purged at double-purge.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/ds-bad.err b/test/asm/ds-bad.err index 46f2f0cc..ae90a52c 100644 --- a/test/asm/ds-bad.err +++ b/test/asm/ds-bad.err @@ -2,4 +2,4 @@ error: Expected constant expression: undefined symbol `unknown` at ds-bad.asm(3) warning: Expression must be 8-bit; use `LOW()` to force 8-bit [-Wtruncation] at ds-bad.asm(4) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/empty-raw-identifier.err b/test/asm/empty-raw-identifier.err index 30970164..094d5738 100644 --- a/test/asm/empty-raw-identifier.err +++ b/test/asm/empty-raw-identifier.err @@ -2,4 +2,4 @@ error: Invalid character '?' in bracketed macro argument at empty-raw-identifier.asm::macro(3) <- empty-raw-identifier.asm(5) error: Empty raw symbol in bracketed macro argument at empty-raw-identifier.asm::macro(3) <- empty-raw-identifier.asm(5) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/endsection-in-load.err b/test/asm/endsection-in-load.err index f309480f..c62240bd 100644 --- a/test/asm/endsection-in-load.err +++ b/test/asm/endsection-in-load.err @@ -2,4 +2,4 @@ warning: `LOAD` block without `ENDL` terminated by `ENDSECTION` [-Wunterminated- at endsection-in-load.asm(3) error: Found `ENDL` outside of a `LOAD` block at endsection-in-load.asm(4) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/endsection.err b/test/asm/endsection.err index 46fe7813..69d6997a 100644 --- a/test/asm/endsection.err +++ b/test/asm/endsection.err @@ -1,3 +1,3 @@ error: Cannot output data outside of a `SECTION` at endsection.asm(4) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/error-limit.err b/test/asm/error-limit.err index adab21be..6007b418 100644 --- a/test/asm/error-limit.err +++ b/test/asm/error-limit.err @@ -2,4 +2,4 @@ error: `x` already defined at error-limit.asm(2) and also: at error-limit.asm(1) -Assembly aborted after the maximum of 1 error! (configure with '-X/--max-errors') +Assembly aborted after the maximum of 1 error (configure with '-X/--max-errors') diff --git a/test/asm/error-recovery.err b/test/asm/error-recovery.err index 4c3c2ba4..851da50f 100644 --- a/test/asm/error-recovery.err +++ b/test/asm/error-recovery.err @@ -6,4 +6,4 @@ error: syntax error, unexpected symbol at error-recovery.asm::REPT~2(7) <- error-recovery.asm(5) error: syntax error, unexpected symbol at error-recovery.asm::REPT~3(7) <- error-recovery.asm(5) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/expand-empty-string.err b/test/asm/expand-empty-string.err index f15b9e6d..1889eb1e 100644 --- a/test/asm/expand-empty-string.err +++ b/test/asm/expand-empty-string.err @@ -1,3 +1,3 @@ error: syntax error, unexpected number at expand-empty-string.asm::test(4) <- expand-empty-string.asm(6) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/export.err b/test/asm/export.err index 7f1b85ff..91e83d6e 100644 --- a/test/asm/export.err +++ b/test/asm/export.err @@ -9,4 +9,4 @@ warning: Purging an exported symbol `equ_sym` [-Wpurge] at export.asm(20) warning: Exporting an undefined symbol `equ_sym` [-Wexport-undefined] at export.asm(21) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/ff00+c-bad.err b/test/asm/ff00+c-bad.err index afa2424d..90f40ba0 100644 --- a/test/asm/ff00+c-bad.err +++ b/test/asm/ff00+c-bad.err @@ -4,4 +4,4 @@ error: Expected constant expression: undefined symbol `xyz` at ff00+c-bad.asm(9) error: Base value must be equal to $FF00 for [$FF00+C] at ff00+c-bad.asm(9) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/fixed-oob.err b/test/asm/fixed-oob.err index da0c9788..d7788a2d 100644 --- a/test/asm/fixed-oob.err +++ b/test/asm/fixed-oob.err @@ -12,4 +12,4 @@ error: Section "OAM"'s fixed address $0cab is outside of range [$fe00; $fe9f] at fixed-oob.asm(13) error: Section "HRAM"'s fixed address $0bad is outside of range [$ff80; $fffe] at fixed-oob.asm(15) -Assembly aborted with 7 errors! +Assembly aborted with 7 errors diff --git a/test/asm/fixed-point-precision.err b/test/asm/fixed-point-precision.err index 124cc33d..51ef2195 100644 --- a/test/asm/fixed-point-precision.err +++ b/test/asm/fixed-point-precision.err @@ -2,4 +2,4 @@ error: Fixed-point constant precision must be between 1 and 31 at fixed-point-precision.asm(22) error: Fixed-point constant precision 0 invalid, defaulting to 16 at fixed-point-precision.asm(23) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/for-loop-variable.err b/test/asm/for-loop-variable.err index 367332f5..02255350 100644 --- a/test/asm/for-loop-variable.err +++ b/test/asm/for-loop-variable.err @@ -2,4 +2,4 @@ error: `y` already defined as constant at for-loop-variable.asm(12) and also: at for-loop-variable.asm(8) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/format-truncation.err b/test/asm/format-truncation.err index 34df196f..c41d57f6 100644 --- a/test/asm/format-truncation.err +++ b/test/asm/format-truncation.err @@ -2,4 +2,4 @@ error: Fractional width 260 too long, limiting to 255 at format-truncation.asm(9) error: Fractional width 260 too long, limiting to 255 at format-truncation.asm(15) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/fragment-align.err b/test/asm/fragment-align.err index 2c6f705e..a0fa0a43 100644 --- a/test/asm/fragment-align.err +++ b/test/asm/fragment-align.err @@ -1,3 +1,3 @@ error: Section is misaligned ($0004 bytes into the section, expected ALIGN[2, 0], got ALIGN[2, 1]) at fragment-align.asm(25) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/garbage-before-eof.err b/test/asm/garbage-before-eof.err index e5190e81..2e012c2a 100644 --- a/test/asm/garbage-before-eof.err +++ b/test/asm/garbage-before-eof.err @@ -2,4 +2,4 @@ error: Invalid character 0xEB (is the file UTF-8?) at garbage-before-eof.asm(1) error: syntax error, unexpected end of buffer, expecting ? or symbol at garbage-before-eof.asm(1) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/garbage_char.err b/test/asm/garbage_char.err index 0fe85507..3aa558a3 100644 --- a/test/asm/garbage_char.err +++ b/test/asm/garbage_char.err @@ -1,3 +1,3 @@ error: Invalid character 0xFF (is the file UTF-8?) at garbage_char.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/garbage_sequence.err b/test/asm/garbage_sequence.err index 68612a17..e686e980 100644 --- a/test/asm/garbage_sequence.err +++ b/test/asm/garbage_sequence.err @@ -8,4 +8,4 @@ error: Invalid character '#' at garbage_sequence.asm(3) error: Invalid characters '#', 0xFF (is the file UTF-8?) at garbage_sequence.asm(5) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/impossible-bank.err b/test/asm/impossible-bank.err index 494bbc81..a27d085c 100644 --- a/test/asm/impossible-bank.err +++ b/test/asm/impossible-bank.err @@ -1,3 +1,3 @@ error: `BANK` only allowed for `ROMX`, `WRAMX`, `SRAM`, or `VRAM` sections at impossible-bank.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/incbin-empty-bad.err b/test/asm/incbin-empty-bad.err index 0256f83c..b3ae13b5 100644 --- a/test/asm/incbin-empty-bad.err +++ b/test/asm/incbin-empty-bad.err @@ -1,3 +1,3 @@ error: Specified range in `INCBIN` file "empty.bin" is out of bounds (0 + 1 > 0) at incbin-empty-bad.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/incbin-end-0.err b/test/asm/incbin-end-0.err index 20f65a5c..175da52e 100644 --- a/test/asm/incbin-end-0.err +++ b/test/asm/incbin-end-0.err @@ -1,3 +1,3 @@ error: Cannot output data outside of a `SECTION` at incbin-end-0.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/incbin-end-bad.err b/test/asm/incbin-end-bad.err index c661f4b1..b4f0cf39 100644 --- a/test/asm/incbin-end-bad.err +++ b/test/asm/incbin-end-bad.err @@ -1,3 +1,3 @@ error: Specified range in `INCBIN` file "data.bin" is out of bounds (123 + 1 > 123) at incbin-end-bad.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/incbin-start-bad.err b/test/asm/incbin-start-bad.err index 7ab6332b..f5e8c599 100644 --- a/test/asm/incbin-start-bad.err +++ b/test/asm/incbin-start-bad.err @@ -2,4 +2,4 @@ error: Specified start position is greater than length of file "data.bin" at incbin-start-bad.asm(3) error: Specified start position is greater than length of file "data.bin" at incbin-start-bad.asm(4) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/include-slash.err b/test/asm/include-slash.err index f3d71527..096d3007 100644 --- a/test/asm/include-slash.err +++ b/test/asm/include-slash.err @@ -1,3 +1,3 @@ error: Error opening pre-included file "include-slash-nonexist.inc": No such file or directory at include-slash.asm(0) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/interpolation-after-string.err b/test/asm/interpolation-after-string.err index a9d1f122..3fbd0f44 100644 --- a/test/asm/interpolation-after-string.err +++ b/test/asm/interpolation-after-string.err @@ -4,4 +4,4 @@ error: syntax error, unexpected symbol error: syntax error, unexpected string at interpolation-after-string.asm(8) while expanding symbol `string` -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/interpolation-overflow.err b/test/asm/interpolation-overflow.err index ecf5e7ac..e405878a 100644 --- a/test/asm/interpolation-overflow.err +++ b/test/asm/interpolation-overflow.err @@ -7,4 +7,4 @@ error: `\1` cannot be used outside of a macro at interpolation-overflow.asm(4) error: syntax error, unexpected number at interpolation-overflow.asm(4) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/interpolation.err b/test/asm/interpolation.err index fd049dfa..f1db2d34 100644 --- a/test/asm/interpolation.err +++ b/test/asm/interpolation.err @@ -6,4 +6,4 @@ error: Interpolated symbol `foo` is not a numeric or string symbol at interpolation.asm(29) error: Interpolated symbol `xor` is a reserved keyword; add a '#' prefix to use it as a raw symbol at interpolation.asm(32) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/invalid-alignment.err b/test/asm/invalid-alignment.err index 70edf6a4..eb12a186 100644 --- a/test/asm/invalid-alignment.err +++ b/test/asm/invalid-alignment.err @@ -12,4 +12,4 @@ error: Section "e"'s fixed address does not match its alignment at invalid-alignment.asm(21) error: Section "f"'s fixed address does not match its alignment at invalid-alignment.asm(23) -Assembly aborted with 7 errors! +Assembly aborted with 7 errors diff --git a/test/asm/invalid-bank.err b/test/asm/invalid-bank.err index bb87c8fd..8a634339 100644 --- a/test/asm/invalid-bank.err +++ b/test/asm/invalid-bank.err @@ -1,3 +1,3 @@ error: VRAM bank value $0002 out of range ($0000 to $0001) at invalid-bank.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/invalid-empty-macro-arg.err b/test/asm/invalid-empty-macro-arg.err index 79dcd358..21b45810 100644 --- a/test/asm/invalid-empty-macro-arg.err +++ b/test/asm/invalid-empty-macro-arg.err @@ -1,3 +1,3 @@ error: Empty bracketed macro argument at invalid-empty-macro-arg.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/invalid-format.err b/test/asm/invalid-format.err index 3a63fb62..b62c621b 100644 --- a/test/asm/invalid-format.err +++ b/test/asm/invalid-format.err @@ -30,4 +30,4 @@ error: Formatting type 'd' with fractional width at invalid-format.asm(17) error: Formatting type 'd' with fractional precision at invalid-format.asm(18) -Assembly aborted with 16 errors! +Assembly aborted with 16 errors diff --git a/test/asm/invalid-instructions.err b/test/asm/invalid-instructions.err index d0ac524a..7e499ca0 100644 --- a/test/asm/invalid-instructions.err +++ b/test/asm/invalid-instructions.err @@ -32,4 +32,4 @@ error: syntax error, unexpected af at invalid-instructions.asm(20) error: syntax error, unexpected af at invalid-instructions.asm(21) -Assembly aborted with 16 errors! +Assembly aborted with 16 errors diff --git a/test/asm/invalid-jr.err b/test/asm/invalid-jr.err index 9f0b7dd9..90f84fa0 100644 --- a/test/asm/invalid-jr.err +++ b/test/asm/invalid-jr.err @@ -1,3 +1,3 @@ error: `JR` target must be between -128 and 127 bytes away, not -258; use `JP` instead at invalid-jr.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/invalid-ldh.err b/test/asm/invalid-ldh.err index 7367e045..6972d676 100644 --- a/test/asm/invalid-ldh.err +++ b/test/asm/invalid-ldh.err @@ -2,4 +2,4 @@ error: Source address $11 not between $FF00 to $FFFF at invalid-ldh.asm(2) error: Source address $22 not between $FF00 to $FFFF at invalid-ldh.asm(3) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/invalid-macro-arg-character.err b/test/asm/invalid-macro-arg-character.err index 97337f70..a794235a 100644 --- a/test/asm/invalid-macro-arg-character.err +++ b/test/asm/invalid-macro-arg-character.err @@ -2,4 +2,4 @@ error: Invalid character '!' in bracketed macro argument at invalid-macro-arg-character.asm(1) error: syntax error, unexpected > at invalid-macro-arg-character.asm(1) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/invalid-macro-arg-symbol.err b/test/asm/invalid-macro-arg-symbol.err index e80de369..2aa6bb51 100644 --- a/test/asm/invalid-macro-arg-symbol.err +++ b/test/asm/invalid-macro-arg-symbol.err @@ -1,3 +1,3 @@ error: Bracketed symbol `foo` does not exist at invalid-macro-arg-symbol.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/invalid-numbers.err b/test/asm/invalid-numbers.err index 1fb75cc6..853cf0ea 100644 --- a/test/asm/invalid-numbers.err +++ b/test/asm/invalid-numbers.err @@ -24,4 +24,4 @@ error: Invalid fixed-point constant, no significant digits after 'q' at invalid-numbers.asm::try(2) <- invalid-numbers.asm(26) error: Fixed-point constant precision must be between 1 and 31 at invalid-numbers.asm::try(2) <- invalid-numbers.asm(29) -Assembly aborted with 7 errors! +Assembly aborted with 7 errors diff --git a/test/asm/invalid-opt.err b/test/asm/invalid-opt.err index 9a4029b0..14bd1210 100644 --- a/test/asm/invalid-opt.err +++ b/test/asm/invalid-opt.err @@ -36,4 +36,4 @@ error: syntax error, unexpected end of line, expecting string at invalid-opt.asm(18) error: No entries in the option stack at invalid-opt.asm(19) -Assembly aborted with 19 errors! +Assembly aborted with 19 errors diff --git a/test/asm/invalid-underscore.err b/test/asm/invalid-underscore.err index 5f7199ac..863df40b 100644 --- a/test/asm/invalid-underscore.err +++ b/test/asm/invalid-underscore.err @@ -28,4 +28,4 @@ error: Invalid integer constant, trailing '_' at invalid-underscore.asm(31) error: Invalid integer constant, '_' after another '_' at invalid-underscore.asm(32) -Assembly aborted with 15 errors! +Assembly aborted with 15 errors diff --git a/test/asm/invalid-union.err b/test/asm/invalid-union.err index c2621baa..018b13aa 100644 --- a/test/asm/invalid-union.err +++ b/test/asm/invalid-union.err @@ -6,4 +6,4 @@ error: `UNION`s must be inside a `SECTION` at invalid-union.asm(3) error: Unterminated `UNION` construct at invalid-union.asm(7) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/invalid-utf-8-strings.err b/test/asm/invalid-utf-8-strings.err index 56c542b3..9b66e311 100644 --- a/test/asm/invalid-utf-8-strings.err +++ b/test/asm/invalid-utf-8-strings.err @@ -56,4 +56,4 @@ error: STRLEN: Incomplete UTF-8 character at invalid-utf-8-strings.asm(50) error: STRSLICE: Incomplete UTF-8 character at invalid-utf-8-strings.asm(54) -Assembly aborted with 29 errors! +Assembly aborted with 29 errors diff --git a/test/asm/invalid-utf-8.err b/test/asm/invalid-utf-8.err index 439405e1..835e3968 100644 --- a/test/asm/invalid-utf-8.err +++ b/test/asm/invalid-utf-8.err @@ -1,3 +1,3 @@ error: Invalid characters 0xCF, 0xD3 (is the file UTF-8?) at invalid-utf-8.asm::m(4) <- invalid-utf-8.asm(6) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/isconst.err b/test/asm/isconst.err index 241bdd8f..01297042 100644 --- a/test/asm/isconst.err +++ b/test/asm/isconst.err @@ -10,4 +10,4 @@ error: Expected constant expression: `FloatingLabel` is not constant at assembly at isconst.asm::test_expr(9) <- isconst.asm(28) warning: Test #6: Compile-time constant [-Wuser] at isconst.asm::test_expr(10) <- isconst.asm(29) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/keyword-global.err b/test/asm/keyword-global.err index 10476a17..99f43245 100644 --- a/test/asm/keyword-global.err +++ b/test/asm/keyword-global.err @@ -1,3 +1,3 @@ error: Identifier "call.local2" begins with a keyword; did you mean to put a space between them? at keyword-global.asm(3) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/label-diff.err b/test/asm/label-diff.err index 4c19e4e4..5f6924eb 100644 --- a/test/asm/label-diff.err +++ b/test/asm/label-diff.err @@ -34,4 +34,4 @@ error: Expected constant expression: undefined symbol `Unknown` at label-diff.asm::print_diff(19) <- label-diff.asm(58) error: Expected constant expression: PC is not constant at assembly time at label-diff.asm::print_diff(20) <- label-diff.asm(58) -Assembly aborted with 18 errors! +Assembly aborted with 18 errors diff --git a/test/asm/label-macro-arg.err b/test/asm/label-macro-arg.err index 137113c1..1ad79c46 100644 --- a/test/asm/label-macro-arg.err +++ b/test/asm/label-macro-arg.err @@ -14,4 +14,4 @@ error: Invalid format spec "sizeof_" at label-macro-arg.asm::test_char(29) <- label-macro-arg.asm(39) error: Interpolated symbol `something` does not exist at label-macro-arg.asm::test_char(29) <- label-macro-arg.asm(39) -Assembly aborted with 7 errors! +Assembly aborted with 7 errors diff --git a/test/asm/label-outside-section.err b/test/asm/label-outside-section.err index 6d2b0e47..9d511be9 100644 --- a/test/asm/label-outside-section.err +++ b/test/asm/label-outside-section.err @@ -1,3 +1,3 @@ error: Label `bad` created outside of a `SECTION` at label-outside-section.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/label-redefinition.err b/test/asm/label-redefinition.err index 8a331bf3..9bcd3a0b 100644 --- a/test/asm/label-redefinition.err +++ b/test/asm/label-redefinition.err @@ -2,4 +2,4 @@ error: `Sym` already defined at label-redefinition.asm(7) and also: at label-redefinition.asm::m(4) <- label-redefinition.asm(6) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/label-scope.err b/test/asm/label-scope.err index 3075c3d1..085ca967 100644 --- a/test/asm/label-scope.err +++ b/test/asm/label-scope.err @@ -38,4 +38,4 @@ warning: Treating strings as numbers is deprecated; use character literals or `C at label-scope.asm(32) error: Strings as numbers must be a single charmap unit at label-scope.asm(32) -Assembly aborted with 18 errors! +Assembly aborted with 18 errors diff --git a/test/asm/lex-label.err b/test/asm/lex-label.err index c641a29b..c3b8f739 100644 --- a/test/asm/lex-label.err +++ b/test/asm/lex-label.err @@ -10,4 +10,4 @@ error: syntax error, unexpected ENDR at lex-label.asm(7) error: syntax error, unexpected label, expecting symbol at lex-label.asm(9) -Assembly aborted with 6 errors! +Assembly aborted with 6 errors diff --git a/test/asm/lexer-hack.err b/test/asm/lexer-hack.err index bce134ab..4d7ef6d1 100644 --- a/test/asm/lexer-hack.err +++ b/test/asm/lexer-hack.err @@ -8,4 +8,4 @@ error: Undefined macro `undef` (did you mean a label "undef:"?) at lexer-hack.asm(27) error: Undefined macro `undef` (did you mean a label "undef::"?) at lexer-hack.asm(28) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/line-continuation-at-eof.err b/test/asm/line-continuation-at-eof.err index a550b98c..73235c81 100644 --- a/test/asm/line-continuation-at-eof.err +++ b/test/asm/line-continuation-at-eof.err @@ -1,3 +1,3 @@ error: Invalid line continuation at end of file at line-continuation-at-eof.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/line-continuation-block-comment.err b/test/asm/line-continuation-block-comment.err index 54664409..7c502577 100644 --- a/test/asm/line-continuation-block-comment.err +++ b/test/asm/line-continuation-block-comment.err @@ -10,4 +10,4 @@ error: Invalid character '/' after line continuation at line-continuation-block-comment.asm(14) error: Invalid character '/' after line continuation at line-continuation-block-comment.asm(17) -Assembly aborted with 6 errors! +Assembly aborted with 6 errors diff --git a/test/asm/line-continuation-whitespace.err b/test/asm/line-continuation-whitespace.err index 3b09e6e6..45dd5edc 100644 --- a/test/asm/line-continuation-whitespace.err +++ b/test/asm/line-continuation-whitespace.err @@ -1,3 +1,3 @@ error: Label `foo` created outside of a `SECTION` at line-continuation-whitespace.asm(7) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/line-continuation.err b/test/asm/line-continuation.err index 625cfd60..2a056973 100644 --- a/test/asm/line-continuation.err +++ b/test/asm/line-continuation.err @@ -4,4 +4,4 @@ warning: spam [-Wuser] at line-continuation.asm::spam(4) <- line-continuation.asm(6) error: Label `foo` created outside of a `SECTION` at line-continuation.asm(14) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/load-in-load.err b/test/asm/load-in-load.err index 4d204dc1..db1d6abb 100644 --- a/test/asm/load-in-load.err +++ b/test/asm/load-in-load.err @@ -2,4 +2,4 @@ warning: `LOAD` block without `ENDL` terminated by `LOAD` [-Wunterminated-load] at load-in-load.asm(3) error: Found `ENDL` outside of a `LOAD` block at load-in-load.asm(5) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/load-overflow.err b/test/asm/load-overflow.err index cbc54605..18439fdc 100644 --- a/test/asm/load-overflow.err +++ b/test/asm/load-overflow.err @@ -12,4 +12,4 @@ error: Section "hmm" grew too big (max size = 0x2000 bytes, reached 0x4000) at load-overflow.asm(26) error: Section "lol" grew too big (max size = 0x2000 bytes, reached 0x3000) at load-overflow.asm(26) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/load-rom.err b/test/asm/load-rom.err index 0dc51725..39bd94c2 100644 --- a/test/asm/load-rom.err +++ b/test/asm/load-rom.err @@ -2,4 +2,4 @@ error: `LOAD` blocks cannot create a ROM section at load-rom.asm(3) error: Found `ENDL` outside of a `LOAD` block at load-rom.asm(5) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/local-purge.err b/test/asm/local-purge.err index 11d0ab19..3fced248 100644 --- a/test/asm/local-purge.err +++ b/test/asm/local-purge.err @@ -2,4 +2,4 @@ warning: Purging a label `.loc` [-Wpurge] at local-purge.asm(7) error: Interpolated symbol `.loc` does not exist; it was purged at local-purge.asm(8) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/macro-@.err b/test/asm/macro-@.err index a64d6c54..bdc08941 100644 --- a/test/asm/macro-@.err +++ b/test/asm/macro-@.err @@ -2,4 +2,4 @@ error: Label `foo` created outside of a `SECTION` at macro-@.asm(1) error: `@` is not a macro at macro-@.asm(1) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/macro-arg-0.err b/test/asm/macro-arg-0.err index a04fff6f..2ea65df8 100644 --- a/test/asm/macro-arg-0.err +++ b/test/asm/macro-arg-0.err @@ -2,4 +2,4 @@ error: Invalid character '0' after line continuation at macro-arg-0.asm::m(2) <- macro-arg-0.asm(5) error: Invalid bracketed macro argument "\<0>" at macro-arg-0.asm::m(3) <- macro-arg-0.asm(5) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/macro-arg-illegal-escape.err b/test/asm/macro-arg-illegal-escape.err index 5700ea8c..07056832 100644 --- a/test/asm/macro-arg-illegal-escape.err +++ b/test/asm/macro-arg-illegal-escape.err @@ -2,4 +2,4 @@ error: Illegal character escape 'w' at macro-arg-illegal-escape.asm(5) error: Illegal character escape '\' at end of input at macro-arg-illegal-escape.asm(5) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/macro-arg-in-string.err b/test/asm/macro-arg-in-string.err index 13d0f04b..e189305d 100644 --- a/test/asm/macro-arg-in-string.err +++ b/test/asm/macro-arg-in-string.err @@ -1,3 +1,3 @@ error: Illegal character escape '!' at macro-arg-in-string.asm(12) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/macro-arg-recursion.err b/test/asm/macro-arg-recursion.err index 009ffe42..46b66db3 100644 --- a/test/asm/macro-arg-recursion.err +++ b/test/asm/macro-arg-recursion.err @@ -1,3 +1,3 @@ error: Invalid character '2' after line continuation at macro-arg-recursion.asm::m(2) <- macro-arg-recursion.asm(6) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/macro-args-outside-macro.err b/test/asm/macro-args-outside-macro.err index 8433662e..d8c9dafd 100644 --- a/test/asm/macro-args-outside-macro.err +++ b/test/asm/macro-args-outside-macro.err @@ -4,4 +4,4 @@ error: `\<2>` cannot be used outside of a macro at macro-args-outside-macro.asm(2) error: `\#` cannot be used outside of a macro at macro-args-outside-macro.asm(3) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/macro-syntax.err b/test/asm/macro-syntax.err index dc470d0b..04c2fcdc 100644 --- a/test/asm/macro-syntax.err +++ b/test/asm/macro-syntax.err @@ -8,4 +8,4 @@ error: syntax error, unexpected ENDM at macro-syntax.asm(9) error: `old` is not a macro at macro-syntax.asm(11) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/max-errors.err b/test/asm/max-errors.err index 99b859ab..f550d9e6 100644 --- a/test/asm/max-errors.err +++ b/test/asm/max-errors.err @@ -1,3 +1,3 @@ error: Expected constant expression: PC is not constant at assembly time at max-errors.asm(3) -Assembly aborted after the maximum of 1 error! (configure with '-X/--max-errors') +Assembly aborted after the maximum of 1 error (configure with '-X/--max-errors') diff --git a/test/asm/multi-line-strings.err b/test/asm/multi-line-strings.err index d39c7cb2..13935d35 100644 --- a/test/asm/multi-line-strings.err +++ b/test/asm/multi-line-strings.err @@ -2,4 +2,4 @@ error: Unterminated string at multi-line-strings.asm(23) warning: check the line number [-Wuser] at multi-line-strings.asm(35) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/multiple-charmaps.err b/test/asm/multiple-charmaps.err index 0f927036..aaa3ede3 100644 --- a/test/asm/multiple-charmaps.err +++ b/test/asm/multiple-charmaps.err @@ -18,4 +18,4 @@ error: Undefined charmap `map5` at multiple-charmaps.asm::set_(15) <- multiple-charmaps.asm(108) error: No entries in the charmap stack at multiple-charmaps.asm::pop_(30) <- multiple-charmaps.asm(110) -Assembly aborted with 9 errors! +Assembly aborted with 9 errors diff --git a/test/asm/negative-macro-args.err b/test/asm/negative-macro-args.err index 6c98698e..c6ad7131 100644 --- a/test/asm/negative-macro-args.err +++ b/test/asm/negative-macro-args.err @@ -23,4 +23,4 @@ error: Number in bracketed macro argument is too large error: Number in bracketed macro argument is too large at negative-macro-args.asm::mac(18) <- negative-macro-args.asm(21) while expanding symbol `i` -Assembly aborted with 11 errors! +Assembly aborted with 11 errors diff --git a/test/asm/nested-bad-interpolation.err b/test/asm/nested-bad-interpolation.err index 519603a4..6ab37d81 100644 --- a/test/asm/nested-bad-interpolation.err +++ b/test/asm/nested-bad-interpolation.err @@ -14,4 +14,4 @@ error: Interpolated symbol `` does not exist at nested-bad-interpolation.asm(3) error: Character literals must be a single charmap unit at nested-bad-interpolation.asm(3) -Assembly aborted with 8 errors! +Assembly aborted with 8 errors diff --git a/test/asm/nested-brackets.err b/test/asm/nested-brackets.err index d48b1631..b5fbc276 100644 --- a/test/asm/nested-brackets.err +++ b/test/asm/nested-brackets.err @@ -1,3 +1,3 @@ error: Missing '}' at nested-brackets.asm(5) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/nested-expansions.err b/test/asm/nested-expansions.err index bb9d2927..ab65ebd9 100644 --- a/test/asm/nested-expansions.err +++ b/test/asm/nested-expansions.err @@ -1,3 +1,3 @@ error: Undefined macro `qux` at nested-expansions.asm::test(4) <- nested-expansions.asm(6) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/nested-macrodef.err b/test/asm/nested-macrodef.err index f9daecc3..39ced51c 100644 --- a/test/asm/nested-macrodef.err +++ b/test/asm/nested-macrodef.err @@ -4,4 +4,4 @@ error: Unterminated macro definition at nested-macrodef.asm::outer(24) <- nested-macrodef.asm(26) error: Undefined macro `inner` at nested-macrodef.asm(27) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/non-numeric-symbol.err b/test/asm/non-numeric-symbol.err index 8e8d8518..e918e1d0 100644 --- a/test/asm/non-numeric-symbol.err +++ b/test/asm/non-numeric-symbol.err @@ -10,4 +10,4 @@ error: `mac` is not a numeric symbol at non-numeric-symbol.asm(10) error: `mac` is not a numeric symbol at non-numeric-symbol.asm(11) -Assembly aborted with 6 errors! +Assembly aborted with 6 errors diff --git a/test/asm/nonexist-include.err b/test/asm/nonexist-include.err index e5e7e6b4..541a3c9d 100644 --- a/test/asm/nonexist-include.err +++ b/test/asm/nonexist-include.err @@ -1,3 +1,3 @@ error: Error opening `INCLUDE` file "nonexist-include.inc": No such file or directory at nonexist-include.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/nonexist-preinclude.err b/test/asm/nonexist-preinclude.err index 878e47e0..fc051a3c 100644 --- a/test/asm/nonexist-preinclude.err +++ b/test/asm/nonexist-preinclude.err @@ -2,4 +2,4 @@ error: Error opening pre-included file "nonexistent-pre.inc": No such file or di at nonexist-preinclude.asm(0) error: Error opening `INCLUDE` file "nonexist-include.inc": No such file or directory at nonexist-preinclude.asm(1) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/null-in-macro.err b/test/asm/null-in-macro.err index 549e446b..e8faf9bf 100644 --- a/test/asm/null-in-macro.err +++ b/test/asm/null-in-macro.err @@ -1,3 +1,3 @@ error: Invalid character '\0' (is the file UTF-8?) at null-in-macro.asm::foo(2) <- null-in-macro.asm(4) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/null-outside-string.err b/test/asm/null-outside-string.err index ef21c288..843201c9 100644 --- a/test/asm/null-outside-string.err +++ b/test/asm/null-outside-string.err @@ -14,4 +14,4 @@ error: Invalid character 'X' after line continuation at null-outside-string.asm(7) error: syntax error, unexpected symbol at null-outside-string.asm(7) -Assembly aborted with 8 errors! +Assembly aborted with 8 errors diff --git a/test/asm/opt-Q.err b/test/asm/opt-Q.err index ca6f9852..5fd0efd2 100644 --- a/test/asm/opt-Q.err +++ b/test/asm/opt-Q.err @@ -2,4 +2,4 @@ error: Argument for option 'Q' must be between 1 and 31 at opt-Q.asm::test(3) <- opt-Q.asm(17) error: Argument for option 'Q' must be between 1 and 31 at opt-Q.asm::test(3) <- opt-Q.asm(18) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/pc-bank.err b/test/asm/pc-bank.err index 065979ad..0210f741 100644 --- a/test/asm/pc-bank.err +++ b/test/asm/pc-bank.err @@ -2,4 +2,4 @@ error: Source address $2a00 not between $FF00 to $FFFF at pc-bank.asm(2) error: Expected constant expression: Current section's bank is not known at pc-bank.asm(11) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/pops-restore-no-section.err b/test/asm/pops-restore-no-section.err index a5ea5097..89cffd98 100644 --- a/test/asm/pops-restore-no-section.err +++ b/test/asm/pops-restore-no-section.err @@ -2,4 +2,4 @@ error: Label `DisallowedContent` created outside of a `SECTION` at pops-restore-no-section.asm(9) error: Cannot output data outside of a `SECTION` at pops-restore-no-section.asm(10) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/purge-ref.err b/test/asm/purge-ref.err index 8c31f4a3..a93982d4 100644 --- a/test/asm/purge-ref.err +++ b/test/asm/purge-ref.err @@ -8,4 +8,4 @@ error: Symbol `EvenLessOK` is referenced and thus cannot be purged at purge-ref.asm(15) warning: Purging a label `Maybe` [-Wpurge] at purge-ref.asm(23) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/purge-refs.err b/test/asm/purge-refs.err index a6b501b3..5430926e 100644 --- a/test/asm/purge-refs.err +++ b/test/asm/purge-refs.err @@ -2,4 +2,4 @@ error: Symbol `Floating` is referenced and thus cannot be purged at purge-refs.asm(6) warning: Purging a label `Fixed` [-Wpurge] at purge-refs.asm(13) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/purge.err b/test/asm/purge.err index fc772e81..a2550b6f 100644 --- a/test/asm/purge.err +++ b/test/asm/purge.err @@ -6,4 +6,4 @@ warning: Purging an exported symbol `Exported` [-Wpurge] at purge.asm(12) error: Undefined symbol `Undefined` at purge.asm(15) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/pushs.err b/test/asm/pushs.err index c46d4f27..b75078c2 100644 --- a/test/asm/pushs.err +++ b/test/asm/pushs.err @@ -1,3 +1,3 @@ error: Cannot output data outside of a `SECTION` at pushs.asm(5) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/raw-macro-args.err b/test/asm/raw-macro-args.err index 79f334c5..dfb7aa74 100644 --- a/test/asm/raw-macro-args.err +++ b/test/asm/raw-macro-args.err @@ -6,4 +6,4 @@ error: Unterminated string at raw-macro-args.asm(37) error: Unterminated string at raw-macro-args.asm(38) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/raw-string-symbol-errors.err b/test/asm/raw-string-symbol-errors.err index 3b420521..9e8fcb1b 100644 --- a/test/asm/raw-string-symbol-errors.err +++ b/test/asm/raw-string-symbol-errors.err @@ -28,4 +28,4 @@ error: Undefined symbol `s` was already purged at raw-string-symbol-errors.asm(27) error: `s` is not a string symbol at raw-string-symbol-errors.asm(29) -Assembly aborted with 13 errors! +Assembly aborted with 13 errors diff --git a/test/asm/readfile-nonexist.err b/test/asm/readfile-nonexist.err index b4aaa02d..c3b660f4 100644 --- a/test/asm/readfile-nonexist.err +++ b/test/asm/readfile-nonexist.err @@ -1,3 +1,3 @@ error: Error opening `READFILE` file "readfile-nonexist.inc": No such file or directory at readfile-nonexist.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/redef-equ.err b/test/asm/redef-equ.err index cffd23ae..301e766c 100644 --- a/test/asm/redef-equ.err +++ b/test/asm/redef-equ.err @@ -2,4 +2,4 @@ error: `N` already defined as non-`EQU` (should it be {interpolated} to define i at redef-equ.asm(25) and also: at redef-equ.asm(24) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/redef-equs.err b/test/asm/redef-equs.err index 51204f7a..5c06d414 100644 --- a/test/asm/redef-equs.err +++ b/test/asm/redef-equs.err @@ -2,4 +2,4 @@ error: `N` already defined as non-`EQUS` at redef-equs.asm(25) and also: at redef-equs.asm(24) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/ref-override-bad.err b/test/asm/ref-override-bad.err index 18c46a49..29a75396 100644 --- a/test/asm/ref-override-bad.err +++ b/test/asm/ref-override-bad.err @@ -6,4 +6,4 @@ error: `Y` already referenced at ref-override-bad.asm(13) and also: at ref-override-bad.asm(10) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/reference-undefined-equs.err b/test/asm/reference-undefined-equs.err index 746a6504..14b3b876 100644 --- a/test/asm/reference-undefined-equs.err +++ b/test/asm/reference-undefined-equs.err @@ -6,4 +6,4 @@ error: `s2` already referenced at reference-undefined-equs.asm(5) and also: at reference-undefined-equs.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/rept-shift.err b/test/asm/rept-shift.err index b5defc36..fad0d4a5 100644 --- a/test/asm/rept-shift.err +++ b/test/asm/rept-shift.err @@ -4,4 +4,4 @@ warning: Cannot shift macro arguments past their end [-Wmacro-shift] at rept-shift.asm::m(11) <- rept-shift.asm(15) error: Macro argument `\1` not defined at rept-shift.asm::m(12) <- rept-shift.asm(15) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/rept-trace.err b/test/asm/rept-trace.err index 591df309..48eaaa28 100644 --- a/test/asm/rept-trace.err +++ b/test/asm/rept-trace.err @@ -14,4 +14,4 @@ error: Assertion failed <- rept-trace.asm::REPT~4::REPT~3(6) <- rept-trace.asm::REPT~4(4) <- rept-trace.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/revchar.err b/test/asm/revchar.err index 49e393cc..b0c0d26d 100644 --- a/test/asm/revchar.err +++ b/test/asm/revchar.err @@ -2,4 +2,4 @@ error: REVCHAR: Multiple character mappings to values at revchar.asm::test(13) <- revchar.asm(22) error: REVCHAR: No character mapping to values at revchar.asm::test(13) <- revchar.asm(23) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/rs-overwrite.err b/test/asm/rs-overwrite.err index 65ecd62e..a3039656 100644 --- a/test/asm/rs-overwrite.err +++ b/test/asm/rs-overwrite.err @@ -8,4 +8,4 @@ error: `_RS` already defined as built-in non-`EQU` at rs-overwrite.asm(16) error: `_RS` already defined as built-in non-`EQUS` at rs-overwrite.asm(19) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/section-align-large-ofs.err b/test/asm/section-align-large-ofs.err index 99f7161d..bc70b74d 100644 --- a/test/asm/section-align-large-ofs.err +++ b/test/asm/section-align-large-ofs.err @@ -1,3 +1,3 @@ error: The absolute alignment offset (99) must be less than alignment size (4) at section-align-large-ofs.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/section-in-load.err b/test/asm/section-in-load.err index 12666300..48d05974 100644 --- a/test/asm/section-in-load.err +++ b/test/asm/section-in-load.err @@ -2,4 +2,4 @@ warning: `LOAD` block without `ENDL` terminated by `SECTION` [-Wunterminated-loa at section-in-load.asm(3) error: Found `ENDL` outside of a `LOAD` block at section-in-load.asm(4) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/section-sizeof-startof.err b/test/asm/section-sizeof-startof.err index 09e97c60..8dd496ce 100644 --- a/test/asm/section-sizeof-startof.err +++ b/test/asm/section-sizeof-startof.err @@ -8,4 +8,4 @@ error: Expected constant expression: Section "sect2"'s start is not known at section-sizeof-startof.asm(23) error: Expected constant expression: Section "sect3"'s size is not known at section-sizeof-startof.asm(30) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/section-union-data.err b/test/asm/section-union-data.err index 41989c98..ab4e300e 100644 --- a/test/asm/section-union-data.err +++ b/test/asm/section-union-data.err @@ -2,4 +2,4 @@ error: Cannot declare ROM sections as `UNION` at section-union-data.asm(1) error: Cannot output data outside of a `SECTION` at section-union-data.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/shift-outside-macro.err b/test/asm/shift-outside-macro.err index 6a62d540..2d0f632f 100644 --- a/test/asm/shift-outside-macro.err +++ b/test/asm/shift-outside-macro.err @@ -2,4 +2,4 @@ error: Cannot shift macro arguments outside of a macro at shift-outside-macro.asm(1) error: Cannot shift macro arguments outside of a macro at shift-outside-macro.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/skip-expansions.err b/test/asm/skip-expansions.err index 523300b3..15787663 100644 --- a/test/asm/skip-expansions.err +++ b/test/asm/skip-expansions.err @@ -4,4 +4,4 @@ error: syntax error, unexpected ( at skip-expansions.asm::mac2(21) <- skip-expansions.asm(31) error: Macro argument `\2` not defined at skip-expansions.asm::mac2(21) <- skip-expansions.asm(31) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/strfmt.err b/test/asm/strfmt.err index 069069b3..d1d22ca6 100644 --- a/test/asm/strfmt.err +++ b/test/asm/strfmt.err @@ -8,4 +8,4 @@ error: STRFMT: Invalid format spec for argument 1 at strfmt.asm(26) error: STRFMT: Not enough arguments for format spec (expected 3, got 1) at strfmt.asm(28) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/string-concat.err b/test/asm/string-concat.err index 4535d7d7..437282a5 100644 --- a/test/asm/string-concat.err +++ b/test/asm/string-concat.err @@ -2,4 +2,4 @@ error: syntax error, unexpected ++ at string-concat.asm(25) error: syntax error, unexpected ++, expecting ] or + or - at string-concat.asm(26) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/string-literal-macro-arg.err b/test/asm/string-literal-macro-arg.err index b17a76c8..609a11fa 100644 --- a/test/asm/string-literal-macro-arg.err +++ b/test/asm/string-literal-macro-arg.err @@ -6,4 +6,4 @@ error: Unterminated string at string-literal-macro-arg.asm(11) error: Unterminated string at string-literal-macro-arg.asm::mac(4) <- string-literal-macro-arg.asm(11) -Assembly aborted with 4 errors! +Assembly aborted with 4 errors diff --git a/test/asm/suggest-def.err b/test/asm/suggest-def.err index 9cb65974..fa2007a9 100644 --- a/test/asm/suggest-def.err +++ b/test/asm/suggest-def.err @@ -16,4 +16,4 @@ error: Undefined macro `label` (did you mean a label "label:"?) at suggest-def.asm(9) error: Undefined macro `exported` (did you mean a label "exported::"?) at suggest-def.asm(10) -Assembly aborted with 9 errors! +Assembly aborted with 9 errors diff --git a/test/asm/sym-collision.err b/test/asm/sym-collision.err index 0bec8533..ca6dfd47 100644 --- a/test/asm/sym-collision.err +++ b/test/asm/sym-collision.err @@ -2,4 +2,4 @@ warning: Purging a label `dork` [-Wpurge] at sym-collision.asm(20) error: Interpolated symbol `dork` does not exist; it was purged at sym-collision.asm(25) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/symbol-invalid-macro-arg.err b/test/asm/symbol-invalid-macro-arg.err index 5061d07a..b383eec1 100644 --- a/test/asm/symbol-invalid-macro-arg.err +++ b/test/asm/symbol-invalid-macro-arg.err @@ -1,3 +1,3 @@ error: Invalid bracketed macro argument "\<0>" at symbol-invalid-macro-arg.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/symbol-override.err b/test/asm/symbol-override.err index 826543fd..aa5eed37 100644 --- a/test/asm/symbol-override.err +++ b/test/asm/symbol-override.err @@ -10,4 +10,4 @@ error: `Y` already defined as label at symbol-override.asm(14) and also: at symbol-override.asm(13) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/syntax-error-after-syntax-error.err b/test/asm/syntax-error-after-syntax-error.err index b19c7c6b..18d0718f 100644 --- a/test/asm/syntax-error-after-syntax-error.err +++ b/test/asm/syntax-error-after-syntax-error.err @@ -8,4 +8,4 @@ error: syntax error, unexpected : at syntax-error-after-syntax-error.asm(9) error: syntax error, unexpected stop, expecting end of line or end of buffer or end of fragment literal or :: at syntax-error-after-syntax-error.asm(10) -Assembly aborted with 5 errors! +Assembly aborted with 5 errors diff --git a/test/asm/syntax-error-eof-newline.err b/test/asm/syntax-error-eof-newline.err index 7a69a90d..7403b66c 100644 --- a/test/asm/syntax-error-eof-newline.err +++ b/test/asm/syntax-error-eof-newline.err @@ -1,3 +1,3 @@ error: syntax error, unexpected end of line at syntax-error-eof-newline.inc(1) <- syntax-error-eof-newline.asm(5) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/syntax-error-lexer-mode.err b/test/asm/syntax-error-lexer-mode.err index ba19c30e..1ff695be 100644 --- a/test/asm/syntax-error-lexer-mode.err +++ b/test/asm/syntax-error-lexer-mode.err @@ -2,4 +2,4 @@ error: syntax error, unexpected af at syntax-error-lexer-mode.asm(7) error: syntax error, unexpected af, expecting symbol at syntax-error-lexer-mode.asm(11) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/syntax-error.err b/test/asm/syntax-error.err index 74f5726e..3c9df294 100644 --- a/test/asm/syntax-error.err +++ b/test/asm/syntax-error.err @@ -1,3 +1,3 @@ error: syntax error, unexpected a at syntax-error.asm(2) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/undefined-builtins.err b/test/asm/undefined-builtins.err index d266d8b3..4ec1169d 100644 --- a/test/asm/undefined-builtins.err +++ b/test/asm/undefined-builtins.err @@ -18,4 +18,4 @@ error: `_NARG` has no value outside of a macro at undefined-builtins.asm(23) error: Interpolated symbol `_NARG` does not exist at undefined-builtins.asm(24) -Assembly aborted with 10 errors! +Assembly aborted with 10 errors diff --git a/test/asm/undefined-opt.err b/test/asm/undefined-opt.err index 6a0103fa..9f9f8cb7 100644 --- a/test/asm/undefined-opt.err +++ b/test/asm/undefined-opt.err @@ -1,3 +1,3 @@ error: Unknown option 'x' at undefined-opt.asm(1) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/union-in-rom.err b/test/asm/union-in-rom.err index 38036790..0a77db46 100644 --- a/test/asm/union-in-rom.err +++ b/test/asm/union-in-rom.err @@ -2,4 +2,4 @@ error: Cannot use `UNION` inside of `ROM0` or `ROMX` sections at union-in-rom.asm(2) error: Found `ENDU` outside of a `UNION` construct at union-in-rom.asm(3) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/asm/unique-id.err b/test/asm/unique-id.err index 8bde0ad0..3dd9ac1e 100644 --- a/test/asm/unique-id.err +++ b/test/asm/unique-id.err @@ -29,4 +29,4 @@ error: `\@` cannot be used outside of a macro or loop (`REPT`/`FOR` block) while expanding symbol `warn_unique` warning: ! [-Wuser] at unique-id.asm(15) -Assembly aborted with 3 errors! +Assembly aborted with 3 errors diff --git a/test/asm/unterminated-rept.err b/test/asm/unterminated-rept.err index cc5dcbb9..1947d2c2 100644 --- a/test/asm/unterminated-rept.err +++ b/test/asm/unterminated-rept.err @@ -1,3 +1,3 @@ error: Unterminated loop (`REPT`/`FOR` block) at unterminated-rept.asm(2) -Assembly aborted with 1 error! +Assembly aborted with 1 error diff --git a/test/asm/use-label-outside-section.err b/test/asm/use-label-outside-section.err index 0f989c5a..8b73984e 100644 --- a/test/asm/use-label-outside-section.err +++ b/test/asm/use-label-outside-section.err @@ -2,4 +2,4 @@ error: Label `lab` created outside of a `SECTION` at use-label-outside-section.asm(1) error: Expected constant expression: `lab` is not constant at assembly time at use-label-outside-section.asm(2) -Assembly aborted with 2 errors! +Assembly aborted with 2 errors diff --git a/test/gfx/bad_slice.err b/test/gfx/bad_slice.err index f3f7e357..eaea9ef0 100644 --- a/test/gfx/bad_slice.err +++ b/test/gfx/bad_slice.err @@ -1,3 +1,3 @@ -error: Image slice ((2, 2) to (130, 130)) is outside the image bounds (20x20)! +error: Image slice ((2, 2) to (130, 130)) is outside the image bounds (20x20) note: Did you mean the slice "2,2:2,2"? (width and height are in tiles, not pixels!) Conversion aborted after 1 error diff --git a/test/gfx/bg_fuse.err b/test/gfx/bg_fuse.err index ecbbd45c..9e8052b0 100644 --- a/test/gfx/bg_fuse.err +++ b/test/gfx/bg_fuse.err @@ -1,3 +1,3 @@ warning: Fusing colors #a9b9c9ff and #aabbccff into Game Boy color $66f5 [first seen at x: 1, y: 1] -FATAL: Tile (0, 0) contains the background color (#aabbccff)! +FATAL: Tile (0, 0) contains the background color (#aabbccff) Conversion aborted after 1 error diff --git a/test/gfx/bg_in_tile.err b/test/gfx/bg_in_tile.err index 91fa5779..a20dfcd3 100644 --- a/test/gfx/bg_in_tile.err +++ b/test/gfx/bg_in_tile.err @@ -1,2 +1,2 @@ -FATAL: Tile (16, 0) contains the background color (#ffd800ff)! +FATAL: Tile (16, 0) contains the background color (#ffd800ff) Conversion aborted after 1 error diff --git a/test/gfx/input_tileset_extra.err b/test/gfx/input_tileset_extra.err index 6e675cbd..087cea61 100644 --- a/test/gfx/input_tileset_extra.err +++ b/test/gfx/input_tileset_extra.err @@ -1,4 +1,4 @@ -error: Tile at (0, 0) is not within the input tileset, and '-o' was not given! -error: Tile at (0, 8) is not within the input tileset, and '-o' was not given! -error: Tile at (8, 8) is not within the input tileset, and '-o' was not given! +error: Tile at (0, 0) is not within the input tileset, and '-o' was not given +error: Tile at (0, 8) is not within the input tileset, and '-o' was not given +error: Tile at (8, 8) is not within the input tileset, and '-o' was not given Conversion aborted after 3 errors diff --git a/test/gfx/oob_slice_wh.err b/test/gfx/oob_slice_wh.err index b49ccf3f..a1a12329 100644 --- a/test/gfx/oob_slice_wh.err +++ b/test/gfx/oob_slice_wh.err @@ -1,2 +1,2 @@ -error: Image slice ((2, 2) to (34, 18)) is outside the image bounds (20x20)! +error: Image slice ((2, 2) to (34, 18)) is outside the image bounds (20x20) Conversion aborted after 1 error diff --git a/test/gfx/oob_slice_xy.err b/test/gfx/oob_slice_xy.err index 9a9e02ed..1bc3942b 100644 --- a/test/gfx/oob_slice_xy.err +++ b/test/gfx/oob_slice_xy.err @@ -1,2 +1,2 @@ -error: Image slice ((2, 99) to (10, 107)) is outside the image bounds (20x20)! +error: Image slice ((2, 99) to (10, 107)) is outside the image bounds (20x20) Conversion aborted after 1 error diff --git a/test/gfx/trans_bg_in_tile.err b/test/gfx/trans_bg_in_tile.err index ce6bf37e..6df184cd 100644 --- a/test/gfx/trans_bg_in_tile.err +++ b/test/gfx/trans_bg_in_tile.err @@ -1,2 +1,2 @@ -FATAL: Tile (16, 0) contains the background color (#00000000)! +FATAL: Tile (16, 0) contains the background color (#00000000) Conversion aborted after 1 error diff --git a/test/link/section-union/assert.out b/test/link/section-union/assert.out index 112b8687..43a0d9f9 100644 --- a/test/link/section-union/assert.out +++ b/test/link/section-union/assert.out @@ -4,4 +4,4 @@ Linking failed with 1 error --- error: Assertion failed: Force failing the build at (30) -Assembly aborted with 1 error! +Assembly aborted with 1 error