X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fcontrol%2Fdefine.at;h=b3896b1aca4bc4027d1a1d82aa1ab4c61347989e;hb=b8f7ae6610f04de0b4325a905cc69beb65bad2ab;hp=2a4f58cd4119290e7356d80416cb7ef3b6c44020;hpb=82e6fde7bd3bde18dca346519cfc7f6f2bf740e0;p=pspp

diff --git a/tests/language/control/define.at b/tests/language/control/define.at
index 2a4f58cd41..b3896b1aca 100644
--- a/tests/language/control/define.at
+++ b/tests/language/control/define.at
@@ -16,19 +16,6 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
 AT_BANNER([DEFINE])
 
-m4_define([PSPP_CHECK_MACRO_EXPANSION],
-  [AT_SETUP([macro expansion - $1])
-   AT_KEYWORDS([m4_bpatsubst([$1], [!], [])])
-   AT_DATA([define.sps], [$2
-DEBUG EXPAND.
-$3
-])
-   AT_CAPTURE_FILE([define.sps])
-   AT_DATA([expout], [$4
-])
-   AT_CHECK([pspp --testing-mode define.sps | sed '/^$/d'], [$6], [expout])
-   AT_CLEANUP])
-
 AT_SETUP([simple macro expansion])
 AT_DATA([define.sps], [dnl
 DEFINE !macro()
@@ -54,15 +41,38 @@ m(n, o).
 ])
 AT_CLEANUP
 
-PSPP_CHECK_MACRO_EXPANSION([one !TOKENS(1) positional argument],
-  [DEFINE !t1(!positional !tokens(1)) t1 (!1) !ENDDEFINE.],
-  [!t1 a.
+AT_SETUP([redefining a macro])
+AT_DATA([define.sps], [dnl
+DEFINE !macro() 0 !ENDDEFINE.
+DEFINE !macro() 1 !ENDDEFINE.
+DEBUG EXPAND.
+!macro.
+])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+1
+])
+AT_CLEANUP
+
+AT_SETUP([macro expansion - one !TOKENS(1) positional argument])
+AT_KEYWORDS([TOKENS])
+AT_DATA([define.sps], [dnl
+DEFINE !t1(!positional=!tokens(1)) t1 (!1) !ENDDEFINE.
+DEBUG EXPAND.
+!t1 a.
 !t1 b.
-!t1 a b.],
-  [t1(a)
+!t1 a b.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+t1(a)
+
 t1(b)
+
 t1(a)
-note: unexpanded token "b"])
+
+note: unexpanded token "b"
+])
+AT_CLEANUP
 
 AT_SETUP([macro expansion with positional arguments])
 AT_DATA([define.sps], [dnl
@@ -70,8 +80,8 @@ DEFINE !title(!positional !tokens(1)) !1 !ENDDEFINE.
 DEFINE !t1(!positional !tokens(1)) t1 (!1) !ENDDEFINE.
 DEFINE !t2(!positional !tokens(2)) t2 (!1) !ENDDEFINE.
 
-DEFINE !ce(!positional !charend('/')) ce (!1) !ENDDEFINE.
-DEFINE !ce2(!positional !charend('(')
+DEFINE !ce(!positional=!charend('/')) ce (!1) !ENDDEFINE.
+DEFINE !ce2(!positional=!charend('(')
            /!positional !charend(')'))
 ce2 (!1, !2)
 !ENDDEFINE.
@@ -171,7 +181,9 @@ e(a b)
 
 cmd(1 2 3 4)
 
-cmd2(5 6, 7)
+cmd2(5 6, )
+
+note: unexpanded token "7"
 
 "Three !TOKENS(1) arguments."
 
@@ -181,106 +193,310 @@ p(1, -2, -3) (1 -2 -3)
 ])
 AT_CLEANUP
 
-AT_SETUP([macro expansion with positional arguments - negative])
+AT_SETUP([macro call missing positional !TOKENS arguments])
+AT_KEYWORDS([TOKENS])
 AT_DATA([define.sps], [dnl
-DEFINE !title(!positional !tokens(1)) !1 !ENDDEFINE.
-DEFINE !p(!positional !tokens(1)
-         /!positional !tokens(1)
-	 /!positional !tokens(1))
+DEFINE !p(!positional !tokens(1) !default(x)
+         /!positional !tokens(1) !default(y)
+	 /!positional !tokens(1) !default(z))
 (!1, !2, !3)
 !ENDDEFINE.
-
-DEFINE !ce(!positional !charend('/')) ce(!1) !ENDDEFINE.
-
-DEFINE !enc1(!positional !enclose('{', '}')) enc1(!1) !ENDDEFINE.
 DEBUG EXPAND.
-!title "Too few tokens for !TOKENS."
+!p a b c.
 !p a b.
 !p a.
 !p.
+])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+(a, b, c)
 
-!title "Missing charend delimiter."
-!ce a b c.
+(a, b, z)
 
-!title "Missing start delimiter."
-!enc1 a b c.
+(a, y, z)
 
-!title "Missing end delimiter."
-!enc1{a b c.
+(x, y, z)
+])
+AT_CLEANUP
+
+AT_SETUP([macro call incomplete positional !TOKENS arguments])
+AT_KEYWORDS([TOKENS])
+AT_DATA([define.sps], [dnl
+DEFINE !p(!positional !tokens(2) !default(x)
+         /!positional !tokens(2) !default(y)
+	 /!positional !tokens(2) !default(z))
+(!1, !2, !3)
+!ENDDEFINE.
+DEBUG EXPAND.
+!p a1 a2 b1 b2 c1 c2.
+!p a1 a2 b1 b2 c1.
+!p a1 a2 b1 b2.
+!p a1 a2 b1.
+!p a1 a2.
+!p a1.
+!p.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
-"Too few tokens for !TOKENS."
+(a1 a2, b1 b2, c1 c2)
 
-define.sps:13: error: DEBUG EXPAND: Unexpected end of command reading
-argument !3 to macro !p.
+define.sps:8.18: error: DEBUG EXPAND: Reached end of command expecting 1 more
+token in argument !3 to macro !p.
+    8 | !p a1 a2 b1 b2 c1.
+      |                  ^
 
-note: unexpanded token "!p"
+(a1 a2, b1 b2, c1)
 
-note: unexpanded token "a"
+(a1 a2, b1 b2, z)
 
-note: unexpanded token "b"
+define.sps:10.12: error: DEBUG EXPAND: Reached end of command expecting 1 more
+token in argument !2 to macro !p.
+   10 | !p a1 a2 b1.
+      |            ^
+
+(a1 a2, b1, z)
+
+(a1 a2, y, z)
+
+define.sps:12.6: error: DEBUG EXPAND: Reached end of command expecting 1 more
+token in argument !1 to macro !p.
+   12 | !p a1.
+      |      ^
+
+(a1, y, z)
+
+(x, y, z)
+])
+AT_CLEANUP
+
+AT_SETUP([macro call empty positional !CHAREND arguments])
+AT_KEYWORDS([CHAREND])
+AT_DATA([define.sps], [dnl
+DEFINE !p(!positional !charend(',') !default(x)
+         /!positional !charend(';') !default(y)
+	 /!positional !charend(':') !default(z))
+(!1, !2, !3)
+!ENDDEFINE.
+DEBUG EXPAND.
+!p a,b;c:.
+!p a,b;:.
+!p a,;c:.
+!p a,;:.
+!p,b;c:.
+!p,b;:.
+!p,;c:.
+!p,;:.
+])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+(a, b, c)
+
+(a, b, )
+
+(a, , c)
+
+(a, , )
+
+(, b, c)
+
+(, b, )
+
+(, , c)
+
+(, , )
+])
+AT_CLEANUP
+
+AT_SETUP([macro call missing positional !CHAREND arguments])
+AT_DATA([define.sps], [dnl
+DEFINE !p(!positional !charend(',') !default(x)
+         /!positional !charend(';') !default(y)
+	 /!positional !charend(':') !default(z))
+(!1, !2, !3)
+!ENDDEFINE.
+DEBUG EXPAND.
+!p a,b;c:.
+!p a,b;.
+!p a,;.
+!p ,b;.
+!p ,;.
+
+!p a,.
+!p ,.
+
+!p.
+])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+(a, b, c)
+
+(a, b, z)
+
+(a, , z)
+
+(, b, z)
+
+(, , z)
+
+(a, y, z)
+
+(, y, z)
+
+(x, y, z)
+])
+AT_CLEANUP
+
+AT_SETUP([macro call incomplete positional !CHAREND arguments])
+AT_KEYWORDS([CHAREND])
+AT_DATA([define.sps], [dnl
+DEFINE !p(!positional !charend(',') !default(x)
+         /!positional !charend(';') !default(y)
+	 /!positional !charend(':') !default(z))
+(!1, !2, !3)
+!ENDDEFINE.
+DEBUG EXPAND.
+!p a,b;c:.
+!p a,b;c.
+!p a,b;.
+!p a,b.
+!p a,.
+!p a.
+!p.
+])
+AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
+(a, b, c)
+
+define.sps:8.9: error: DEBUG EXPAND: Reached end of command expecting ":" in
+argument !3 to macro !p.
+    8 | !p a,b;c.
+      |         ^
+
+(a, b, c)
+
+(a, b, z)
 
