From d404621e0d87a9f1509ca1ded0f46e7a24b270ce Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 7 Sep 2025 12:11:48 -0400 Subject: [PATCH] Don't silence strings-as-numbers with `OPT Wno-obsolete` in tests --- test/asm/charlen-strchar.asm | 2 +- test/asm/charlen-strchar.err | 24 ++++++++++++++++++++++++ test/asm/multiple-charmaps.asm | 6 +++--- test/asm/multiple-charmaps.err | 24 ++++++++++++------------ test/asm/raw-string-symbols.asm | 2 +- test/asm/raw-string-symbols.err | 10 ++++++++++ 6 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 test/asm/charlen-strchar.err create mode 100644 test/asm/raw-string-symbols.err diff --git a/test/asm/charlen-strchar.asm b/test/asm/charlen-strchar.asm index 7bf17f53..9bc0ea3e 100644 --- a/test/asm/charlen-strchar.asm +++ b/test/asm/charlen-strchar.asm @@ -1,4 +1,4 @@ - opt Wno-unmapped-char, Wno-obsolete + opt Wno-unmapped-char charmap "", $00 charmap "A", $10 charmap "B", $20 diff --git a/test/asm/charlen-strchar.err b/test/asm/charlen-strchar.err new file mode 100644 index 00000000..f0d728bb --- /dev/null +++ b/test/asm/charlen-strchar.err @@ -0,0 +1,24 @@ +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(16) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(16) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(17) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(17) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(17) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(18) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(26) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(26) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(27) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(27) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(27) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at charlen-strchar.asm(28) diff --git a/test/asm/multiple-charmaps.asm b/test/asm/multiple-charmaps.asm index 07b2dfa3..8905f69b 100644 --- a/test/asm/multiple-charmaps.asm +++ b/test/asm/multiple-charmaps.asm @@ -1,4 +1,4 @@ -opt Wno-unmapped-char, Wno-obsolete +opt Wno-unmapped-char MACRO new_ IF _NARG > 1 @@ -30,8 +30,8 @@ MACRO pop_ popc ENDM -MACRO print_mapped - def x = \1 +MACRO? print_mapped + def x = CHARVAL(\1) println "{x}" ENDM diff --git a/test/asm/multiple-charmaps.err b/test/asm/multiple-charmaps.err index dae56bdc..0f927036 100644 --- a/test/asm/multiple-charmaps.err +++ b/test/asm/multiple-charmaps.err @@ -1,17 +1,17 @@ -error: Strings as numbers must be a single charmap unit - at multiple-charmaps.asm::print_mapped(34) <- multiple-charmaps.asm(46) -error: Strings as numbers must be a single charmap unit - at multiple-charmaps.asm::print_mapped(34) <- multiple-charmaps.asm(54) +error: CHARVAL: No character mapping for "ab" + at multiple-charmaps.asm(46) +error: CHARVAL: No character mapping for "ab" + at multiple-charmaps.asm(54) warning: Overriding charmap mapping [-Wcharmap-redef] at multiple-charmaps.asm(64) -error: Strings as numbers must be a single charmap unit - at multiple-charmaps.asm::print_mapped(34) <- multiple-charmaps.asm(73) -error: Strings as numbers must be a single charmap unit - at multiple-charmaps.asm::print_mapped(34) <- multiple-charmaps.asm(95) -error: Strings as numbers must be a single charmap unit - at multiple-charmaps.asm::print_mapped(34) <- multiple-charmaps.asm(96) -error: Strings as numbers must be a single charmap unit - at multiple-charmaps.asm::print_mapped(34) <- multiple-charmaps.asm(104) +error: CHARVAL: No character mapping for "cd" + at multiple-charmaps.asm(73) +error: CHARVAL: No character mapping for "cd" + at multiple-charmaps.asm(95) +error: CHARVAL: No character mapping for "ef" + at multiple-charmaps.asm(96) +error: CHARVAL: No character mapping for "ab" + at multiple-charmaps.asm(104) error: Charmap `map1` is already defined at multiple-charmaps.asm::new_(9) <- multiple-charmaps.asm(106) error: Undefined charmap `map5` diff --git a/test/asm/raw-string-symbols.asm b/test/asm/raw-string-symbols.asm index 928a716d..cba53b5d 100644 --- a/test/asm/raw-string-symbols.asm +++ b/test/asm/raw-string-symbols.asm @@ -1,4 +1,4 @@ -opt Wno-unmapped-char, Wno-obsolete +opt Wno-unmapped-char def hello equs "world" def name equs "hello" diff --git a/test/asm/raw-string-symbols.err b/test/asm/raw-string-symbols.err new file mode 100644 index 00000000..52c0cfa7 --- /dev/null +++ b/test/asm/raw-string-symbols.err @@ -0,0 +1,10 @@ +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at raw-string-symbols.asm(16) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at raw-string-symbols.asm(18) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at raw-string-symbols.asm(20) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at raw-string-symbols.asm(22) +warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete] + at raw-string-symbols.asm(25)