output: Move text_item and group_item usage closer to the SPV model.

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

diff --git a/tests/language/control/loop.at b/tests/language/control/loop.at
index af8d8aecf03d1745beba2a0851dd48d8dd9de49c..d506a4d37f0522462d8a2a57ecc716509987888c 100644 (file)
--- a/tests/language/control/loop.at
+++ b/tests/language/control/loop.at
@@ -1,3 +1,19 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl 
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
 AT_BANNER([LOOP])
 
 m4_define([LOOP_DATA], [dnl
@@ -22,25 +38,15 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 1.00 @&t@
-
 2.00 @&t@
-
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 3.00 @&t@
-
 6.00 @&t@
-
 9.00 @&t@
-
 --------
-
 --------
 ])
 AT_CLEANUP
@@ -59,25 +65,15 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 1.00 @&t@
-
 2.00 @&t@
-
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 3.00 @&t@
-
 6.00 @&t@
-
 9.00 @&t@
-
 --------
-
 --------
 ])
 AT_CLEANUP
@@ -96,27 +92,16 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 1.00 @&t@
-
 2.00 @&t@
-
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 3.00 @&t@
-
 6.00 @&t@
-
 9.00 @&t@
-
 --------
-
 4.00 @&t@
-
 --------
 ])
 AT_CLEANUP
@@ -133,19 +118,12 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 1.00 @&t@
-
 2.00 @&t@
-
 --------
-
 2.00 @&t@
-
 --------
-
 3.00 @&t@
-
 --------
-
 --------
 ])
 AT_CLEANUP
@@ -162,23 +140,14 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 1.00 @&t@
-
 2.00 @&t@
-
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 3.00 @&t@
-
 6.00 @&t@
-
 --------
-
 --------
 ])
 AT_CLEANUP
@@ -195,23 +164,17 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 --------
-
 --------
 ])
 AT_CLEANUP
 
-AT_SETUP([LOOP with no conditions])
+AT_SETUP([LOOP with no conditions containing BREAK])
 AT_DATA([loop.sps], [dnl
 LOOP_DATA
-set mxloops = 2.
 compute #p = x.
 loop.
 print /#p.
@@ -226,23 +189,43 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 1.00 @&t@
-
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 3.00 @&t@
-
 6.00 @&t@
-
 --------
-
 4.00 @&t@
+--------
+])
+AT_CLEANUP
 
+AT_SETUP([LOOP with no conditions that ends due to MXLOOPS])
+AT_DATA([loop.sps], [dnl
+LOOP_DATA
+set mxloops=2.
+loop.
+compute #p = #p + 1.
+print /x #p.
+end loop.
+print/'--------'.
+execute.
+])
+AT_CHECK([pspp -o pspp.csv loop.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+1     1.00 @&t@
+1     2.00 @&t@
+--------
+2     3.00 @&t@
+2     4.00 @&t@
+--------
+3     5.00 @&t@
+3     6.00 @&t@
+--------
+4     7.00 @&t@
+4     8.00 @&t@
 --------
 ])
 AT_CLEANUP
+