X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautorecode.c;h=488361dd17c85b23eff3f9d94ef345e9d572715a;hb=027eba771a7ef9d25e97f0026d6469ea34c06523;hp=3a793494df4e4db7b1b223320a588718c35fa208;hpb=b18e1b9c95a478d434e9fcef9d8579d0b96b9a8d;p=pspp-builds.git

diff --git a/src/autorecode.c b/src/autorecode.c
index 3a793494..488361dd 100644
--- a/src/autorecode.c
+++ b/src/autorecode.c
@@ -30,8 +30,6 @@
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* FIXME: This module is less than ideally efficient, both in space
@@ -79,10 +77,8 @@ static int print;
 static int autorecode_trns_proc (struct trns_header *, struct ccase *);
 static void autorecode_trns_free (struct trns_header *);
 static int autorecode_proc_func (struct ccase *);
-static int compare_alpha_value (const void *, const void *, void *);
-static unsigned hash_alpha_value (const void *, void *);
-static int compare_numeric_value (const void *, const void *, void *);
-static unsigned hash_numeric_value (const void *, void *);
+static hsh_compare_func compare_alpha_value, compare_numeric_value;
+static hsh_hash_func hash_alpha_value, hash_numeric_value;
 static void recode (void);
 
 /* Performs the AUTORECODE procedure. */
@@ -102,7 +98,7 @@ cmd_autorecode (void)
   lex_match_id ("AUTORECODE");
   lex_match_id ("VARIABLES");
   lex_match ('=');
-  if (!parse_variables (&default_dict, &v_src, &nv_src, PV_NO_DUPLICATE))
+  if (!parse_variables (default_dict, &v_src, &nv_src, PV_NO_DUPLICATE))
     return CMD_FAILURE;
   if (!lex_force_match_id ("INTO"))
     return CMD_FAILURE;
@@ -130,7 +126,7 @@ cmd_autorecode (void)
     {
       int j;
 
-      if (is_varname (n_dest[i]))
+      if (dict_lookup_var (default_dict, n_dest[i]) != NULL)
 	{
 	  msg (SE, _("Target variable %s duplicates existing variable %s."),
 	       n_dest[i], n_dest[i]);
@@ -152,8 +148,7 @@ cmd_autorecode (void)
   for (i = 0; i < nv_dest; i++)
     if (v_src[i]->type == ALPHA)
       h_trans[i] = hsh_create (10, compare_alpha_value,
-			       hash_alpha_value, NULL,
-			       (void *) v_src[i]->width);
+			       hash_alpha_value, NULL, v_src[i]);
     else
       h_trans[i] = hsh_create (10, compare_numeric_value,
 			       hash_numeric_value, NULL, NULL);
@@ -162,7 +157,8 @@ cmd_autorecode (void)
 
   for (i = 0; i < nv_dest; i++)
     {
-      v_dest[i] = force_create_variable (&default_dict, n_dest[i], NUMERIC, 0);
+      v_dest[i] = dict_create_var (default_dict, n_dest[i], 0);
+      assert (v_dest[i] != NULL);
       free (n_dest[i]);
     }
   free (n_dest);
@@ -213,8 +209,7 @@ recode (void)
 
       if (v_src[i]->type == ALPHA)
 	spec->items = hsh_create (2 * count, compare_alpha_value,
-				  hash_alpha_value, NULL,
-				  (void *) v_src[i]->width);
+				  hash_alpha_value, NULL, v_src[i]);
       else
 	spec->items = hsh_create (2 * count, compare_numeric_value,
 				  hash_numeric_value, NULL, NULL);
@@ -278,30 +273,39 @@ autorecode_trns_free (struct trns_header * trns)
 /* AUTORECODE procedure. */
 
 static int
-compare_alpha_value (const void *a, const void *b, void *len)
+compare_alpha_value (const void *a_, const void *b_, void *v_)
 {
-  return memcmp (((union value *) a)->c, ((union value *) b)->c, (int) len);
+  const union value *a = a_;
+  const union value *b = b_;
+  const struct variable *v = v_;
+
+  return memcmp (a->c, b->c, v->width);
 }
 
 static unsigned
-hash_alpha_value (const void *a_, void *len)
+hash_alpha_value (const void *a_, void *v_)
 {
   const union value *a = a_;
-  return hsh_hash_bytes (a->c, (int) len);
+  const struct variable *v = v_;
+  
+  return hsh_hash_bytes (a->c, v->width);
 }
 
 static int
-compare_numeric_value (const void *pa, const void *pb, void *foobar unused)
+compare_numeric_value (const void *a_, const void *b_, void *foo unused)
 {
-  double a = ((union value *) pa)->f, b = ((union value *) pb)->f;
-  return a > b ? 1 : (a < b ? -1 : 0);
+  const union value *a = a_;
+  const union value *b = b_;
+
+  return a->f < b->f ? -1 : a->f > b->f;
 }
 
 static unsigned
-hash_numeric_value (const void *a_, void *len unused)
+hash_numeric_value (const void *a_, void *foo unused)
 {
   const union value *a = a_;
-  return hsh_hash_bytes (&a->f, sizeof a->f);
+
+  return hsh_hash_double (a->f);
 }
 
 static int
@@ -319,7 +323,7 @@ autorecode_proc_func (struct ccase * c)
 	{
 	  v.f = c->data[v_src[i]->fv].f;
 	  vpp = (union value **) hsh_probe (h_trans[i], &v);
-	  if (NULL == *vpp)
+	  if (*vpp == NULL)
 	    {
 	      vp = pool_alloc (hash_pool, sizeof (union value));
 	      vp->f = v.f;
@@ -330,7 +334,7 @@ autorecode_proc_func (struct ccase * c)
 	{
 	  v.c = c->data[v_src[i]->fv].s;
 	  vpp = (union value **) hsh_probe (h_trans[i], &v);
-	  if (NULL == *vpp)
+	  if (*vpp == NULL)
 	    {
 	      vp = pool_alloc (hash_pool, sizeof (union value));
 	      vp->c = pool_strndup (hash_pool, v.c, v_src[i]->width);