SORT VARIABLES: Improve error messages.

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

diff --git a/tests/language/control/loop.at b/tests/language/control/loop.at
index d8ed2878854904b97ddfacde469bbb9ed479486d..23ab6b5b1873cd556f25c7661b70696ae9a6a195 100644 (file)
--- a/tests/language/control/loop.at
+++ b/tests/language/control/loop.at
@@ -303,39 +303,72 @@ END LOOP !.
 LOOP.
 ])
 AT_CHECK([pspp loop.sps], 1, [dnl
-loop.sps:2: error: BREAK: This command cannot appear outside LOOP...END LOOP.
-
-loop.sps:3: error: END LOOP: This command cannot appear outside LOOP...END
+loop.sps:2.1-2.5: error: BREAK: This command cannot appear outside LOOP...END
 LOOP.
+    2 | BREAK.
+      | ^~~~~
+
+loop.sps:3.1-3.8: error: END LOOP: This command cannot appear outside LOOP...
+END LOOP.
+    3 | END LOOP.
+      | ^~~~~~~~
 
-loop.sps:5: error: LOOP: Only one index clause may be specified.
+loop.sps:5.15: error: LOOP: Only one index clause may be specified.
+    5 | LOOP A=1 TO 5 B=1 TO 5.
+      |               ^
 
-loop.sps:7.6: error: LOOP: Syntax error at `5'.
+loop.sps:7.6: error: LOOP: Syntax error expecting identifier.
+    7 | LOOP 5.
+      |      ^
 
-loop.sps:9.8: error: LOOP: Syntax error at `!': expecting `='.
+loop.sps:9.8: error: LOOP: Syntax error expecting `='.
+    9 | LOOP B !.
+      |        ^
 
-loop.sps:11.8: error: LOOP: Syntax error at `!'.
+loop.sps:11.8: error: LOOP: Syntax error.
+   11 | LOOP B=!.
+      |        ^
 
-loop.sps:13.13: error: LOOP: Syntax error at `!'.
+loop.sps:13.13: error: LOOP: Syntax error.
+   13 | LOOP A=1 TO !.
+      |             ^
 
-loop.sps:15.13: error: LOOP: Syntax error at `!'.
+loop.sps:15.13: error: LOOP: Syntax error.
+   15 | LOOP A=1 BY !.
+      |             ^
 
-loop.sps:17: error: LOOP: Subcommand TO may only be specified once.
+loop.sps:17.20-17.21: error: LOOP: Subcommand TO may only be specified once.
+   17 | LOOP A=1 TO 5 BY 5 TO !.
+      |                    ^~
 
-loop.sps:19: error: LOOP: Subcommand BY may only be specified once.
+loop.sps:19.21-19.22: error: LOOP: Subcommand BY may only be specified once.
+   19 | LOOP A=1 BY 5 TO 10 BY !.
+      |                     ^~
 
-loop.sps:21: error: LOOP: Required subcommand TO was not specified.
+loop.sps:21.1-21.9: error: LOOP: Required subcommand TO was not specified.
+   21 | LOOP A=1.
+      | ^~~~~~~~~
 
-loop.sps:23.6: error: LOOP: Syntax error at `!'.
+loop.sps:23.6: error: LOOP: Syntax error expecting identifier.
+   23 | LOOP !.
+      |      ^
 
-loop.sps:26: error: LOOP: Subcommand IF may only be specified once.
+loop.sps:26.11-26.12: error: LOOP: Subcommand IF may only be specified once.
+   26 | LOOP IF 1 IF 0.
+      |           ^~
 
-loop.sps:29.9: error: LOOP: Syntax error at `!'.
+loop.sps:29.9: error: LOOP: Syntax error.
+   29 | LOOP IF !.
+      |         ^
 
-loop.sps:33.13: error: LOOP: Syntax error at `!'.
+loop.sps:33.13: error: LOOP: Syntax error.
+   33 | END LOOP IF !.
+      |             ^
 
-loop.sps:36.10: error: LOOP: Syntax error at `!': expecting end of command.
+loop.sps:36.10: error: LOOP: Syntax error expecting end of command.
+   36 | END LOOP !.
+      |          ^
 
-error: LOOP: Syntax error at end of input.
+error: LOOP: At end of input: Syntax error expecting END LOOP.
 ])
 AT_CLEANUP
\ No newline at end of file