From 7b79fd1ec1fbbbf440042fd924b29dbe1ce4ddf9 Mon Sep 17 00:00:00 2001
From: Kugel Fuhr <98353208+kugelfuhr@users.noreply.github.com>
Date: Sun, 6 Jul 2025 10:42:15 +0200
Subject: [PATCH] Added more tests.

---
 test/asm/listing/132-errormsg.s        | 1 +
 test/asm/listing/133-errormsg.s        | 3 +++
 test/asm/listing/134-errormsg.s        | 4 ++++
 test/asm/listing/135-errormsg.s        | 5 +++++
 test/asm/listing/136-errormsg.s        | 5 +++++
 test/asm/listing/137-errormsg.s        | 5 +++++
 test/asm/listing/138-errormsg.s        | 4 ++++
 test/asm/listing/139-errormsg.s        | 6 ++++++
 test/asm/listing/140-errormsg.s        | 5 +++++
 test/asm/listing/141-errormsg.s        | 7 +++++++
 test/asm/listing/ref/133-errormsg.err2 | 2 ++
 test/asm/listing/ref/134-errormsg.err2 | 2 ++
 test/asm/listing/ref/135-errormsg.err2 | 2 ++
 test/asm/listing/ref/136-errormsg.err2 | 2 ++
 test/asm/listing/ref/137-errormsg.err2 | 3 +++
 test/asm/listing/ref/138-errormsg.err2 | 3 +++
 test/asm/listing/ref/139-errormsg.err2 | 2 ++
 test/asm/listing/ref/140-errormsg.err2 | 2 ++
 test/asm/listing/ref/141-errormsg.err2 | 3 +++
 19 files changed, 66 insertions(+)
 create mode 100644 test/asm/listing/132-errormsg.s
 create mode 100644 test/asm/listing/133-errormsg.s
 create mode 100644 test/asm/listing/134-errormsg.s
 create mode 100644 test/asm/listing/135-errormsg.s
 create mode 100644 test/asm/listing/136-errormsg.s
 create mode 100644 test/asm/listing/137-errormsg.s
 create mode 100644 test/asm/listing/138-errormsg.s
 create mode 100644 test/asm/listing/139-errormsg.s
 create mode 100644 test/asm/listing/140-errormsg.s
 create mode 100644 test/asm/listing/141-errormsg.s
 create mode 100644 test/asm/listing/ref/133-errormsg.err2
 create mode 100644 test/asm/listing/ref/134-errormsg.err2
 create mode 100644 test/asm/listing/ref/135-errormsg.err2
 create mode 100644 test/asm/listing/ref/136-errormsg.err2
 create mode 100644 test/asm/listing/ref/137-errormsg.err2
 create mode 100644 test/asm/listing/ref/138-errormsg.err2
 create mode 100644 test/asm/listing/ref/139-errormsg.err2
 create mode 100644 test/asm/listing/ref/140-errormsg.err2
 create mode 100644 test/asm/listing/ref/141-errormsg.err2