-define.sps:14: error: DEBUG EXPAND: Unexpected end of command reading
+define.sps:10.7: error: DEBUG EXPAND: Reached end of command expecting ";" in
 argument !2 to macro !p.
+   10 | !p a,b.
+      |       ^
 
-note: unexpanded token "!p"
+(a, b, z)
 
-note: unexpanded token "a"
+(a, y, z)
 
-define.sps:15: error: DEBUG EXPAND: Unexpected end of command reading
+define.sps:12.5: error: DEBUG EXPAND: Reached end of command expecting "," in
 argument !1 to macro !p.
+   12 | !p a.
+      |     ^
 
-note: unexpanded token "!p"
+(a, y, z)
 
-"Missing charend delimiter."
+(x, y, z)
+])
+AT_CLEANUP
 
-define.sps:18: error: DEBUG EXPAND: Unexpected end of command reading
-argument !1 to macro !ce.
+AT_SETUP([macro call missing positional !ENCLOSE arguments])
+AT_KEYWORDS([ENCLOSE])
+AT_DATA([define.sps], [dnl
+DEFINE !p(!positional !enclose('(',')') !default(x)
+         /!positional !enclose('<','>') !default(y)
+	 /!positional !enclose('{','}') !default(z))
+(!1, !2, !3)
+!ENDDEFINE.
+DEBUG EXPAND.
+!p (a)<b>{c}.
+!p (a)<b>.
+!p (a).
+!p.
+])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+(a, b, c)
 
-note: unexpanded token "!ce"
+(a, b, z)
 
-note: unexpanded token "a"
+(a, y, z)
 
-note: unexpanded token "b"
+(x, y, z)
+])
+AT_CLEANUP
 
