Make the expression code a little nicer and fix bugs found

[pspp] / src / aggregate.c

diff --git a/src/aggregate.c b/src/aggregate.c
index cb7cff064d2371e87ef9ea08ec75152d1eaf98ec..3821de78b822f9043676c6ec1c4b8cc87dbf03af 100644 (file)
--- a/src/aggregate.c
+++ b/src/aggregate.c
@@ -18,7 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
 #include "alloc.h"
 #include "command.h"
@@ -169,8 +169,6 @@ cmd_aggregate (void)
   dict_set_label (agr.dict, dict_get_label (default_dict));
   dict_set_documents (agr.dict, dict_get_documents (default_dict));
   
-  lex_match_id ("AGGREGATE");
-
   /* Read most of the subcommands. */
   for (;;)
     {
@@ -326,7 +324,7 @@ create_sysfile (struct agr_proc *agr)
   struct sfm_write_info w;
   w.h = agr->out_file;
   w.dict = agr->dict;
-  w.compress = set_scompression;
+  w.compress = get_scompression();
   if (!sfm_write_dictionary (&w))
     return 0;