X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcompute.c;h=9c20e0ee781f1999922790eaa421807d01115b72;hb=ca1feaeed4961242699d0b7ba61def0c58515ddd;hp=d26bf1ed2dd441d8f1406353b75b29b4105d227b;hpb=d4d9866bb2ec1797b8fb103e7144d0e9ffd1abff;p=pspp-builds.git

diff --git a/src/compute.c b/src/compute.c
index d26bf1ed..9c20e0ee 100644
--- a/src/compute.c
+++ b/src/compute.c
@@ -104,27 +104,32 @@ cmd_compute (void)
 
 /* Transformation functions. */
 
+/* Handle COMPUTE or IF with numeric target variable. */
 static int
-compute_num (struct trns_header *compute_, struct ccase *c)
+compute_num (struct trns_header *compute_, struct ccase *c,
+             int case_num)
 {
   struct compute_trns *compute = (struct compute_trns *) compute_;
 
   if (compute->test == NULL
-      || expr_evaluate (compute->test, c, NULL) == 1.0) 
+      || expr_evaluate (compute->test, c, case_num, NULL) == 1.0) 
     {
-      expr_evaluate (compute->rvalue, c, &c->data[compute->fv]); 
+      expr_evaluate (compute->rvalue, c, case_num, &c->data[compute->fv]); 
     }
   
   return -1;
 }
 
+/* Handle COMPUTE or IF with numeric vector element target
+   variable. */
 static int
-compute_num_vec (struct trns_header *compute_, struct ccase *c)
+compute_num_vec (struct trns_header *compute_, struct ccase *c,
+                 int case_num)
 {
   struct compute_trns *compute = (struct compute_trns *) compute_;
 
   if (compute->test == NULL
-      || expr_evaluate (compute->test, c, NULL) == 1.0) 
+      || expr_evaluate (compute->test, c, case_num, NULL) == 1.0) 
     {
       /* Index into the vector. */
       union value index;
@@ -132,7 +137,7 @@ compute_num_vec (struct trns_header *compute_, struct ccase *c)
       /* Rounded index value. */
       int rindx;
 
-      expr_evaluate (compute->element, c, &index);
+      expr_evaluate (compute->element, c, case_num, &index);
       rindx = floor (index.f + EPSILON);
       if (index.f == SYSMIS || rindx < 1 || rindx > compute->vector->cnt)
         {
@@ -145,25 +150,27 @@ compute_num_vec (struct trns_header *compute_, struct ccase *c)
                  index.f, compute->vector->name);
           return -1;
         }
-      expr_evaluate (compute->rvalue, c,
+      expr_evaluate (compute->rvalue, c, case_num,
                      &c->data[compute->vector->var[rindx - 1]->fv]); 
     }
   
   return -1;
 }
 
+/* Handle COMPUTE or IF with string target variable. */
 static int
-compute_str (struct trns_header *compute_, struct ccase *c)
+compute_str (struct trns_header *compute_, struct ccase *c,
+             int case_num)
 {
   struct compute_trns *compute = (struct compute_trns *) compute_;
 
   if (compute->test == NULL
-      || expr_evaluate (compute->test, c, NULL) == 1.0) 
+      || expr_evaluate (compute->test, c, case_num, NULL) == 1.0) 
     {
       /* Temporary storage for string expression return value. */
       union value v;
 
-      expr_evaluate (compute->rvalue, c, &v);
+      expr_evaluate (compute->rvalue, c, case_num, &v);
       st_bare_pad_len_copy (c->data[compute->fv].s, &v.c[1], compute->width,
                             v.c[0]); 
     }
@@ -171,13 +178,16 @@ compute_str (struct trns_header *compute_, struct ccase *c)
   return -1;
 }
 
+/* Handle COMPUTE or IF with string vector element target
+   variable. */
 static int