-note: unexpanded token "c"
+AT_SETUP([macro call incomplete positional !ENCLOSE arguments])
+AT_KEYWORDS([ENCLOSE])
+AT_DATA([define.sps], [dnl
+DEFINE !p(!positional !enclose('(',')') !default(x)
+         /!positional !enclose('<','>') !default(y)
+	 /!positional !enclose('{','}') !default(z))
+(!1, !2, !3)
+!ENDDEFINE.
+DEBUG EXPAND.
+!p (a)<b>{c}.
+!p (a)<b>{c.
+!p (a)<b>{.
+!p (a)<b>.
+!p (a)<b.
+!p (a)<.
+!p (a).
+!p (a.
+!p (.
+!p.
+])
+AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
+(a, b, c)
 
-"Missing start delimiter."
+define.sps:8.12: error: DEBUG EXPAND: Reached end of command expecting "}" in
+argument !3 to macro !p.
+    8 | !p (a)<b>{c.
+      |            ^
 
-define.sps:21: error: DEBUG EXPAND: Found `a' while expecting `{' reading
-argument !1 to macro !enc1.
+(a, b, c)
 
-note: unexpanded token "!enc1"
+define.sps:9.11: error: DEBUG EXPAND: Reached end of command expecting "}" in
+argument !3 to macro !p.
+    9 | !p (a)<b>{.
+      |           ^
 
-note: unexpanded token "a"
+(a, b, )
 
-note: unexpanded token "b"
+(a, b, z)
+
+define.sps:11.9: error: DEBUG EXPAND: Reached end of command expecting ">" in
+argument !2 to macro !p.
+   11 | !p (a)<b.
+      |         ^
+
+(a, b, z)
 
-note: unexpanded token "c"
+define.sps:12.8: error: DEBUG EXPAND: Reached end of command expecting ">" in
+argument !2 to macro !p.
+   12 | !p (a)<.
+      |        ^
 
-"Missing end delimiter."
+(a, , z)
 
-define.sps:24: error: DEBUG EXPAND: Unexpected end of command reading
-argument !1 to macro !enc1.
+(a, y, z)
 
-note: unexpanded token "!enc1"
+define.sps:14.6: error: DEBUG EXPAND: Reached end of command expecting ")" in
+argument !1 to macro !p.
+   14 | !p (a.
+      |      ^
 
-note: unexpanded token "{"
+(a, y, z)
 
-note: unexpanded token "a"
+define.sps:15.5: error: DEBUG EXPAND: Reached end of command expecting ")" in
+argument !1 to macro !p.
+   15 | !p (.
+      |     ^
 
-note: unexpanded token "b"
+(, y, z)
 
-note: unexpanded token "c"
+(x, y, z)
 ])
 AT_CLEANUP
 
 AT_SETUP([keyword macro argument name with ! prefix])
 AT_DATA([define.sps], [dnl
-DEFINE !macro(!x=!TOKENS(1).
+DEFINE !macro(!x !TOKENS(1).
 ])
 AT_CHECK([pspp -O format=csv define.sps], [1], [dnl
-"define.sps:1.15-1.16: error: DEFINE: Syntax error at `!x': Keyword macro parameter must be named in definition without ""!"" prefix."
+"define.sps:1.15-1.16: error: DEFINE: Keyword macro parameter must be named in definition without ""!"" prefix.
+    1 | DEFINE !macro@{:@!x !TOKENS(1).
+      |               ^~"
 ])
 AT_CLEANUP
 
@@ -289,93 +505,244 @@ AT_DATA([define.sps], [dnl
 DEFINE !macro(if=!TOKENS(1).
 ])
 AT_CHECK([pspp -O format=csv define.sps], [1], [dnl
-"define.sps:1.15-1.16: error: DEFINE: Syntax error at `if': Cannot use macro keyword ""if"" as an argument name."
+"define.sps:1.15-1.16: error: DEFINE: Cannot use macro keyword ""if"" as an argument name.
+    1 | DEFINE !macro@{:@if=!TOKENS(1).
+      |               ^~"
 ])
 AT_CLEANUP
 
-PSPP_CHECK_MACRO_EXPANSION([one !TOKENS(1) keyword argument],
-  [DEFINE !k(arg1 = !TOKENS(1)) k(!arg1) !ENDDEFINE.],
-  [!k arg1=x.
+AT_SETUP([macro expansion - one !TOKENS(1) keyword argument])
+AT_KEYWORDS([TOKENS])
+AT_DATA([define.sps], [dnl
+DEFINE !k(arg1 = !TOKENS(1)) k(!arg1) !ENDDEFINE.
+DEBUG EXPAND.
+!k arg1=x.
 !k arg1=x y.
-!k.],
-  [k(x)
+!k.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+k(x)
+
 k(x)
+
 note: unexpanded token "y"
-k( )])
 
-PSPP_CHECK_MACRO_EXPANSION([one !TOKENS(1) keyword argument - negative],
-  [DEFINE !k(arg1 = !TOKENS(1)) k(!arg1) !ENDDEFINE.],
-  [!k arg1.
-!k arg1=.], [dnl
-define.sps:3: error: DEBUG EXPAND: Found `.' while expecting `=' reading
+k( )
+])
+AT_CLEANUP
+
+AT_SETUP([macro expansion - one !TOKENS(1) keyword argument - negative])
+AT_KEYWORDS([TOKENS])
+AT_DATA([define.sps], [dnl
+DEFINE !k(arg1 !TOKENS(1)) k(!arg1) !ENDDEFINE.
+DEBUG EXPAND.
+!k arg1.
+!k arg1=.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
+define.sps:3.8: error: DEBUG EXPAND: Found `.' while expecting `=' reading
 argument !arg1 to macro !k.
-note: unexpanded token "!k"
-note: unexpanded token "arg1"
-define.sps:4: error: DEBUG EXPAND: Unexpected end of command reading argument !
-arg1 to macro !k.
-note: unexpanded token "!k"
-note: unexpanded token "arg1"
-note: unexpanded token "="], [1])
-
-PSPP_CHECK_MACRO_EXPANSION([!CHAREND('/') keyword arguments], [dnl
+    3 | !k arg1.
+      |        ^
+
+k( )
+
+define.sps:4.9: error: DEBUG EXPAND: Reached end of command expecting 1 more
+token in argument !arg1 to macro !k.
+    4 | !k arg1=.
+      |         ^
+
+k( )
+])
+AT_CLEANUP
+
+AT_SETUP([macro expansion - !CHAREND keyword arguments])
+AT_KEYWORDS([CHAREND])
+AT_DATA([define.sps], [dnl
 DEFINE !k(arg1 = !CHAREND('/')
          /arg2 = !CHAREND('/'))
 k(!arg1, !arg2)
-!ENDDEFINE.],
-  [!k arg1=x/ arg2=y/.
+!ENDDEFINE.
+DEBUG EXPAND.
+!k arg1=x/ arg2=y/.
 !k arg1=x/.
 !k arg2=y/.
-!k.],
-  [k(x, y)
+!k.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+k(x, y)
+
 k(x, )
+
 k(, y)
-k(, )])
 
-PSPP_CHECK_MACRO_EXPANSION([!CHAREND('/') keyword arguments - negative], [dnl
+k(, )
+])
+AT_CLEANUP
+
+AT_SETUP([macro expansion - !CHAREND keyword arguments - negative])
+AT_KEYWORDS([CHAREND])
+AT_DATA([define.sps], [dnl
 DEFINE !k(arg1 = !CHAREND('/')
          /arg2 = !CHAREND('/'))
 k(!arg1, !arg2)
-!ENDDEFINE.],
-  [!k arg1.
+!ENDDEFINE.
+DEBUG EXPAND.
+!k arg1.
 !k arg1=.
 !k arg1=x.
-!k arg1=x/ arg2=y.],
-  [define.sps:6: error: DEBUG EXPAND: Found `.' while expecting `=' reading
+!k arg1=x/ arg2=y.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
+define.sps:6.8: error: DEBUG EXPAND: Found `.' while expecting `=' reading
 argument !arg1 to macro !k.
-note: unexpanded token "!k"
-note: unexpanded token "arg1"
-define.sps:7: error: DEBUG EXPAND: Unexpected end of command reading argument !
-arg1 to macro !k.
-note: unexpanded token "!k"
-note: unexpanded token "arg1"
-note: unexpanded token "="
-define.sps:8: error: DEBUG EXPAND: Unexpected end of command reading argument !
-arg1 to macro !k.
-note: unexpanded token "!k"
-note: unexpanded token "arg1"
-note: unexpanded token "="
-note: unexpanded token "x"
-define.sps:9: error: DEBUG EXPAND: Unexpected end of command reading argument !
-arg2 to macro !k.
-note: unexpanded token "!k"
-note: unexpanded token "arg1"
-note: unexpanded token "="
+    6 | !k arg1.
+      |        ^
+
+k(, )
+
+define.sps:7.9: error: DEBUG EXPAND: Reached end of command expecting "/" in
+argument !arg1 to macro !k.
+    7 | !k arg1=.
+      |         ^
+
+k(, )
+
+define.sps:8.10: error: DEBUG EXPAND: Reached end of command expecting "/" in
+argument !arg1 to macro !k.
+    8 | !k arg1=x.
+      |          ^
+
+k(x, )
+
+define.sps:9.18: error: DEBUG EXPAND: Reached end of command expecting "/" in
+argument !arg2 to macro !k.
+    9 | !k arg1=x/ arg2=y.
+      |                  ^
+
+k(x, y)
+])
+AT_CLEANUP
+
+AT_SETUP([macro expansion - !ENCLOSE keyword arguments])
+AT_KEYWORDS([ENCLOSE])
+AT_DATA([define.sps], [dnl
+DEFINE !k(arg1 = !ENCLOSE('(',')')
+         /arg2 = !ENCLOSE('{','}'))
+k(!arg1, !arg2)
+!ENDDEFINE.
+DEBUG EXPAND.
+!k arg1=(x) arg2={y}.
+!k arg1=(x).
+!k arg2={y}.
+!k.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+k(x, y)
+
+k(x, )
+
+k(, y)
+
+k(, )
+])
+AT_CLEANUP
+
+AT_SETUP([macro expansion - !ENCLOSE keyword arguments - negative])
+AT_KEYWORDS([ENCLOSE])
+AT_DATA([define.sps], [dnl
+DEFINE !k(arg1 = !ENCLOSE('(',')')
+         /arg2 = !ENCLOSE('{','}'))
+k(!arg1, !arg2)
+!ENDDEFINE.
+DEBUG EXPAND.
+!k arg1.
+!k arg1=.
+!k arg1=x.
+!k arg1=(x.
+!k arg1=(x) arg2.
+!k arg1=(x) arg2=.
+!k arg1=(x) arg2=y.
+!k arg1=(x) arg2=(y.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
+define.sps:6.8: error: DEBUG EXPAND: Found `.' while expecting `=' reading
+argument !arg1 to macro !k.
+    6 | !k arg1.
+      |        ^
+
+k(, )
+
+define.sps:7.9: error: DEBUG EXPAND: Found `.' while expecting `@{:@' reading
+argument !arg1 to macro !k.
+    7 | !k arg1=.
+      |         ^
+
+k(, )
+
+define.sps:8.9: error: DEBUG EXPAND: Found `x' while expecting `@{:@' reading
+argument !arg1 to macro !k.
+    8 | !k arg1=x.
+      |         ^
+
+k(, )
+
 note: unexpanded token "x"
-note: unexpanded token "/"
-note: unexpanded token "arg2"
-note: unexpanded token "="
-note: unexpanded token "y"])
-
-PSPP_CHECK_MACRO_EXPANSION([default keyword arguments],
-  [DEFINE !k(arg1 = !DEFAULT(a b c) !CMDEND) k(!arg1) !ENDDEFINE],
-  [!k arg1=x.
-!k],
-  [k(x)
-k(a b c)])
+
+define.sps:9.11: error: DEBUG EXPAND: Reached end of command expecting "@:}@" in
+argument !arg1 to macro !k.
+    9 | !k arg1=@{:@x.
+      |           ^
+
+k(x, )
+
+define.sps:10.17: error: DEBUG EXPAND: Found `.' while expecting `=' reading
+argument !arg2 to macro !k.
+   10 | !k arg1=(x) arg2.
+      |                 ^
+
+k(x, )
+
+define.sps:11.18: error: DEBUG EXPAND: Found `.' while expecting `{' reading
+argument !arg2 to macro !k.
+   11 | !k arg1=(x) arg2=.
+      |                  ^
+
+k(x, )
+
+define.sps:12.18: error: DEBUG EXPAND: Found `y' while expecting `{' reading
+argument !arg2 to macro !k.
+   12 | !k arg1=(x) arg2=y.
+      |                  ^
+
+k(x, )
+
+note: unexpanded token "y"
+
+define.sps:13.18: error: DEBUG EXPAND: Found `@{:@' while expecting `{' reading
+argument !arg2 to macro !k.
+   13 | !k arg1=(x) arg2=@{:@y.
+      |                  ^
+
+k(x, )
+
+note: unexpanded token "@{:@"
+
+note: unexpanded token "y"
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !BLANKS in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!BLANKS],
-  [DEFINE !b()
+AT_SETUP([macro expansion - !BLANKS])
+AT_KEYWORDS([BLANKS])
+AT_DATA([define.sps], [dnl
+DEFINE !b()
 !BLANKS(0).
 !QUOTE(!BLANKS(0)).
 !BLANKS(1).
@@ -384,20 +751,28 @@ PSPP_CHECK_MACRO_EXPANSION([!BLANKS],
 !QUOTE(!BLANKS(2)).
 !BLANKS(5).
 !QUOTE(!BLANKS(5)).
-!ENDDEFINE],
-  [!b.],
-  [.
+!ENDDEFINE.
+DEBUG EXPAND.
+!b.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+.
 ''.
 .
 ' '.
 .
 '  '.
 .
-'     '.])
+'     '.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !CONCAT in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!CONCAT],
-  [DEFINE !c()
+AT_SETUP([macro expansion - !CONCAT])
+AT_KEYWORDS([CONCAT])
+AT_DATA([define.sps], [dnl
+DEFINE !c()
 !CONCAT(x, y).
 !CONCAT('x', 'y').
 !CONCAT(12, 34).
@@ -406,92 +781,135 @@ PSPP_CHECK_MACRO_EXPANSION([!CONCAT],
 !CONCAT(x, 0, y).
 !CONCAT(0, x).
 !CONCAT(0, x, y).
-!ENDDEFINE],
-  [!c.],
-  [xy.
+!ENDDEFINE.
+DEBUG EXPAND.
+!c
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+xy.
 xy.
 1234.
 123.
 x0.
 x0y.
 0 x.
-0 xy.])
+0 xy.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !EVAL in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!EVAL],
-  [DEFINE !vars() a b c !ENDDEFINE.
+AT_SETUP([macro expansion - !EVAL])
+AT_KEYWORDS([EVAL])
+AT_DATA([define.sps], [dnl
+DEFINE !vars() a b c !ENDDEFINE.
+
 DEFINE !e()
 !vars.
 !QUOTE(!vars).
 !EVAL(!vars).
 !QUOTE(!EVAL(!vars)).
 !ENDDEFINE
+
 DEFINE !e2(!positional !enclose('(',')'))
 !1.
 !QUOTE(!1).
 !EVAL(!1).
 !QUOTE(!EVAL(!1)).
-!ENDDEFINE],
-  [!e.
-!e2(!vars)],
-  [a b c.
+!ENDDEFINE.
+DEBUG EXPAND.
+!e.
+!e2(!vars).
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+a b c.
 '!vars'.
 a b c.
 'a b c'.
+
 a b c.
 '!vars'.
 a b c.
-'a b c'.])
+'a b c'.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !HEAD in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!HEAD],
-  [DEFINE !h()
+AT_SETUP([macro expansion - !HEAD])
+AT_KEYWORDS([HEAD])
+AT_DATA([define.sps], [dnl
+DEFINE !h()
 !HEAD('a b c').
 !HEAD('a').
 !HEAD(!NULL).
 !HEAD('').
-!ENDDEFINE],
-  [!h.],
-  [a.
+!ENDDEFINE.
+DEBUG EXPAND.
+!h.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+a.
 a.
 .
-.])
+.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !TAIL in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!TAIL],
-  [DEFINE !t()
+AT_SETUP([macro expansion - !TAIL])
+AT_KEYWORDS([TAIL])
+AT_DATA([define.sps], [dnl
+DEFINE !t()
 !TAIL('a b c').
 !TAIL('a').
 !TAIL(!NULL).
 !TAIL('').
-!ENDDEFINE],
-  [!t.],
-  [b c.
+!ENDDEFINE.
+DEBUG EXPAND.
+!t.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+b c.
 .
 .
-.])
+.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !INDEX in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!INDEX],
-  [DEFINE !i()
+AT_SETUP([macro expansion - !INDEX])
+AT_KEYWORDS([INDEX])
+AT_DATA([define.sps], [dnl
+DEFINE !i()
 !INDEX(banana, an).
 !INDEX(banana, nan).
 !INDEX(banana, apple).
 !INDEX("banana", nan).
 !INDEX("banana", "nan").
 !INDEX(!UNQUOTE("banana"), !UNQUOTE("nan")).
-!ENDDEFINE],
-  [!i.],
-  [2.
+!ENDDEFINE.
+DEBUG EXPAND.
+!i.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+2.
 3.
 0.
 4.
 0.
-3.])
+3.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !LENGTH in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!LENGTH],
-  [DEFINE !l()
+AT_SETUP([macro expansion - !LENGTH])
+AT_KEYWORDS([LENGTH])
+AT_DATA([define.sps], [dnl
+DEFINE !l()
 !LENGTH(123).
 !LENGTH(123.00).
 !LENGTH( 123 ).
@@ -505,11 +923,15 @@ PSPP_CHECK_MACRO_EXPANSION([!LENGTH],
 !ENDDEFINE.
 DEFINE !la(!positional !enclose('(',')'))
 !LENGTH(!1).
-!ENDDEFINE.],
-  [!l.
+!ENDDEFINE.
+DEBUG EXPAND.
+!l.
 !la(a b c).
-!la().],
-  [3.
+!la().
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+3.
 6.
 3.
 5.
@@ -519,12 +941,84 @@ DEFINE !la(!positional !enclose('(',')'))
 5.
 6.
 0.
+
 5.
-0.])
+
+0.
+])
+AT_CLEANUP
+
+dnl Keep this test in sync with the examples for !NULL in the manual.
+AT_SETUP([macro expansion - !NULL])
+AT_KEYWORDS([NULL])
+AT_DATA([define.sps], [dnl
+DEFINE !n()
+!NULL.
+!QUOTE(!NULL).
+!ENDDEFINE.
+DEBUG EXPAND.
+!n.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+.
+''.
+])
+AT_CLEANUP
+
+dnl Keep this test in sync with the examples for !QUOTE and !UNQUOTE in the manual.
+AT_SETUP([macro expansion - !QUOTE and !UNQUOTE])
+AT_KEYWORDS([QUOTE UNQUOTE])
+AT_DATA([define.sps], [dnl
+DEFINE !q(!POS !CMDEND)
+!QUOTE(123.0).
+!QUOTE( 123 ).
+!QUOTE('a b c').
+!QUOTE("a b c").
+!QUOTE(!1).
+
+!UNQUOTE(123.0).
+!UNQUOTE( 123 ).
+!UNQUOTE('a b c').
+!UNQUOTE("a b c").
+!UNQUOTE(!1).
+
+!QUOTE(!UNQUOTE(123.0)).
+!QUOTE(!UNQUOTE( 123 )).
+!QUOTE(!UNQUOTE('a b c')).
+!QUOTE(!UNQUOTE("a b c")).
+!QUOTE(!UNQUOTE(!1)).
+!ENDDEFINE.
+DEBUG EXPAND.
+!q a 'b' c.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+'123.0'.
+'123'.
+'a b c'.
+"a b c".
+'a ''b'' c'.
+
+123.0.
+123.
+a b c.
+a b c.
+a 'b' c.
+
+'123.0'.
+'123'.
+'a b c'.
+'a b c'.
+'a ''b'' c'.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !SUBSTR in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!SUBSTR],
-  [DEFINE !s()
+AT_SETUP([macro expansion - !SUBSTR])
+AT_KEYWORDS([SUBSTR])
+AT_DATA([define.sps], [dnl
+DEFINE !s()
 !SUBSTR(banana, 3).
 !SUBSTR(banana, 3, 3).
 !SUBSTR("banana", 1, 3).
@@ -533,11 +1027,18 @@ PSPP_CHECK_MACRO_EXPANSION([!SUBSTR],
 !SUBSTR(banana, 3, 0).
 !SUBSTR(banana, 3, 10).
 !SUBSTR(banana, 10, 3).
-!ENDDEFINE.],
-  [!s.],
-  [define.sps:1-10: At `"ba' in the expansion of `!s',dnl "
+!ENDDEFINE.
+DEBUG EXPAND.
+!s.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
+define.sps:1-10: At `"ba' in the expansion of `!s',dnl "
+
+define.sps:12.1-12.2: error: DEBUG EXPAND: Unterminated string constant.
+   12 | !s.
+      | ^~
 
-define.sps:12: error: DEBUG EXPAND: Unterminated string constant.
 nana.
 nan.
 .
@@ -545,39 +1046,57 @@ nana.
 ana.
 .
 nana.
-.])
+.
+])
+AT_CLEANUP
 
 dnl Keep this test in sync with the examples for !UPCASE in the manual.
-PSPP_CHECK_MACRO_EXPANSION([!UPCASE],
-  [DEFINE !u()
+AT_SETUP([macro expansion - !UPCASE])
+AT_KEYWORDS([UPCASE])
+AT_DATA([define.sps], [dnl
+DEFINE !u()
 !UPCASE(freckle).
 !UPCASE('freckle').
 !UPCASE('a b c').
 !UPCASE('A B C').
-!ENDDEFINE.],
-  [!u.],
-  [FRECKLE.
+!ENDDEFINE.
+DEBUG EXPAND.
+!u.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+FRECKLE.
 FRECKLE.
 A B C.
-A B C.])
-
+A B C.
+])
+AT_CLEANUP
 
 dnl !* is implemented separately inside and outside function arguments
 dnl so this test makes sure to include both.
-PSPP_CHECK_MACRO_EXPANSION([!*], [dnl
+AT_SETUP([macro expansion - !*])
+AT_DATA([define.sps], [dnl
 DEFINE !m(!POSITIONAL !TOKENS(1)
          /!POSITIONAL !TOKENS(1))
 !*/
 !LENGTH(!*)/
 !SUBSTR(!*, 3)/
 !QUOTE(!*).
-!ENDDEFINE.],
-  [!m 123 b
+!ENDDEFINE.
+DEBUG EXPAND.
+!m 123 b
 !m 2 3
 !m '' 'b'.
-], [123 b / 5 / 3 b / '123 b'.
+])
+AT_CAPTURE_FILE([define.sps])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+123 b / 5 / 3 b / '123 b'.
+
 2 3 / 3 / 3 / '2 3'.
-'' 'b' / 6 / 'b' / ''''' ''b'''.])
+
+'' 'b' / 6 / 'b' / ''''' ''b'''.
+])
+AT_CLEANUP
 
 AT_SETUP([macro maximum nesting level (MNEST)])
 AT_KEYWORDS([MNEST])
@@ -639,9 +1158,13 @@ define.sps:1-3: inside the expansion of `!macro',
 define.sps:1-3: inside the expansion of `!macro',
 define.sps:1-3: inside the expansion of `!macro',
 define.sps:1-3: inside the expansion of `!macro',
-define.sps:4: error: DEFINE: Maximum nesting level 50 exceeded.  (Use SET MNEST to change the limit.)"
+define.sps:4.1-4.6: error: DEFINE: Maximum nesting level 50 exceeded.  (Use SET MNEST to change the limit.)
+    4 | !macro.
+      | ^~~~~~"
 
-define.sps:4.1-4.6: error: Syntax error at `!macro' (in expansion of `!macro'): expecting command name.
+"define.sps:4.1-4.6: error: In syntax expanded from `!macro': Syntax error expecting command name.
+    4 | !macro.
+      | ^~~~~~"
 ])
 AT_CLEANUP
 
@@ -908,14 +1431,18 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 define.sps:1-3: At `!x' in the expansion of `!for',
-define.sps:10: error: DEBUG EXPAND: Cannot use argument name or macro keyword
-as !DO variable.
+define.sps:10.1-10.12: error: DEBUG EXPAND: Cannot use argument name or macro
+keyword as !DO variable.
+   10 | !for x=1 y=5.
+      | ^~~~~~~~~~~~
 
 !DO 1 = 1 !TO 5 !var !DOEND.
 
 define.sps:5-7: At `!noexpand' in the expansion of `!for2',
-define.sps:11: error: DEBUG EXPAND: Cannot use argument name or macro keyword
-as !DO variable.
+define.sps:11.1-11.13: error: DEBUG EXPAND: Cannot use argument name or macro
+keyword as !DO variable.
+   11 | !for2 x=1 y=5.
+      | ^~~~~~~~~~~~~
 
 !DO !noexpand = 1 !TO 5 !var !DOEND.
 ])
@@ -958,15 +1485,19 @@ AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 
 In the expansion of `!DO',
 define.sps:3-5: inside the expansion of `!for',
-define.sps:14: error: DEBUG EXPAND: Numerical !DO loop exceeded maximum number
-of iterations 3.  (Use SET MITERATE to change the limit.)
+define.sps:14.1-14.8: error: DEBUG EXPAND: Numerical !DO loop exceeded maximum
+number of iterations 3.  (Use SET MITERATE to change the limit.)
+   14 | !for 1 5.
+      | ^~~~~~~~
 
 1 2 3 4.
 
 In the expansion of `!DO',
 define.sps:7-9: inside the expansion of `!forby',
-define.sps:15: error: DEBUG EXPAND: Numerical !DO loop exceeded maximum number
-of iterations 3.  (Use SET MITERATE to change the limit.)
+define.sps:15.1-15.12: error: DEBUG EXPAND: Numerical !DO loop exceeded maximum
+number of iterations 3.  (Use SET MITERATE to change the limit.)
+   15 | !forby 1 5 1.
+      | ^~~~~~~~~~~~
 
 1 2 3 4.
 
@@ -984,8 +1515,10 @@ of iterations 3.  (Use SET MITERATE to change the limit.)
 
 In the expansion of `!DO',
 define.sps:7-9: inside the expansion of `!forby',
-define.sps:23: error: DEBUG EXPAND: Numerical !DO loop exceeded maximum number
-of iterations 3.  (Use SET MITERATE to change the limit.)
+define.sps:23.1-23.13: error: DEBUG EXPAND: Numerical !DO loop exceeded maximum
+number of iterations 3.  (Use SET MITERATE to change the limit.)
+   23 | !forby 5 1 -1.
+      | ^~~~~~~~~~~~~
 
 5 4 3 2.
 
@@ -1063,15 +1596,19 @@ DEBUG EXPAND.
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 In the expansion of `!DO',
 define.sps:1-3: inside the expansion of `!for',
-define.sps:7: error: DEBUG EXPAND: !DO loop over list exceeded maximum number
-of iterations 2.  (Use SET MITERATE to change the limit.)
+define.sps:7.1-7.10: error: DEBUG EXPAND: !DO loop over list exceeded maximum
+number of iterations 2.  (Use SET MITERATE to change the limit.)
+    7 | !for a b c.
+      | ^~~~~~~~~~
 
 ( (a) (b) ).
 
 In the expansion of `!DO',
 define.sps:1-3: inside the expansion of `!for',
-define.sps:8: error: DEBUG EXPAND: !DO loop over list exceeded maximum number
-of iterations 2.  (Use SET MITERATE to change the limit.)
+define.sps:8.1-8.23: error: DEBUG EXPAND: !DO loop over list exceeded maximum
+number of iterations 2.  (Use SET MITERATE to change the limit.)
+    8 | !for 'foo bar baz quux'.
+      | ^~~~~~~~~~~~~~~~~~~~~~~
 
 ( (foo) (bar) ).
 
@@ -1146,15 +1683,21 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps -O format=csv], [1], [dnl
 "define.sps:1-3: At `!x' in the expansion of `!macro',
-define.sps:10: error: DEBUG EXPAND: Cannot use argument name or macro keyword ""!x"" as !LET variable."
+define.sps:10.1-10.10: error: DEBUG EXPAND: Cannot use argument name or macro keyword ""!x"" as !LET variable.
+   10 | !macro x=1.
+      | ^~~~~~~~~~"
 
 !LET 1 = 1
 
 "define.sps:5-7: At `!do' in the expansion of `!macro2',
-define.sps:11: error: DEBUG EXPAND: Cannot use argument name or macro keyword ""!do"" as !LET variable."
+define.sps:11.1-11.7: error: DEBUG EXPAND: Cannot use argument name or macro keyword ""!do"" as !LET variable.
+   11 | !macro2.
+      | ^~~~~~~"
 
 "define.sps:5-7: At `=' in the expansion of `!macro2',
-define.sps:11: error: DEBUG EXPAND: Expected macro variable name following !DO."
+define.sps:11.1-11.7: error: DEBUG EXPAND: Expected macro variable name following !DO.
+   11 | !macro2.
+      | ^~~~~~~"
 
 !LET !do = x
 ])
@@ -1207,7 +1750,9 @@ DATA LIST NOTABLE /a b 1-2.
 COMPUTE x = !vars x.
 ])
 AT_CHECK([pspp -O format=csv define.sps], [1], [dnl
-define.sps:3.13-3.19: error: COMPUTE: Syntax error at `b' (in expansion of `!vars x'): expecting end of command.
+"define.sps:3.13-3.19: error: COMPUTE: In syntax expanded from `!vars x': Syntax error expecting end of command.
+    3 | COMPUTE x = !vars x.
+      |             ^~~~~~~"
 ])
 AT_CLEANUP
 
@@ -1245,15 +1790,33 @@ x'123'
 !ENDDEFINE.
 ])
 AT_CHECK([pspp define.sps], [1], [dnl
-define.sps:3: error: DEFINE: String of hex digits has 3 characters, which is
-not a multiple of 2.
+define.sps:2.1-2.6: error: DEFINE: String of hex digits has 3 characters, which
+is not a multiple of 2.
+    2 | x'123'
+      | ^~~~~~
+])
+AT_CLEANUP
+
+AT_SETUP([macro name overlaps with macro function name])
+dnl !len is short for macro function !LENGTH.  PSPP used to
+dnl reject the following with "`(' expected following !LENGTH".
+dnl Now PSPP only consider macro functions when the name is
+dnl followed by '('.
+AT_DATA([define.sps], [dnl
+DEFINE !len() 5 !ENDDEFINE.
+DEFINE !x() !eval(!len) !ENDDEFINE.
+DEBUG EXPAND.
+!x
+])
+AT_CHECK([pspp -O format=csv define.sps --testing-mode], [0], [dnl
+5
 ])
 AT_CLEANUP
 
 AT_SETUP([generic macro function syntax errors])
 AT_DATA([define.sps], [dnl
-DEFINE !a() !SUBSTR !ENDDEFINE.
-DEFINE !b() !SUBSTR x !ENDDEFINE.
+
+
 DEFINE !c() !SUBSTR(1x) !ENDDEFINE.
 DEFINE !d() !SUBSTR(1 !ENDDEFINE.
 DEFINE !narg_blanks() !BLANKS() !ENDDEFINE.
@@ -1270,8 +1833,8 @@ DEFINE !narg_unquote() !UNQUOTE() !ENDDEFINE.
 DEFINE !narg_upcase() !UPCASE() !ENDDEFINE.
 dnl )
 DEBUG EXPAND.
-!a.
-!b.
+
+
 !c.
 !d.
 !narg_blanks.
@@ -1288,93 +1851,109 @@ DEBUG EXPAND.
 !narg_upcase.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
-define.sps:1: In the expansion of `!a',
-define.sps:18: error: DEBUG EXPAND: `@{:@' expected following !SUBSTR.
-
-!SUBSTR
-
-define.sps:2: At `x' in the expansion of `!b',
-define.sps:19: error: DEBUG EXPAND: `@{:@' expected following !SUBSTR.
-
-!SUBSTR x
-
 define.sps:3: At `x' in the expansion of `!c',
-define.sps:20: error: DEBUG EXPAND: `,' or `@:}@' expected in call to macro
+define.sps:20.1-20.2: error: DEBUG EXPAND: `,' or `@:}@' expected in call to macro
 function !SUBSTR.
+   20 | !c.
+      | ^~
 
 !SUBSTR(1 x)
 
 define.sps:4: In the expansion of `!d',
-define.sps:21: error: DEBUG EXPAND: Missing `@:}@' in call to macro function !
-SUBSTR.
+define.sps:21.1-21.2: error: DEBUG EXPAND: Missing `@:}@' in call to macro
+function !SUBSTR.
+   21 | !d.
+      | ^~
 
 !SUBSTR@{:@1
 
 define.sps:5: In the expansion of `!narg_blanks',
-define.sps:22: error: DEBUG EXPAND: Macro function !BLANKS takes one argument
-(not 0).
+define.sps:22.1-22.12: error: DEBUG EXPAND: Macro function !BLANKS takes one
+argument (not 0).
+   22 | !narg_blanks.
+      | ^~~~~~~~~~~~
 
 !BLANKS( )
 
 define.sps:6: In the expansion of `!narg_concat',
-define.sps:23: error: DEBUG EXPAND: Macro function !CONCAT needs at least one
-argument.
+define.sps:23.1-23.12: error: DEBUG EXPAND: Macro function !CONCAT needs at
+least one argument.
+   23 | !narg_concat.
+      | ^~~~~~~~~~~~
 
 !CONCAT( )
 
 define.sps:7: In the expansion of `!narg_eval',
-define.sps:24: error: DEBUG EXPAND: Macro function !EVAL takes one argument
-(not 0).
+define.sps:24.1-24.10: error: DEBUG EXPAND: Macro function !EVAL takes one
+argument (not 0).
+   24 | !narg_eval.
+      | ^~~~~~~~~~
 
 !EVAL( )
 
 define.sps:8: In the expansion of `!narg_head',
-define.sps:25: error: DEBUG EXPAND: Macro function !HEAD takes one argument
-(not 0).
+define.sps:25.1-25.10: error: DEBUG EXPAND: Macro function !HEAD takes one
+argument (not 0).
+   25 | !narg_head.
+      | ^~~~~~~~~~
 
 !HEAD( )
 
 define.sps:9: In the expansion of `!narg_index',
-define.sps:26: error: DEBUG EXPAND: Macro function !INDEX takes two arguments
-(not 0).
+define.sps:26.1-26.11: error: DEBUG EXPAND: Macro function !INDEX takes two
+arguments (not 0).
+   26 | !narg_index.
+      | ^~~~~~~~~~~
 
 !INDEX( )
 
 define.sps:10: In the expansion of `!narg_length',
-define.sps:27: error: DEBUG EXPAND: Macro function !LENGTH takes one argument
-(not 0).
+define.sps:27.1-27.12: error: DEBUG EXPAND: Macro function !LENGTH takes one
+argument (not 0).
+   27 | !narg_length.
+      | ^~~~~~~~~~~~
 
 !LENGTH( )
 
 ( )
 
 define.sps:12: In the expansion of `!narg_quote',
-define.sps:29: error: DEBUG EXPAND: Macro function !QUOTE takes one argument
-(not 0).
+define.sps:29.1-29.11: error: DEBUG EXPAND: Macro function !QUOTE takes one
+argument (not 0).
+   29 | !narg_quote.
+      | ^~~~~~~~~~~
 
 !QUOTE( )
 
 define.sps:13: In the expansion of `!narg_substr',
-define.sps:30: error: DEBUG EXPAND: Macro function !SUBSTR takes two or three
-arguments (not 0).
-
+define.sps:30.1-30.12: error: DEBUG EXPAND: Macro function !SUBSTR takes two or
+three arguments (not 0).
+   30 | !narg_substr.
+      | ^~~~~~~~~~~~
+ 
 !SUBSTR( )
 
 define.sps:14: In the expansion of `!narg_tail',
-define.sps:31: error: DEBUG EXPAND: Macro function !TAIL takes one argument
-(not 0).
+define.sps:31.1-31.10: error: DEBUG EXPAND: Macro function !TAIL takes one
+argument (not 0).
+   31 | !narg_tail.
+      | ^~~~~~~~~~
 
 !TAIL( )
 
 define.sps:15: In the expansion of `!narg_unquote',
-define.sps:32: error: DEBUG EXPAND: Macro function !UNQUOTE takes one argument
-(not 0).
+define.sps:32.1-32.13: error: DEBUG EXPAND: Macro function !UNQUOTE takes one
+argument (not 0).
+   32 | !narg_unquote.
+      | ^~~~~~~~~~~~~
 
 !UNQUOTE( )
 
 define.sps:16: In the expansion of `!narg_upcase',
-define.sps:33: error: DEBUG EXPAND: Macro function !UPCASE takes one argument
-(not 0).
+define.sps:33.1-33.12: error: DEBUG EXPAND: Macro function !UPCASE takes one
+argument (not 0).
+   33 | !narg_upcase.
+      | ^~~~~~~~~~~~
 
 !UPCASE( )
 ])
@@ -1392,20 +1971,26 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 define.sps:1: In the expansion of `!a',
-define.sps:5: error: DEBUG EXPAND: Argument to !BLANKS must be non-negative
-integer (not "x").
+define.sps:5.1-5.2: error: DEBUG EXPAND: Argument to !BLANKS must be non-
+negative integer (not "x").
+    5 | !a.
+      | ^~
 
 !BLANKS(x).
 
 define.sps:2: In the expansion of `!b',
-define.sps:6: error: DEBUG EXPAND: Second argument of !SUBSTR must be positive
-integer (not "y").
+define.sps:6.1-6.2: error: DEBUG EXPAND: Second argument of !SUBSTR must be
+positive integer (not "y").
+    6 | !b.
+      | ^~
 
 !SUBSTR(x, y).
 
 define.sps:3: In the expansion of `!c',
-define.sps:7: error: DEBUG EXPAND: Third argument of !SUBSTR must be non-
+define.sps:7.1-7.2: error: DEBUG EXPAND: Third argument of !SUBSTR must be non-
 negative integer (not "z").
+    7 | !c.
+      | ^~
 
 !SUBSTR(x, 1, z).
 ])
@@ -1424,20 +2009,26 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 define.sps:1-2: At `.' in the expansion of `!a',
-define.sps:5: error: DEBUG EXPAND: Expecting ')' in macro expression.
+define.sps:5.1-5.2: error: DEBUG EXPAND: Expecting ')' in macro expression.
+    5 | !a.
+      | ^~
 
 !LET !x = (1.
 
 At `x' in the expansion of `!DO',
 define.sps:2: inside the expansion of `!b',
-define.sps:6: error: DEBUG EXPAND: Macro expression must evaluate to a number
-(not "x").
+define.sps:6.1-6.2: error: DEBUG EXPAND: Macro expression must evaluate to a
+number (not "x").
+    6 | !b.
+      | ^~
 
 !DO !x = x.
 
 define.sps:3: At `)' in the expansion of `!c',
-define.sps:7: error: DEBUG EXPAND: Expecting literal or function invocation in
-macro expression.
+define.sps:7.1-7.2: error: DEBUG EXPAND: Expecting literal or function
+invocation in macro expression.
+    7 | !c.
+      | ^~
 
 !LET !x = ( ).
 ])
@@ -1456,18 +2047,25 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 define.sps:1: In the expansion of `!a',
-define.sps:5: error: DEBUG EXPAND: !THEN expected in macro !IF construct.
+define.sps:5.1-5.2: error: DEBUG EXPAND: !THEN expected in macro !IF construct.
+    5 | !a.
+      | ^~
 
 !IF 1
 
 define.sps:2: In the expansion of `!b',
-define.sps:6: error: DEBUG EXPAND: !ELSE or !IFEND expected in macro !IF
+define.sps:6.1-6.2: error: DEBUG EXPAND: !ELSE or !IFEND expected in macro !IF
 construct.
+    6 | !b.
+      | ^~
 
 !IF 1 !THEN
 
 define.sps:3: In the expansion of `!c',
-define.sps:7: error: DEBUG EXPAND: !IFEND expected in macro !IF construct.
+define.sps:7.1-7.2: error: DEBUG EXPAND: !IFEND expected in macro !IF
+construct.
+    7 | !c.
+      | ^~
 
 !IF 1 !THEN !ELSE
 ])
@@ -1488,22 +2086,32 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 define.sps:1: In the expansion of `!a',
-define.sps:6: error: DEBUG EXPAND: Expected macro variable name following !LET.
+define.sps:6.1-6.2: error: DEBUG EXPAND: Expected macro variable name following
+!LET.
+    6 | !a.
+      | ^~
 
 !LET
 
 define.sps:2: At `0' in the expansion of `!b',
-define.sps:7: error: DEBUG EXPAND: Expected macro variable name following !LET.
+define.sps:7.1-7.2: error: DEBUG EXPAND: Expected macro variable name following
+!LET.
+    7 | !b.
+      | ^~
 
 !LET 0
 
 define.sps:3: In the expansion of `!c',
-define.sps:8: error: DEBUG EXPAND: Expected `=' following !LET.
+define.sps:8.1-8.2: error: DEBUG EXPAND: Expected `=' following !LET.
+    8 | !c.
+      | ^~
 
 !LET !x
 
 define.sps:4: At `y' in the expansion of `!d',
-define.sps:9: error: DEBUG EXPAND: Expected `=' following !LET.
+define.sps:9.1-9.2: error: DEBUG EXPAND: Expected `=' following !LET.
+    9 | !d.
+      | ^~
 
 !LET !x y
 ])
@@ -1536,57 +2144,79 @@ DEBUG EXPAND.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 define.sps:1: In the expansion of `!a',
-define.sps:12: error: DEBUG EXPAND: Expected macro variable name following !DO.
+define.sps:12.1-12.2: error: DEBUG EXPAND: Expected macro variable name
+following !DO.
+   12 | !a.
+      | ^~
 
 !DO
 
 define.sps:2: At `0' in the expansion of `!b',
-define.sps:13: error: DEBUG EXPAND: Expected macro variable name following !DO.
+define.sps:13.1-13.2: error: DEBUG EXPAND: Expected macro variable name
+following !DO.
+   13 | !b.
+      | ^~
 
 !DO 0
 
 define.sps:3: In the expansion of `!c',
-define.sps:14: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
+define.sps:14.1-14.2: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
+   14 | !c.
+      | ^~
 
 !DO !x
 
 In the expansion of `!DO',
 define.sps:4: inside the expansion of `!d',
-define.sps:15: error: DEBUG EXPAND: Missing !DOEND.
+define.sps:15.1-15.2: error: DEBUG EXPAND: Missing !DOEND.
+   15 | !d.
+      | ^~
 
 !DO !x !in(x)
 
 At `x' in the expansion of `!DO',
 define.sps:5: inside the expansion of `!e',
-define.sps:16: error: DEBUG EXPAND: Macro expression must evaluate to a number
-(not "x").
+define.sps:16.1-16.2: error: DEBUG EXPAND: Macro expression must evaluate to a
+number (not "x").
+   16 | !e.
+      | ^~
 
 !DO !x = x.
 
 At `x' in the expansion of `!DO',
 define.sps:6: inside the expansion of `!f',
-define.sps:17: error: DEBUG EXPAND: Expected !TO in numerical !DO loop.
+define.sps:17.1-17.2: error: DEBUG EXPAND: Expected !TO in numerical !DO loop.
+   17 | !f.
+      | ^~
 
 !DO !x = 5 x
 
 In the expansion of `!DO',
 define.sps:7: inside the expansion of `!g',
-define.sps:18: error: DEBUG EXPAND: !BY value cannot be zero.
+define.sps:18.1-18.2: error: DEBUG EXPAND: !BY value cannot be zero.
+   18 | !g.
+      | ^~
 
 !DO !x = 5 !TO 6 !BY 0
 
 define.sps:8: In the expansion of `!h',
-define.sps:19: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
+define.sps:19.1-19.2: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
+   19 | !h.
+      | ^~
 
 !DO !x
 
 define.sps:9: At `0' in the expansion of `!i',
-define.sps:20: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
+define.sps:20.1-20.2: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
+   20 | !i.
+      | ^~
 
 !DO !x 0
 
 define.sps:10: At `!BREAK' in the expansion of `!j',
-define.sps:21: error: DEBUG EXPAND: !BREAK outside !DO.
+define.sps:21.1-21.2: error: DEBUG EXPAND: !BREAK outside !DO.
+   21 | !j.
+      | ^~
 
 ])
 AT_CLEANUP
@@ -1629,58 +2259,197 @@ DEFINE !macro(x=!CHAREND(8)) !ENDDEFINE.
 DEFINE !macro(x=!CHAREND('x' 9)) !ENDDEFINE.
 DEFINE !macro(x=!WTF) !ENDDEFINE.
 DEFINE !macro(x=!TOKENS(1) x) !ENDDEFINE.
+DEFINE !macro(x=!DEFAULT() !DEFAULT()) !ENDDEFINE.
+DEFINE !macro(x=!TOKENS(1) !CMDEND) !ENDDEFINE.
 DEFINE !macro()
 ])
 AT_CHECK([pspp define.sps], [1], [dnl
-define.sps:1.36-1.40: error: DEFINE: Syntax error at `'x y'': String must
-contain exactly one token.
-
-define.sps:2.40-2.46: error: DEFINE: Syntax error at `!TOKENS': Positional
-parameters must precede keyword parameters.
-
-define.sps:3.15-3.16: error: DEFINE: Syntax error at `!a': Keyword macro
-parameter must be named in definition without "!" prefix.
-
-define.sps:4.15-4.16: error: DEFINE: Syntax error at `do': Cannot use macro
-keyword "do" as an argument name.
-
-define.sps:5.8: error: DEFINE: Syntax error at `0': expecting identifier.
-
-define.sps:6.10: error: DEFINE: Syntax error at `y': expecting `@{:@'.
-
-define.sps:7.15: error: DEFINE: Syntax error at `1': expecting identifier.
+define.sps:1.36-1.40: error: DEFINE: String must contain exactly one token.
+    1 | DEFINE !macro(!POSITIONAL !CHAREND('x y')) !ENDDEFINE.
+      |                                    ^~~~~
+
+define.sps:2.28-2.38: error: DEFINE: Positional parameters must precede keyword
+parameters.
+    2 | DEFINE !macro(a=!TOKENS(1)/!POSITIONAL !TOKENS(1)) !ENDDEFINE.
+      |                            ^~~~~~~~~~~
+
+define.sps:2.15: note: DEFINE: Here is a previous keyword parameter.
+    2 | DEFINE !macro(a=!TOKENS(1)/!POSITIONAL !TOKENS(1)) !ENDDEFINE.
+      |               ^
+
+define.sps:3.15-3.16: error: DEFINE: Keyword macro parameter must be named in
+definition without "!" prefix.
+    3 | DEFINE !macro(!a=!TOKENS(1)) !ENDDEFINE.
+      |               ^~
+
+define.sps:4.15-4.16: error: DEFINE: Cannot use macro keyword "do" as an
+argument name.
+    4 | DEFINE !macro(do=!TOKENS(1)) !ENDDEFINE.
+      |               ^~
+
+define.sps:5.8: error: DEFINE: Syntax error expecting identifier.
+    5 | DEFINE 0() !ENDDEFINE.
+      |        ^
+
+define.sps:6.10: error: DEFINE: Syntax error expecting `@{:@'.
+    6 | DEFINE x y () !ENDDEFINE.
+      |          ^
+
+define.sps:7.15: error: DEFINE: Syntax error expecting identifier.
+    7 | DEFINE !macro(1) !ENDDEFINE.
+      |               ^
+
+define.sps:8.17: error: DEFINE: Syntax error expecting !TOKENS, !CHAREND, !
+ENCLOSE, or !CMDEND.
+    8 | DEFINE !macro(x 2) !ENDDEFINE.
+      |                 ^
+
+define.sps:9.26: error: DEFINE: Syntax error expecting `@{:@'.
+    9 | DEFINE !macro(x=!DEFAULT 3) !ENDDEFINE.
+      |                          ^
+
+define.sps:10.25: error: DEFINE: Syntax error expecting `@{:@'.
+   10 | DEFINE !macro(x=!TOKENS 4) !ENDDEFINE.
+      |                         ^
+
+define.sps:11.25: error: DEFINE: Syntax error expecting positive integer for !
+TOKENS.
+   11 | DEFINE !macro(x=!TOKENS(x)) !ENDDEFINE.
+      |                         ^
+
+define.sps:12.27: error: DEFINE: Syntax error expecting `@:}@'.
+   12 | DEFINE !macro(x=!TOKENS(1 5)) !ENDDEFINE.
+      |                           ^
+
+define.sps:13.26: error: DEFINE: Syntax error expecting `@{:@'.
+   13 | DEFINE !macro(x=!ENCLOSE 6) !ENDDEFINE.
+      |                          ^
+
+define.sps:14.30: error: DEFINE: Syntax error expecting `,'.
+   14 | DEFINE !macro(x=!ENCLOSE('x' y)) !ENDDEFINE.
+      |                              ^
+
+define.sps:15.30: error: DEFINE: Syntax error expecting string.
+   15 | DEFINE !macro(x=!ENCLOSE('x',y)) !ENDDEFINE.
+      |                              ^
+
+define.sps:16.34: error: DEFINE: Syntax error expecting `@:}@'.
+   16 | DEFINE !macro(x=!ENCLOSE('x','y' z)) !ENDDEFINE.
+      |                                  ^
+
+define.sps:17.26: error: DEFINE: Syntax error expecting `@{:@'.
+   17 | DEFINE !macro(x=!CHAREND 7) !ENDDEFINE.
+      |                          ^
+
+define.sps:18.26: error: DEFINE: Syntax error expecting string.
+   18 | DEFINE !macro(x=!CHAREND(8)) !ENDDEFINE.
+      |                          ^
+
+define.sps:19.30: error: DEFINE: Syntax error expecting `@:}@'.
+   19 | DEFINE !macro(x=!CHAREND('x' 9)) !ENDDEFINE.
+      |                              ^
+
+define.sps:20.17-20.20: error: DEFINE: Syntax error expecting !TOKENS, !
+CHAREND, !ENCLOSE, or !CMDEND.
+   20 | DEFINE !macro(x=!WTF) !ENDDEFINE.
+      |                 ^~~~
+
+define.sps:21.28: error: DEFINE: Syntax error expecting `/'.
+   21 | DEFINE !macro(x=!TOKENS(1) x) !ENDDEFINE.
+      |                            ^
+
+define.sps:22.28-22.35: error: DEFINE: !DEFAULT is allowed only once per
+argument.
+   22 | DEFINE !macro(x=!DEFAULT() !DEFAULT()) !ENDDEFINE.
+      |                            ^~~~~~~~
+
+define.sps:23.28-23.34: error: DEFINE: Only one of !TOKENS, !CHAREND, !ENCLOSE,
+or !CMDEND is allowed.
+   23 | DEFINE !macro(x=!TOKENS(1) !CMDEND) !ENDDEFINE.
+      |                            ^~~~~~~
+
+define.sps:25.1: error: DEFINE: Syntax error expecting macro body or !
+ENDDEFINE.
+   25 |
+      | ^
+])
+AT_CLEANUP
 
-define.sps:8.17: error: DEFINE: Syntax error at `2': expecting `='.
+AT_SETUP([macro expansion with token merging])
+AT_DATA([define.sps], [dnl
+DEFINE !foo() "foo" !ENDDEFINE.
+DEFINE !bar() "bar" !ENDDEFINE.
+DEFINE !plus() + !ENDDEFINE.
+DEFINE !minus() - !ENDDEFINE.
+DEFINE !one() 1 !ENDDEFINE.
+ECHO "foo" + "bar".
+ECHO !foo.
+ECHO !bar.
+ECHO !foo + "quux".
+ECHO "baz" + !bar.
+ECHO !foo + !bar.
+ECHO !foo !plus !bar.
+ECHO "two" "strings".
+N OF CASES -/**/1.
+N OF CASES !minus 1.
+N OF CASES - !one.
+N OF CASES !minus !one.
+])
+AT_CHECK([pspp define.sps], [1], [dnl
+foobar
 
-define.sps:9.26: error: DEFINE: Syntax error at `3': expecting `@{:@'.
+foo
 
-define.sps:10.25: error: DEFINE: Syntax error at `4': expecting `('.
+bar
 
-define.sps:11.25: error: DEFINE: Syntax error at `x': Expected positive integer
-for !TOKENS.
+fooquux
 
-define.sps:12.27: error: DEFINE: Syntax error at `5': expecting `)'.
+bazbar
 
-define.sps:13.26: error: DEFINE: Syntax error at `6': expecting `('.
+foobar
 
-define.sps:14.30: error: DEFINE: Syntax error at `y': expecting `,'.
+foobar
 
-define.sps:15.30: error: DEFINE: Syntax error at `y': expecting string.
+two
 
-define.sps:16.34: error: DEFINE: Syntax error at `z': expecting `)'.
+define.sps:13.12-13.20: error: ECHO: Syntax error expecting end of command.
+   13 | ECHO "two" "strings".
+      |            ^~~~~~~~~
 
-define.sps:17.26: error: DEFINE: Syntax error at `7': expecting `('.
+define.sps:14.12-14.17: error: N OF CASES: Syntax error expecting positive
+integer for N OF CASES.
+   14 | N OF CASES -/**/1.
+      |            ^~~~~~
 
-define.sps:18.26: error: DEFINE: Syntax error at `8': expecting string.
+define.sps:15.12-15.19: error: N OF CASES: Syntax error expecting positive
+integer for N OF CASES.
+   15 | N OF CASES !minus 1.
+      |            ^~~~~~~~
 
-define.sps:19.30: error: DEFINE: Syntax error at `9': expecting `)'.
+define.sps:16.12-16.17: error: N OF CASES: Syntax error expecting positive
+integer for N OF CASES.
+   16 | N OF CASES - !one.
+      |            ^~~~~~
 
-define.sps:20.17-20.20: error: DEFINE: Syntax error at `!WTF': expecting !
-TOKENS, !CHAREND, !ENCLOSE, or !CMDEND.
+define.sps:17.12-17.22: error: N OF CASES: Syntax error expecting positive
+integer for N OF CASES.
+   17 | N OF CASES !minus !one.
+      |            ^~~~~~~~~~~
+])
+AT_CLEANUP
 
-define.sps:21.28: error: DEFINE: Syntax error at `x': expecting `/'.
+AT_SETUP([one macro calls another])
+AT_DATA([define.sps], [dnl
+DEFINE !a(!pos !enclose('(',')')) [[!1]] !ENDDEFINE.
+DEFINE !b(!pos !enclose('{','}')) !a(x !1 z) !ENDDEFINE.
+DEFINE !c(!pos !enclose('{','}')) !let !tmp=!quote(!concat('<',!1,'>')) !a(!tmp) !ENDDEFINE.
+DEBUG EXPAND.
+!b{y}.
+!c{y}.
+])
+AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
+[[x y z]]
 
-define.sps:23.1: error: DEFINE: Syntax error at end of command: Expecting macro
-body or !ENDDEFINE.
+[[ < y > ]]
 ])
 AT_CLEANUP
\ No newline at end of file