segment: Improve segmentation when DEFINE command has early terminator.

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

diff --git a/tests/language/control/loop.at b/tests/language/control/loop.at
index 2db9189b59c0a5548458d75e3726d46444680a48..a2ceac3de350ef79cc899bd4fcb2c0af7546177a 100644 (file)
--- a/tests/language/control/loop.at
+++ b/tests/language/control/loop.at
@@ -1,19 +1,20 @@
 dnl PSPP - a program for statistical analysis.
 dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl 
+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
 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
 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])
+dnl
+AT_BANNER([LOOP])
 
 m4_define([LOOP_DATA], [dnl
 data list notable /x 1 y 2 z 3.
@@ -37,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
@@ -74,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
@@ -111,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
@@ -148,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
@@ -177,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
@@ -210,15 +164,10 @@ execute.
 AT_CHECK([pspp -o pspp.csv loop.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 --------
-
 2.00 @&t@
-
 4.00 @&t@
-
 --------
-
 --------
-
 --------
 ])
 AT_CLEANUP
@@ -240,23 +189,14 @@ 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
@@ -275,28 +215,48 @@ 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
 
+AT_SETUP([LOOP with IF condition that ends due to MXLOOPS])
+AT_DATA([loop.sps], [dnl
+LOOP_DATA
+set mxloops=3.
+compute #p = x.
+loop.
+print /x #p.
+compute #p = #p + 1.
+end loop if #p >= 6.
+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@
+1     3.00 @&t@
+--------
+2     2.00 @&t@
+2     3.00 @&t@
+2     4.00 @&t@
+--------
+3     3.00 @&t@
+3     4.00 @&t@
+3     5.00 @&t@
+--------
+4     4.00 @&t@
+4     5.00 @&t@
+--------
+])
+AT_CLEANUP