Clean up how transformations work.

[pspp] / tests / language / control / do-if.at

diff --git a/tests/language/control/do-if.at b/tests/language/control/do-if.at
index 01dae0d904f03fbc6eb676a373f76acb4cf8fe72..1a1889bb97ff65ab5863d9af7bb41059b4846b34 100644 (file)
--- a/tests/language/control/do-if.at
+++ b/tests/language/control/do-if.at
@@ -1,16 +1,16 @@
 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
@@ -65,34 +65,61 @@ AT_CHECK([pspp do-if.sps], [0], [ignore])
 AT_CHECK([cat do-if.out], [0], [expout])
 AT_CLEANUP
 
-AT_SETUP([unpaired END IF crash])
+AT_SETUP([DO IF - negative])
 AT_DATA([do-if.sps], [dnl
 DATA LIST LIST NOTABLE/a b c.
-END IF.
-])
-AT_CHECK([pspp -O format=csv do-if.sps], [1], [dnl
-do-if.sps:2: error: END IF: This command cannot appear outside DO IF...END IF.
-])
-AT_CLEANUP
+BEGIN DATA.
+1 2 3
+END DATA.
 
+END IF.
+ELSE.
+ELSE IF 1.
 
+DO IF 0.
+ELSE.
+ELSE.
+END IF.
 
-AT_SETUP([ELSE without DO IF])
-AT_DATA([do-if.sps], [dnl
-DATA lIST NOTABLE LIST /QUA BRA *.
-BEGIN DATA
-4  1
-6  3
-END DATA
+DO IF 0.
+ELSE.
+ELSE IF 0.
+END IF.
 
-ELSE QUA 'A string'.
+DO IF !.
+END IF.
 
-EXECUTE.
+DO IF 0.
 ])
 AT_CHECK([pspp -O format=csv do-if.sps], [1], [dnl
+do-if.sps:6: error: END IF: This command cannot appear outside DO IF...END IF.
+
 do-if.sps:7: error: ELSE: This command cannot appear outside DO IF...END IF.
 
-do-if.sps:9: error: Stopping syntax file processing here to avoid a cascade of dependent command failures.
+do-if.sps:8: error: ELSE IF: This command cannot appear outside DO IF...END IF.
+
+do-if.sps:12: error: DO IF: Only one ELSE is allowed within DO IF...END IF.
+
+"do-if.sps:11.1-11.5: note: DO IF: This is the location of the previous ELSE clause.
+   11 | ELSE.
+      | ^~~~~"
+
+"do-if.sps:10.1-10.8: note: DO IF: This is the location of the DO IF command.
+   10 | DO IF 0.
+      | ^~~~~~~~"
+
+do-if.sps:17: error: DO IF: ELSE IF is not allowed following ELSE within DO IF...END IF.
+
+"do-if.sps:16.1-16.5: note: DO IF: This is the location of the previous ELSE clause.
+   16 | ELSE.
+      | ^~~~~"
+
+"do-if.sps:15.1-15.8: note: DO IF: This is the location of the DO IF command.
+   15 | DO IF 0.
+      | ^~~~~~~~"
+
+do-if.sps:20.7: error: DO IF: Syntax error at `!'.
+
+error: DO IF: Syntax error at end of input.
 ])
 AT_CLEANUP
-