X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Finteraction.c;h=7ed36f6627ed469ce1c6775efd504a191c23f338;hb=1c740eb1b205c034bba1af440567c5b13f407d28;hp=05a8bf46bd4ade424cef3d9bec85fde043205ea5;hpb=5fb2011a5a7d63dd694d49944a114562bfe764ca;p=pspp-builds.git

diff --git a/src/math/interaction.c b/src/math/interaction.c
index 05a8bf46..7ed36f66 100644
--- a/src/math/interaction.c
+++ b/src/math/interaction.c
@@ -38,6 +38,7 @@
 #include <math/interaction.h>
 #include <string.h>
 #include <xalloc.h>
+#include <unistr.h>
 
 struct interaction_variable
 {
@@ -50,10 +51,10 @@ struct interaction_variable
 struct interaction_value
 {
   const struct interaction_variable *intr;
-  union value *val; /* Concatenation of the string values in this
-		       interaction's value, or the product of a bunch
-		       of numeric values for a purely numeric
-		       interaction.
+  union value val; /* Concatenation of the string values in this
+                      interaction's value, or the product of a bunch
+                      of numeric values for a purely numeric
+                      interaction.
 		    */
   double f; /* Product of the numerical values in this interaction's value. */
 };
@@ -67,6 +68,7 @@ interaction_variable_create (const struct variable **vars, int n_vars)
 {
   struct interaction_variable *result = NULL;
   size_t i;
+  int width = 0;
 
   if (n_vars > 0)
     {
@@ -80,10 +82,11 @@ interaction_variable_create (const struct variable **vars, int n_vars)
 	  if (var_is_alpha (vars[i]))
 	    {
 	      result->n_alpha++;
+	      width = 1;
 	    }
 	}
     }
-  result->intr = var_create_internal (0);
+  result->intr = var_create_internal (0, width);
 
   return result;
 }
@@ -98,7 +101,7 @@ void interaction_variable_destroy (struct interaction_variable *iv)
   Get one of the member variables.
  */
 const struct variable *
-interaction_variable_get_member (const struct interaction_variable *iv, size_t i)
+interaction_get_member (const struct interaction_variable *iv, size_t i)
 {
   return iv->members[i];
 }
@@ -122,10 +125,10 @@ interaction_get_n_numeric (const struct interaction_variable *iv)
 }
 
 /*
-  Get the interaction varibale itself.
+  Get the interaction variable itself.
  */
 const struct variable *
-interaction_variable_get_var (const struct interaction_variable *iv)
+interaction_get_variable (const struct interaction_variable *iv)
 {
   return iv->intr;
 }
@@ -146,18 +149,23 @@ interaction_value_create (const struct interaction_variable *var, const union va
   
   if (var != NULL)
     {
+      uint8_t *val;
+      int val_width = 1;
+
       result = xmalloc (sizeof (*result));
       result->intr = var;
       n_vars = interaction_get_n_vars (var);
-      result->val = value_create (n_vars * MAX_SHORT_STRING + 1);
+      value_init (&result->val, val_width);
+      val = value_str_rw (&result->val, val_width);
+      val[0] = '\0';
       result->f = 1.0;
       for (i = 0; i < n_vars; i++)
 	{
-	  member = interaction_variable_get_member (var, i);
+	  member = interaction_get_member (var, i);
 
 	  if (var_is_value_missing (member, vals[i], MV_ANY))
 	    {
-	      value_set_missing (result->val, MAX_SHORT_STRING);
+	      value_set_missing (&result->val, MAX_SHORT_STRING);
 	      result->f = SYSMIS;
 	      break;
 	    }
@@ -165,7 +173,10 @@ interaction_value_create (const struct interaction_variable *var, const union va
 	    {
 	      if (var_is_alpha (var->members[i]))
 		{
-		  strncat (result->val->s, vals[i]->s, MAX_SHORT_STRING);
+                  int w = var_get_width (var->members[i]);
+		  value_resize (result, val_width, val_width + w);
+		  u8_strncat (val, value_str (vals[i], w), w);
+		  val = value_str_rw (&result->val, val_width);
 		}
 	      else if (var_is_numeric (var->members[i]))
 		{
@@ -188,17 +199,17 @@ interaction_value_create (const struct interaction_variable *var, const union va
 	    avoid the error, we set result->f to 1.0 for numeric
 	    interactions.
 	   */
-	  result->val->f = result->f;
+	  result->val.f = result->f;
 	  result->f = 1.0;
 	}
     }
   return result;
 }
 
-union value *
+const union value *
 interaction_value_get (const struct interaction_value *val)
 {
-  return val->val;
+  return &val->val;
 }
 
 /*
@@ -220,7 +231,10 @@ interaction_value_destroy (struct interaction_value *val)
 {
   if (val != NULL)
     {
-      free (val->val);
+      size_t n_vars = interaction_get_n_vars (val->intr);
+      int val_width = n_vars * MAX_SHORT_STRING + 1;
+
+      value_destroy (&val->val, val_width);
       free (val);
     }
 }
@@ -229,32 +243,22 @@ interaction_value_destroy (struct interaction_value *val)
   Return a value from a variable that is an interaction. 
  */
 struct interaction_value *
-interaction_case_data (const struct ccase *ccase, const struct variable *var, 
-		       const struct interaction_variable **intr_vars, size_t n_intr)
+interaction_case_data (const struct ccase *ccase, const struct interaction_variable *iv)
 {
   size_t i;
   size_t n_vars;
-  const struct interaction_variable *iv;
-  const struct variable *intr;
   const struct variable *member;
   const union value **vals = NULL;
 
-  for (i = 0; i < n_intr; i++)
-    {
-      iv = intr_vars[i];
-      intr = interaction_variable_get_var (iv);
-      if (var_get_dict_index (intr) == var_get_dict_index (var))
-	{
-	  break;
-	}
-    }
   n_vars = interaction_get_n_vars (iv);
   vals = xnmalloc (n_vars, sizeof (*vals));
+
   for (i = 0; i < n_vars; i++)
-    {
-      member = interaction_variable_get_member (iv, i);
-      vals[i] = case_data (ccase, member);
-    }
+	{
+	  member = interaction_get_member (iv, i);
+	  vals[i] = case_data (ccase, member);
+	}
+
   return interaction_value_create (iv, vals);
 }
 
@@ -266,7 +270,7 @@ is_interaction (const struct variable *var, const struct interaction_variable **
   
   for (i = 0; i < n_intr; i++)
     {
-      intr = interaction_variable_get_var (iv[i]);
+      intr = interaction_get_variable (iv[i]);
       if (var_get_dict_index (intr) == var_get_dict_index (var))
 	{
 	  return true;