diff --git a/test/asm/listing/132-errormsg.s b/test/asm/listing/132-errormsg.s
new file mode 100644
index 000000000..648cf21bd
--- /dev/null
+++ b/test/asm/listing/132-errormsg.s
@@ -0,0 +1 @@
+.define debug(x) .out x
diff --git a/test/asm/listing/133-errormsg.s b/test/asm/listing/133-errormsg.s
new file mode 100644
index 000000000..8bc4bae9f
--- /dev/null
+++ b/test/asm/listing/133-errormsg.s
@@ -0,0 +1,3 @@
+.repeat         10
+        .byte   $00
+
diff --git a/test/asm/listing/134-errormsg.s b/test/asm/listing/134-errormsg.s
new file mode 100644
index 000000000..fa2abff13
--- /dev/null
+++ b/test/asm/listing/134-errormsg.s
@@ -0,0 +1,4 @@
+        .import         foo
+
+        foo = 3
+
diff --git a/test/asm/listing/135-errormsg.s b/test/asm/listing/135-errormsg.s
new file mode 100644
index 000000000..f05adbb55
--- /dev/null
+++ b/test/asm/listing/135-errormsg.s
@@ -0,0 +1,5 @@
+        foo     = 3
+
+
+        foo     = 2
+
diff --git a/test/asm/listing/136-errormsg.s b/test/asm/listing/136-errormsg.s
new file mode 100644
index 000000000..0ef06dd17
--- /dev/null
+++ b/test/asm/listing/136-errormsg.s
@@ -0,0 +1,5 @@
+.macro  mac
+
+        lda     #$00
+        .byte   3
+
diff --git a/test/asm/listing/137-errormsg.s b/test/asm/listing/137-errormsg.s
new file mode 100644
index 000000000..4b5a4ddbf
--- /dev/null
+++ b/test/asm/listing/137-errormsg.s
@@ -0,0 +1,5 @@
+.mac    lda, val
+        ldx     #val
+        txa
+
+
diff --git a/test/asm/listing/138-errormsg.s b/test/asm/listing/138-errormsg.s
new file mode 100644
index 000000000..4ca62b741
--- /dev/null
+++ b/test/asm/listing/138-errormsg.s
@@ -0,0 +1,4 @@
+.macro          mac
+    .local .endmacro
+.endmacro
+mac
diff --git a/test/asm/listing/139-errormsg.s b/test/asm/listing/139-errormsg.s
new file mode 100644
index 000000000..d55cd7df9
--- /dev/null
+++ b/test/asm/listing/139-errormsg.s
@@ -0,0 +1,6 @@
+.macro  mac     val
+        lda     #val
+.endmacro
+.macro  mac     val
+        lda     #val
+.endmacro
diff --git a/test/asm/listing/140-errormsg.s b/test/asm/listing/140-errormsg.s
new file mode 100644
index 000000000..b467dee11
--- /dev/null
+++ b/test/asm/listing/140-errormsg.s
@@ -0,0 +1,5 @@
+.macro  foo     a1, a2
+        .byte   a1, a2
+.endmacro
+
+foo     1, 2, 3
diff --git a/test/asm/listing/141-errormsg.s b/test/asm/listing/141-errormsg.s
new file mode 100644
index 000000000..60d4748b4
--- /dev/null
+++ b/test/asm/listing/141-errormsg.s
@@ -0,0 +1,7 @@
+.macro  mac1
+        .delmac mac2
+.endmacro
+.macro  mac2
+        mac1
+.endmacro
+mac2
diff --git a/test/asm/listing/ref/133-errormsg.err2 b/test/asm/listing/ref/133-errormsg.err2
new file mode 100644
index 000000000..bfa637d67
--- /dev/null
+++ b/test/asm/listing/ref/133-errormsg.err2
@@ -0,0 +1,2 @@
+133-errormsg.s:3: Error: Expected '.ENDREPEAT' but found 'end-of-file'
+133-errormsg.s:1: Note: For this '.REPEAT' command
diff --git a/test/asm/listing/ref/134-errormsg.err2 b/test/asm/listing/ref/134-errormsg.err2
new file mode 100644
index 000000000..7e674fdc3
--- /dev/null
+++ b/test/asm/listing/ref/134-errormsg.err2
@@ -0,0 +1,2 @@
+134-errormsg.s:3: Error: Symbol 'foo' is already an import
+134-errormsg.s:1: Note: The symbol was previously imported here
diff --git a/test/asm/listing/ref/135-errormsg.err2 b/test/asm/listing/ref/135-errormsg.err2
new file mode 100644
index 000000000..8391770fa
--- /dev/null
+++ b/test/asm/listing/ref/135-errormsg.err2
@@ -0,0 +1,2 @@
+135-errormsg.s:4: Error: Symbol 'foo' is already defined
+135-errormsg.s:1: Note: The symbol was previously defined here
diff --git a/test/asm/listing/ref/136-errormsg.err2 b/test/asm/listing/ref/136-errormsg.err2
new file mode 100644
index 000000000..bed70989d
--- /dev/null
+++ b/test/asm/listing/ref/136-errormsg.err2
@@ -0,0 +1,2 @@
+136-errormsg.s:5: Error: Missing '.ENDMACRO' for definition of macro 'mac'
+136-errormsg.s:1: Note: Macro definition started here
diff --git a/test/asm/listing/ref/137-errormsg.err2 b/test/asm/listing/ref/137-errormsg.err2
new file mode 100644
index 000000000..81ca9cd69
--- /dev/null
+++ b/test/asm/listing/ref/137-errormsg.err2
@@ -0,0 +1,3 @@
+137-errormsg.s:1: Error: Cannot use an instruction as macro name
+137-errormsg.s:5: Error: Expected '.ENDMACRO' but found 'end-of-file'
+137-errormsg.s:1: Note: Macro definition started here
diff --git a/test/asm/listing/ref/138-errormsg.err2 b/test/asm/listing/ref/138-errormsg.err2
new file mode 100644
index 000000000..7a73e48fc
--- /dev/null
+++ b/test/asm/listing/ref/138-errormsg.err2
@@ -0,0 +1,3 @@
+138-errormsg.s:2: Error: Expected an identifier but found '.ENDMACRO'
+138-errormsg.s:4: Error: Macro 'mac' contains errors and cannot be expanded
+138-errormsg.s:1: Note: Definition of macro 'mac' was here
diff --git a/test/asm/listing/ref/139-errormsg.err2 b/test/asm/listing/ref/139-errormsg.err2
new file mode 100644
index 000000000..370835210
--- /dev/null
+++ b/test/asm/listing/ref/139-errormsg.err2
@@ -0,0 +1,2 @@
+139-errormsg.s:4: Error: A macro named 'mac' is already defined
+139-errormsg.s:1: Note: Previous definition of macro 'mac' was here
diff --git a/test/asm/listing/ref/140-errormsg.err2 b/test/asm/listing/ref/140-errormsg.err2
new file mode 100644
index 000000000..f9e9adace
--- /dev/null
+++ b/test/asm/listing/ref/140-errormsg.err2
@@ -0,0 +1,2 @@
+140-errormsg.s:5: Error: Too many parameters for macro 'foo'
+140-errormsg.s:1: Note: See definition of macro 'foo' which was here
diff --git a/test/asm/listing/ref/141-errormsg.err2 b/test/asm/listing/ref/141-errormsg.err2
new file mode 100644
index 000000000..b99e2d9fe
--- /dev/null
+++ b/test/asm/listing/ref/141-errormsg.err2
@@ -0,0 +1,3 @@
+141-errormsg.s:7: Error: Cannot delete macro 'mac2' which is currently expanded
+141-errormsg.s:5: Note: Expanded from macro here
+141-errormsg.s:2: Note: Expanded from macro here