Cite tokens when reporting invalid identifiers.

[pspp] / tests / language / dictionary / mrsets.at

diff --git a/tests/language/dictionary/mrsets.at b/tests/language/dictionary/mrsets.at
index a520a41370a43aa4b8937c0736623f9da1c0d12d..b72803c19e509279841ae413cd55c6c0d91acba4 100644 (file)
--- a/tests/language/dictionary/mrsets.at
+++ b/tests/language/dictionary/mrsets.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
@@ -120,7 +120,7 @@ AT_DATA([mrsets.sps],
     /DELETE NAME=ALL
     /DISPLAY NAME=ALL.
 ]])
-AT_CHECK([pspp -o - -O format=csv -o mrsets.csv -o mrsets.txt -o mrsets.pdf mrsets.sps], [0],
+AT_CHECK([pspp -o - -O format=csv -o mrsets.csv -o mrsets.txt mrsets.sps], [0],
   [DEFINE_MRSETS_OUTPUT
 Table: Multiple Response Sets
 Name,Label,Encoding,Counted Value,Member Variables
@@ -198,8 +198,10 @@ AT_DATA([mrsets.sps],
   [DEFINE_MRSETS_DATA
 MRSETS /MCGROUP NAME=x.
 ])
-AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6: error: MRSETS: x is not a valid name for a multiple response set.  Multiple response set names must begin with `$'.
+AT_CHECK([pspp -O format=csv mrsets.sps], [1], [dnl
+"mrsets.sps:6.22: error: MRSETS: x is not a valid name for a multiple response set.  Multiple response set names must begin with `$'.
+    6 | MRSETS /MCGROUP NAME=x.
+      |                      ^"
 ])
 AT_CLEANUP
 
@@ -218,8 +220,10 @@ AT_DATA([mrsets.sps],
   [DEFINE_MRSETS_DATA
 MRSETS /MDGROUP VALUE=1.5.
 ])
-AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6: error: MRSETS: Numeric VALUE must be an integer.
+AT_CHECK([pspp -O format=csv mrsets.sps], [1], [dnl
+"mrsets.sps:6.23-6.25: error: MRSETS: Numeric VALUE must be an integer.
+    6 | MRSETS /MDGROUP VALUE=1.5.
+      |                       ^~~"
 ])
 AT_CLEANUP
 
@@ -228,8 +232,10 @@ AT_DATA([mrsets.sps],
   [DEFINE_MRSETS_DATA
 MRSETS /MCGROUP VARIABLES=a b c.
 ])
-AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6.32: error: MRSETS: Syntax error at end of command: Required MCGROUP specification missing from NAME subcommand.
+AT_CHECK([pspp -O format=csv mrsets.sps], [1], [dnl
+"mrsets.sps:6.32: error: MRSETS: Required NAME specification missing from MCGROUP subcommand.
+    6 | MRSETS /MCGROUP VARIABLES=a b c.
+      |                                ^"
 ])
 AT_CLEANUP
 
@@ -238,8 +244,10 @@ AT_DATA([mrsets.sps],
   [DEFINE_MRSETS_DATA
 MRSETS /MCGROUP NAME=$Mcgroup.
 ])
-AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6.30: error: MRSETS: Syntax error at end of command: Required MCGROUP specification missing from VARIABLES subcommand.
+AT_CHECK([pspp -O format=csv mrsets.sps], [1], [dnl
+"mrsets.sps:6.30: error: MRSETS: Required VARIABLES specification missing from MCGROUP subcommand.
+    6 | MRSETS /MCGROUP NAME=$Mcgroup.
+      |                              ^"
 ])
 AT_CLEANUP
 
@@ -248,10 +256,14 @@ AT_DATA([mrsets.sps],
   [DEFINE_MRSETS_DATA
 MRSETS /MCGROUP NAME=$mygroup VARIABLES=a b x y.
 ])
-AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6: error: MRSETS: a and x are not the same type.  All variables in this variable list must be of the same type.  x will be omitted from the list.
+AT_CHECK([pspp -O format=csv mrsets.sps], [1], [dnl
+"mrsets.sps:6.45: error: MRSETS: a and x are not the same type.  All variables in this variable list must be of the same type.  x will be omitted from the list.
+    6 | MRSETS /MCGROUP NAME=$mygroup VARIABLES=a b x y.
+      |                                             ^"
 
-mrsets.sps:6: error: MRSETS: a and y are not the same type.  All variables in this variable list must be of the same type.  y will be omitted from the list.
+"mrsets.sps:6.47: error: MRSETS: a and y are not the same type.  All variables in this variable list must be of the same type.  y will be omitted from the list.
+    6 | MRSETS /MCGROUP NAME=$mygroup VARIABLES=a b x y.
+      |                                               ^"
 ])
 AT_CLEANUP
 
@@ -295,9 +307,13 @@ AT_DATA([mrsets.sps],
 [MRSETS /DISPLAY NAME=[$x].
 MRSETS /DELETE NAME=[$y].
 ]])
-AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6: error: MRSETS: No multiple response set named $x.
+AT_CHECK([pspp -O format=csv mrsets.sps], [1], [dnl
+"mrsets.sps:6.23-6.24: error: MRSETS: No multiple response set named $x.
+    6 | MRSETS /DISPLAY NAME=[[$x]].
+      |                       ^~"
 
-mrsets.sps:7: error: MRSETS: No multiple response set named $y.
+"mrsets.sps:7.22-7.23: error: MRSETS: No multiple response set named $y.
+    7 | MRSETS /DELETE NAME=[[$y]].
+      |                      ^~"
 ])
 AT_CLEANUP