"x "" y".
!ENDDEFINE.
DEBUG EXPAND.
-!macro()
+!macro
])
AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
a b c d e f g h.
AT_SETUP([macro expansion with arguments])
AT_DATA([define.sps], [dnl
-DEFINE !t1(!positional !tokens(1)) (!1) !ENDDEFINE.
-DEFINE !t2(!positional !tokens(2)) (!1) !ENDDEFINE.
-DEFINE !ce(!positional !charend('/')) (!1) !ENDDEFINE.
+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('(')
+ /!positional !charend(')'))
+ce2 (!1, !2)
+!ENDDEFINE.
+
+DEFINE !e(!positional !enclose('{','}')) e (!1) !ENDDEFINE.
+
+DEFINE !cmd(!positional !cmdend) cmd(!1) !ENDDEFINE.
+DEFINE !cmd2(!positional !cmdend
+ /!positional !tokens(1))
+cmd2(!1, !2)
+!ENDDEFINE.
+
DEBUG EXPAND.
+!title "!TOKENS(1) argument."
!t1 a.
!t1 b.
!t1 a b.
+!title "!TOKENS(2) argument."
!t2 a b.
!t2 b c d.
+!title "!CHAREND argument."
+!ce/.
+!ce x/.
+!ce x y/.
!ce x y z/.
+
+!title "Two !CHAREND arguments."
+!ce2 x(y).
+!ce2 1 2 3 4().
+
+!title "!ENCLOSE argument."
+!e {}.
+!e {a}.
+!e {a b}.
+
+!title "!CMDEND argument."
+!cmd 1 2 3 4.
+!cmd2 5 6.
+7.
])
AT_CHECK([pspp --testing-mode define.sps], [0], [dnl
-(a)
+"!TOKENS(1) argument."
+
+t1(a)
+
+t1(b)
+
+t1(a)
+
+note: unexpanded token "b"
+
+"!TOKENS(2) argument."
+
+t2(a b)
+
+t2(b c)
+
+note: unexpanded token "d"
+
+"!CHAREND argument."
+
+ce( )
+
+ce(x)
+
+ce(x y)
+
+ce(x y z)
+
+"Two !CHAREND arguments."
+
+ce2(x, y)
+
+ce2(1 2 3 4, )
+
+"!ENCLOSE argument."
+
+e( )
-(b)
+e(a)
-(a)
+e(a b)
-(a b)
+"!CMDEND argument."
-(b c)
+cmd(1 2 3 4)
-(x y z)
+cmd2(5 6, 7)
])
AT_CLEANUP