[Pspp-cvs] pspp doc/data-io.texi src/language/data-io/Chan...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/09/23 16:49:38

Modified files:
        doc            : data-io.texi 
        src/language/data-io: ChangeLog data-list.c 

Log message:
        (cmd_data_list): Don't allow END subcommand to be used with DATA LIST
        FREE or LIST.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/data-io.texi?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/ChangeLog?cvsroot=pspp&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-list.c?cvsroot=pspp&r1=1.35&r2=1.36

Patches:
Index: doc/data-io.texi
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/data-io.texi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- doc/data-io.texi    23 Sep 2007 16:47:27 -0000      1.15
+++ doc/data-io.texi    23 Sep 2007 16:49:37 -0000      1.16
@@ -339,7 +339,6 @@
         [(@{TAB,'c'@}, @dots{})]
         address@hidden,address@hidden
         [FILE='file-name']
-        [END=end_var]
         [SKIP=record_cnt]
         /address@hidden
 
@@ -369,7 +368,7 @@
 The NOTABLE and TABLE subcommands are as in @cmd{DATA LIST FIXED} above.
 NOTABLE is the default.
 
-The FILE, END, and SKIP subcommands are as in @cmd{DATA LIST FIXED} above.
+The FILE and SKIP subcommands are as in @cmd{DATA LIST FIXED} above.
 
 The variables to be parsed are given as a single list of variable names.
 This list must be introduced by a single slash (@samp{/}).  The set of
@@ -392,7 +391,6 @@
         [(@{TAB,'c'@}, @dots{})]
         address@hidden,address@hidden
         [FILE='file-name']
-        [END=end_var]
         [SKIP=record_count]
         /address@hidden
 

Index: src/language/data-io/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- src/language/data-io/ChangeLog      23 Sep 2007 16:47:28 -0000      1.47
+++ src/language/data-io/ChangeLog      23 Sep 2007 16:49:38 -0000      1.48
@@ -4,6 +4,8 @@
 
        * data-list.c (data_list_trns_proc): Properly set retval when END
        subcommand is in use.
+       (cmd_data_list): Don't allow END subcommand to be used with DATA
+       LIST FREE or LIST.
 
 2007-09-12  Ben Pfaff  <address@hidden>
 

Index: src/language/data-io/data-list.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-list.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/language/data-io/data-list.c    23 Sep 2007 16:47:28 -0000      1.35
+++ src/language/data-io/data-list.c    23 Sep 2007 16:49:38 -0000      1.36
@@ -249,6 +249,12 @@
   if (dls->type == -1)
     dls->type = DLS_FIXED;
 
+  if (dls->type != DLS_FIXED && dls->end != NULL)
+    {
+      msg (SE, _("The END keyword may be used only with DATA LIST FIXED."));
+      goto error;
+    }
+
   if (table == -1)
     table = dls->type != DLS_FREE;