From 94ed28acf8493e553c67e863ec023d55d4699abd Mon Sep 17 00:00:00 2001
From: Rangi42 <sylvie.oukaour+rangi42@gmail.com>
Date: Sat, 6 Sep 2025 12:45:01 -0400
Subject: [PATCH] Avoid nonessential strings-as-numbers in tests

---
 test/asm/empty-strings.asm            | 1 -
 test/asm/empty-strings.err            | 5 -----
 test/asm/multivalue-charmap.asm       | 4 ++--
 test/asm/multivalue-charmap.err       | 4 ----
 test/asm/nested-bad-interpolation.asm | 4 ++--
 test/asm/nested-bad-interpolation.err | 8 ++------
 test/asm/string-concat.asm            | 2 +-
 test/asm/string-concat.err            | 4 ----
 8 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 test/asm/empty-strings.err

diff --git a/test/asm/empty-strings.asm b/test/asm/empty-strings.asm
index c5cf44a8..59ead90e 100644
--- a/test/asm/empty-strings.asm
+++ b/test/asm/empty-strings.asm
@@ -2,5 +2,4 @@ SECTION "test", ROM0
 db ""
 dw ""
 dl ""
-assert ("") == 0
 assert SIZEOF("test") == 0
diff --git a/test/asm/empty-strings.err b/test/asm/empty-strings.err
deleted file mode 100644
index 68158ecd..00000000
--- a/test/asm/empty-strings.err
+++ /dev/null
@@ -1,5 +0,0 @@
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at empty-strings.asm(5)
-error: Strings as numbers must be a single charmap unit
-    at empty-strings.asm(5)
-Assembly aborted with 1 error!
diff --git a/test/asm/multivalue-charmap.asm b/test/asm/multivalue-charmap.asm
index 31dfdd39..80f1ee52 100644
--- a/test/asm/multivalue-charmap.asm
+++ b/test/asm/multivalue-charmap.asm
@@ -17,8 +17,8 @@ dl 0 ; separator
 
 charmap "A", $01234567
 charmap "B", $fedcba98
-assert "A" == $01234567
-assert "B" == $fedcba98
+assert 'A' == $01234567
+assert 'B' == $fedcba98
 db "AB" ; db $01234567, $fedcba98 (truncated to $67, $98)
 dl "AB" ; dl $01234567, $fedcba98
 
diff --git a/test/asm/multivalue-charmap.err b/test/asm/multivalue-charmap.err
index 3ebddc7c..07fc2b8c 100644
--- a/test/asm/multivalue-charmap.err
+++ b/test/asm/multivalue-charmap.err
@@ -1,9 +1,5 @@
 warning: All character units must be 8-bit [-Wtruncation]
     at multivalue-charmap.asm(11)
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at multivalue-charmap.asm(20)
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at multivalue-charmap.asm(21)
 warning: All character units must be 8-bit [-Wtruncation]
     at multivalue-charmap.asm(22)
 warning: All character units must be 8-bit [-Wtruncation]
diff --git a/test/asm/nested-bad-interpolation.asm b/test/asm/nested-bad-interpolation.asm
index e27e7875..5e16cca8 100644
--- a/test/asm/nested-bad-interpolation.asm
+++ b/test/asm/nested-bad-interpolation.asm
@@ -1,3 +1,3 @@
 def p = {{a}}
-def q = "{b}"
-def r = "{{c}}"
+def q = '{b}'
+def r = '{{c}}'
diff --git a/test/asm/nested-bad-interpolation.err b/test/asm/nested-bad-interpolation.err
index 97d39375..519603a4 100644
--- a/test/asm/nested-bad-interpolation.err
+++ b/test/asm/nested-bad-interpolation.err
@@ -6,16 +6,12 @@ error: syntax error, unexpected end of line
     at nested-bad-interpolation.asm(1)
 error: Interpolated symbol `b` is a reserved keyword; add a '#' prefix to use it as a raw symbol
     at nested-bad-interpolation.asm(2)
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at nested-bad-interpolation.asm(2)
-error: Strings as numbers must be a single charmap unit
+error: Character literals must be a single charmap unit
     at nested-bad-interpolation.asm(2)
 error: Interpolated symbol `c` is a reserved keyword; add a '#' prefix to use it as a raw symbol
     at nested-bad-interpolation.asm(3)
 error: Interpolated symbol `` does not exist
     at nested-bad-interpolation.asm(3)
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at nested-bad-interpolation.asm(3)
-error: Strings as numbers must be a single charmap unit
+error: Character literals must be a single charmap unit
     at nested-bad-interpolation.asm(3)
 Assembly aborted with 8 errors!
diff --git a/test/asm/string-concat.asm b/test/asm/string-concat.asm
index 556233ae..49b3d988 100644
--- a/test/asm/string-concat.asm
+++ b/test/asm/string-concat.asm
@@ -18,7 +18,7 @@ test "a" ++ """b""" ++ strupr("c") ++ strslice(#str, 0, 0), "abC"
 charmap "a", 1
 charmap "b", 2
 charmap "ab", 12
-assert "a" + "b" == 3
+assert charval("a") + charval("b") == 3
 assert charval("a" ++ "b") == 12
 
 ; errors
diff --git a/test/asm/string-concat.err b/test/asm/string-concat.err
index ec632d55..4535d7d7 100644
--- a/test/asm/string-concat.err
+++ b/test/asm/string-concat.err
@@ -1,7 +1,3 @@
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at string-concat.asm(21)
-warning: Treating strings as numbers is deprecated; use character literals or `CHARVAL` instead [-Wobsolete]
-    at string-concat.asm(21)
 error: syntax error, unexpected ++
     at string-concat.asm(25)
 error: syntax error, unexpected ++, expecting ] or + or -