Smake: Add `check' target for convenience. Add --tests-base=tests to

[pspp] / src / split-file.c

diff --git a/src/split-file.c b/src/split-file.c
index bffcd5b18007d1c135b76e0e77467794fa233560..506a433cafa7b0a6069c0b65eb2be317b8c049b5 100644 (file)
--- a/src/split-file.c
+++ b/src/split-file.c
@@ -14,13 +14,14 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <stdlib.h>
 #include "alloc.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "lexer.h"
 #include "str.h"
@@ -29,9 +30,6 @@
 int
 cmd_split_file (void)
 {
-  lex_match_id ("SPLIT");
-  lex_match_id ("FILE");
-
   if (lex_match_id ("OFF"))
     dict_set_split_vars (default_dict, NULL, 0);
   else
@@ -39,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;