-compute_str_vec (struct trns_header *compute_, struct ccase *c)
+compute_str_vec (struct trns_header *compute_, struct ccase *c,
+                 int case_num)
 {
   struct compute_trns *compute = (struct compute_trns *) compute_;
 
   if (compute->test == NULL
-      || expr_evaluate (compute->test, c, NULL) == 1.0) 
+      || expr_evaluate (compute->test, c, case_num, NULL) == 1.0) 
     {
       /* Temporary storage for string expression return value. */
       union value v;
@@ -191,7 +201,7 @@ compute_str_vec (struct trns_header *compute_, struct ccase *c)
       /* Variable reference by indexed vector. */
       struct variable *vr;
 
-      expr_evaluate (compute->element, c, &index);
+      expr_evaluate (compute->element, c, case_num, &index);
       rindx = floor (index.f + EPSILON);
       if (index.f == SYSMIS || rindx < 1 || rindx > compute->vector->cnt)
         {
@@ -206,7 +216,7 @@ compute_str_vec (struct trns_header *compute_, struct ccase *c)
           return -1;
         }
 
-      expr_evaluate (compute->rvalue, c, &v);
+      expr_evaluate (compute->rvalue, c, case_num, &v);
       vr = compute->vector->var[rindx - 1];
       st_bare_pad_len_copy (c->data[vr->fv].s, &v.c[1], vr->width, v.c[0]); 
     }
@@ -313,6 +323,7 @@ compute_trns_free (struct trns_header *compute_)
   expr_free (compute->rvalue);
 }
 
+/* COMPUTE or IF target variable or vector element. */
 struct lvalue
   {
     char var_name[9];            /* Destination variable name, or "". */
@@ -320,6 +331,8 @@ struct lvalue
     struct expression *element;  /* Destination vector element, or NULL. */
   };
 
+/* Parses the target variable or vector elector into a new
+   `struct lvalue', which is returned. */
 static struct lvalue *
 lvalue_parse (void) 
 {
@@ -367,6 +380,8 @@ lvalue_parse (void)
   return NULL;
 }
 
+/* Returns the type (NUMERIC or ALPHA) of the target variable or
+   vector in LVALUE. */
 static int
 lvalue_get_type (const struct lvalue *lvalue) 
 {
@@ -383,12 +398,15 @@ lvalue_get_type (const struct lvalue *lvalue)
     return lvalue->vector->var[0]->type;
 }
 
+/* Returns nonzero if LVALUE has a vector as its target. */
 static int
 lvalue_is_vector (const struct lvalue *lvalue) 
 {
   return lvalue->vector != NULL;
 }
 
+/* Finalizes making LVALUE the target of COMPUTE, by creating the
+   target variable if necessary and setting fields in COMPUTE. */
 static void
 lvalue_finalize (struct lvalue *lvalue,
                  struct compute_trns *compute) 
@@ -397,20 +415,12 @@ lvalue_finalize (struct lvalue *lvalue,
     {
       compute->variable = dict_lookup_var (default_dict, lvalue->var_name);
       if (compute->variable == NULL)
-	{
-	  struct fmt_spec input_spec = { 0,8,2 };
 	  compute->variable = dict_create_var_assert (default_dict,
 						      lvalue->var_name, 0);
 
-       	  convert_fmt_ItoO (&input_spec, &compute->variable->print);
-	  compute->variable->write = compute->variable->print;
-	}
-
       compute->fv = compute->variable->fv;
       compute->width = compute->variable->width;
 
-      
-
       /* Goofy behavior, but compatible: Turn off LEAVE. */
       if (dict_class_from_id (compute->variable->name) != DC_SCRATCH)
         compute->variable->reinit = 1;
@@ -425,6 +435,7 @@ lvalue_finalize (struct lvalue *lvalue,
   lvalue_destroy (lvalue);
 }
 
+/* Destroys LVALUE. */
 static void 
 lvalue_destroy (struct lvalue *lvalue) 
 {