X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Faggregate.c;h=78c29c4fa74c125d19611b352733d683d95b4ed6;hb=e9aa6e433b846849da90550f6800095d569fb549;hp=e51a5a6a13724cea3a1a85357a46ffbc6e895c8a;hpb=b0bf9b1b0f727fafac4296a048e3f45db5936f81;p=pspp-builds.git

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index e51a5a6a..78c29c4f 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -27,7 +27,7 @@
 #include <data/casefile.h>
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
-#include <procedure.h>
+#include <data/procedure.h>
 #include <data/settings.h>
 #include <data/storage-stream.h>
 #include <data/sys-file-writer.h>
@@ -35,6 +35,7 @@
 #include <language/command.h>
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
 #include <language/stats/sort-criteria.h>
 #include <libpspp/alloc.h>
 #include <libpspp/message.h>
@@ -44,11 +45,17 @@
 #include <libpspp/str.h>
 #include <math/moments.h>
 #include <math/sort.h>
-#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+/* Argument for AGGREGATE function. */
+union agr_argument
+  {
+    double f;                           /* Numeric. */
+    char *c;                            /* Short or long string. */
+  };
+
 /* Specifies how to make an aggregate variable. */
 struct agr_var
   {
@@ -59,7 +66,7 @@ struct agr_var
     struct variable *dest;	/* Target variable. */
     int function;		/* Function. */
     int include_missing;	/* 1=Include user-missing values. */
-    union value arg[2];		/* Arguments. */
+    union agr_argument arg[2];	/* Arguments. */
 
     /* Accumulated during AGGREGATE execution. */
     double dbl[3];
@@ -155,10 +162,10 @@ static int aggregate_single_case (struct agr_proc *agr,
 static void dump_aggregate_info (struct agr_proc *agr, struct ccase *output);
 
 /* Aggregating to the active file. */
-static bool agr_to_active_file (struct ccase *, void *aux);
+static bool agr_to_active_file (const struct ccase *, void *aux);
 
 /* Aggregating to a system file. */
-static bool presorted_agr_to_sysfile (struct ccase *, void *aux);
+static bool presorted_agr_to_sysfile (const struct ccase *, void *aux);
 
 /* Parsing. */
 
@@ -282,6 +289,7 @@ cmd_aggregate (void)
             goto error;
         }
       discard_variables ();
+      dict_destroy (default_dict);
       default_dict = agr.dict;
       agr.dict = NULL;
       proc_set_source (agr.sink->class->make_source (agr.sink));
@@ -360,7 +368,7 @@ parse_aggregate_functions (struct agr_proc *agr)
       const struct agr_func *function;
       int func_index;
 
-      union value arg[2];
+      union agr_argument arg[2];
 
       struct variable **src;
       size_t n_src;
@@ -397,7 +405,7 @@ parse_aggregate_functions (struct agr_proc *agr)
 	  if (token == T_STRING)
 	    {
 	      ds_truncate (&tokstr, 255);
-	      dest_label[n_dest - 1] = xstrdup (ds_c_str (&tokstr));
+	      dest_label[n_dest - 1] = ds_xstrdup (&tokstr);
 	      lex_get ();
 	    }
 	}
@@ -465,7 +473,7 @@ parse_aggregate_functions (struct agr_proc *agr)
 		lex_match (',');
 		if (token == T_STRING)
 		  {
-		    arg[i].c = xstrdup (ds_c_str (&tokstr));
+		    arg[i].c = ds_xstrdup (&tokstr);
 		    type = ALPHA;
 		  }
 		else if (lex_is_number ())
@@ -516,7 +524,7 @@ parse_aggregate_functions (struct agr_proc *agr)
                   || (src[0]->type == ALPHA
                       && str_compare_rpad (arg[0].c, arg[1].c) > 0)))
             {
-              union value t = arg[0];
+              union agr_argument t = arg[0];
               arg[0] = arg[1];
               arg[1] = t;
                   
@@ -1075,7 +1083,7 @@ initialize_aggregate_info (struct agr_proc *agr, const struct ccase *input)
    are dropped.
    Returns true if successful, false if an I/O error occurred. */
 static bool
-agr_to_active_file (struct ccase *c, void *agr_)
+agr_to_active_file (const struct ccase *c, void *agr_)
 {
   struct agr_proc *agr = agr_;
 
@@ -1088,7 +1096,7 @@ agr_to_active_file (struct ccase *c, void *agr_)
 /* Aggregate the current case and output it if we passed a
    breakpoint. */
 static bool
-presorted_agr_to_sysfile (struct ccase *c, void *agr_) 
+presorted_agr_to_sysfile (const struct ccase *c, void *agr_) 
 {
   struct agr_proc *agr = agr_;