Move stack into macro_expander.

[pspp] / tests / language / control / define.at

diff --git a/tests/language/control/define.at b/tests/language/control/define.at
index 44061836d3da54c88268bc15a756c984fae20a89..1e18b81bd716e89cdfc5bfb0625bdaab488ca4ea 100644 (file)
--- a/tests/language/control/define.at
+++ b/tests/language/control/define.at
@@ -956,13 +956,15 @@ DEBUG EXPAND.
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
 "increasing".
 
-define.sps:3-5: In the expansion of `!for',
+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.)
 
 1 2 3 4.
 
-define.sps:7-9: In the expansion of `!forby',
+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.)
 
@@ -980,7 +982,8 @@ of iterations 3.  (Use SET MITERATE to change the limit.)
 
 .
 
-define.sps:7-9: In the expansion of `!forby',
+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.)
 
@@ -1058,13 +1061,15 @@ DEBUG EXPAND.
 !for.
 ])
 AT_CHECK([pspp --testing-mode define.sps], [1], [dnl
-define.sps:1-3: In the expansion of `!for',
+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.)
 
 ( (a) (b) ).
 
-define.sps:1-3: In the expansion of `!for',
+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.)
 
@@ -1461,7 +1466,8 @@ define.sps:14: error: DEBUG EXPAND: Expected `=' or !IN in !DO loop.
 
 !DO !x
 
-define.sps:4: In the expansion of `!d',
+In the expansion of `!DO',
+define.sps:4: inside the expansion of `!d',
 define.sps:15: error: DEBUG EXPAND: Missing !DOEND.
 
 !DO !x !in(x)
@@ -1473,12 +1479,14 @@ define.sps:16: error: DEBUG EXPAND: Macro expression must evaluate to a number
 
 !DO !x = x.
 
-define.sps:6: At `x' in the expansion of `!f',
+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.
 
 !DO !x = 5 x
 
-define.sps:7: In the expansion of `!g',
+In the expansion of `!DO',
+define.sps:7: inside the expansion of `!g',
 define.sps:18: error: DEBUG EXPAND: !BY value cannot be zero.
 
 !DO !x = 5 !TO 6 !BY 0