Make the expression code a little nicer and fix bugs found

[pspp] / src / frequencies.q

diff --git a/src/frequencies.q b/src/frequencies.q
index 66faf5ef027e2608914a0a9b2927bedbe5831ee7..e7657b64189b7a254c6d1e9b4e38605ddf61a688 100644 (file)
--- a/src/frequencies.q
+++ b/src/frequencies.q
@@ -24,7 +24,7 @@
 */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <math.h>
 #include <stdlib.h>
 #include "alloc.h"
@@ -211,7 +211,6 @@ internal_cmd_frequencies (void)
   for (i = 0; i < dict_get_var_cnt (default_dict); i++)
     dict_get_var(default_dict, i)->p.frq.used = 0;
 
-  lex_match_id ("FREQUENCIES");
   if (!parse_frequencies (&cmd))
     return CMD_FAILURE;
 
@@ -246,7 +245,7 @@ internal_cmd_frequencies (void)
     cmd.sort = FRQ_AVALUE;
 
   /* Do it! */
-  procedure (precalc, calc, postcalc, NULL);
+  procedure_with_splits (precalc, calc, postcalc, NULL);
 
   return CMD_SUCCESS;
 }