From: Ben Pfaff <blp@gnu.org>
Date: Sat, 12 Mar 2005 21:30:18 +0000 (+0000)
Subject: Fix PR 11628.
X-Git-Tag: v0.4.0~140
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8867fce18005ec258afcb2050063238421b084e;p=pspp-builds.git

Fix PR 11628.
---

diff --git a/doc/data-selection.texi b/doc/data-selection.texi
index c20337ae..3ea91c8d 100644
--- a/doc/data-selection.texi
+++ b/doc/data-selection.texi
@@ -212,9 +212,8 @@ When @cmd{SELECT IF} is specified following @cmd{TEMPORARY}
 @vindex SPLIT FILE
 
 @display
-Two possible syntaxes:
-        SPLIT FILE BY var_list.
-        SPLIT FILE OFF.
+SPLIT FILE [{LAYERED, SEPARATE}] BY var_list.
+SPLIT FILE OFF.
 @end display
 
 @cmd{SPLIT FILE} allows multiple sets of data present in one data
@@ -227,6 +226,10 @@ variables are analyzed by statistical procedure commands as one group.
 An independent analysis is carried out for each group of cases, and the
 variable values for the group are printed along with the analysis.
 
+When a list of variable names is specified, one of the keywords
+LAYERED or SEPARATE may also be specified.  If provided, either
+keyword are ignored.
+
 Groups are formed only by @emph{adjacent} cases.  To create a split 
 using a variable where like values are not adjacent in the working file,
 you should first sort the data by that variable (@pxref{SORT CASES}).
diff --git a/src/ChangeLog b/src/ChangeLog
index 6073c81b..e8f7a6c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 12 13:29:21 2005  Ben Pfaff  <blp@gnu.org>
+
+	* split-file.c: (cmd_split_file) Ignore LAYERED and SEPARATE
+	keywords (PR 11628).
+
 Sat Mar 12 13:17:12 2005  Ben Pfaff  <blp@gnu.org>
 
 	* vfm.c: (procedure_with_splits) Fix PR 11492: end_func() must be
diff --git a/src/split-file.c b/src/split-file.c
index 733aa9fb..4ff62e17 100644
--- a/src/split-file.c
+++ b/src/split-file.c
@@ -37,6 +37,9 @@ cmd_split_file (void)
       struct variable **v;
       int n;
 
+      /* For now, ignore SEPARATE and LAYERED. */
+      lex_match_id ("SEPARATE") || lex_match_id ("LAYERED");
+      
       lex_match (T_BY);
       if (!parse_variables (default_dict, &v, &n, PV_NO_DUPLICATE))
 	return CMD_FAILURE;