X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fget.c;h=bda892a503c6c0ef95e4f0ba63f2cf6d2c7aaf11;hb=19f4600e289108cd04b042ffff3769a6db2da070;hp=5ec84482d05c792d5588ea9e19b0453102bb74cd;hpb=0e8d6804cd1c81b397394358a9361b5efb883fc8;p=pspp

diff --git a/src/get.c b/src/get.c
index 5ec84482d0..bda892a503 100644
--- a/src/get.c
+++ b/src/get.c
@@ -887,6 +887,7 @@ cmd_match_files (void)
                     }
                 }
             }
+          free (by);
 	}
       else if (lex_match_id ("FIRST")) 
         {
@@ -977,17 +978,16 @@ cmd_match_files (void)
   for (iter = mtf.head; iter != NULL; iter = iter->next) 
     if (iter->in_name != NULL)
       {
-        static const struct fmt_spec f1_0 = {FMT_F, 1, 0};
-        
         iter->in_var = dict_create_var (mtf.dict, iter->in_name, 0);
         if (iter->in_var == NULL)
           {
             msg (SE, _("IN variable name %s duplicates an "
                        "existing variable name."),
-                 iter->in_var);
+                 iter->in_var->name);
             goto error;
           }
-        iter->in_var->print = iter->in_var->write = f1_0;
+        iter->in_var->print = iter->in_var->write
+          = make_output_format (FMT_F, 1, 0);
       }
     
   /* MATCH FILES performs an n-way merge on all its input files.
@@ -1031,7 +1031,7 @@ cmd_match_files (void)
   if (mtf.sink->class->open != NULL)
     mtf.sink->class->open (mtf.sink);
 
-  mtf.seq_nums = xcalloc (dict_get_var_cnt (mtf.dict) * sizeof *mtf.seq_nums);
+  mtf.seq_nums = xcalloc (dict_get_var_cnt (mtf.dict), sizeof *mtf.seq_nums);
   case_create (&mtf.mtf_case, dict_get_next_value_idx (mtf.dict));
 
   mtf_read_nonactive_records (&mtf);
@@ -1039,6 +1039,9 @@ cmd_match_files (void)
     procedure (mtf_processing, &mtf);
   mtf_processing_finish (&mtf);
 
+  free_case_source (vfm_source);
+  vfm_source = NULL;
+
   dict_destroy (default_dict);
   default_dict = mtf.dict;
   mtf.dict = NULL;
@@ -1202,7 +1205,9 @@ mtf_processing (struct ccase *c, void *mtf_)
   bool read_active_file;
 
   assert (mtf->head != NULL);
-  assert (mtf->head->type == MTF_FILE);
+  if (mtf->head->type == MTF_TABLE)
+    return 1;
+  
   do
     {
       struct mtf_file *min_head, *min_tail; /* Files with minimum BY values. */
@@ -1217,38 +1222,34 @@ mtf_processing (struct ccase *c, void *mtf_)
       min_head = min_tail = mtf->head;
       max_head = max_tail = NULL;
       for (iter = mtf->head->next; iter && iter->type == MTF_FILE;
-	   iter = iter->next)
-	switch (mtf_compare_BY_values (mtf, min_head, iter, c))
-	  {
-	  case -1:
-	    if (max_head)
-	      max_tail = max_tail->next_min = iter;
-	    else
-	      max_head = max_tail = iter;
-	    break;
-
-	  case 0:
+	   iter = iter->next) 
+        {
+          int cmp = mtf_compare_BY_values (mtf, min_head, iter, c);
+          if (cmp < 0) 
+            {
+              if (max_head)
+                max_tail = max_tail->next_min = iter;
+              else
+                max_head = max_tail = iter;
+            }
+          else if (cmp == 0) 
 	    min_tail = min_tail->next_min = iter;
-	    break;
-
-	  case 1:
-	    if (max_head)
-	      {
-		max_tail->next_min = min_head;
-		max_tail = min_tail;
-	      }
-	    else
-	      {
-		max_head = min_head;
-		max_tail = min_tail;
-	      }
-	    min_head = min_tail = iter;
-	    break;
-
-	  default:
-	    assert (0);
-	  }
-
+          else /* cmp > 0 */
+            {
+              if (max_head)
+                {
+                  max_tail->next_min = min_head;
+                  max_tail = min_tail;
+                }
+              else
+                {
+                  max_head = min_head;
+                  max_tail = min_tail;
+                }
+              min_head = min_tail = iter;
+            }
+        }
+      
       /* 4. For every TABLE, read another record as long as the BY
 	 values on the TABLE's input record are less than the FILEs'
 	 BY values.  If an exact match is found, store all the values
@@ -1258,32 +1259,28 @@ mtf_processing (struct ccase *c, void *mtf_)
 	  assert (iter->type == MTF_TABLE);
       
 	  next = iter->next;
-
-	again:
-	  switch (mtf_compare_BY_values (mtf, min_head, iter, c))
-	    {
-	    case -1:
-	      if (max_head)
-		max_tail = max_tail->next_min = iter;
-	      else
-		max_head = max_tail = iter;
-	      break;
-
-	    case 0:
-	      min_tail = min_tail->next_min = iter;
-	      break;
-
-	    case 1:
-	      if (iter->handle == NULL)
-		return 1;
-	      if (sfm_read_case (iter->reader, &iter->input))
-		goto again;
-	      mtf_delete_file_in_place (mtf, &iter);
-	      break;
-
-	    default:
-	      assert (0);
-	    }
+          for (;;) 
+            {
+              int cmp = mtf_compare_BY_values (mtf, min_head, iter, c);
+              if (cmp < 0) 
+                {
+                  if (max_head)
+                    max_tail = max_tail->next_min = iter;
+                  else
+                    max_head = max_tail = iter;
+                }
+              else if (cmp == 0)
+                min_tail = min_tail->next_min = iter;
+              else /* cmp > 0 */
+                {
+                  if (iter->handle == NULL)
+                    return 1;
+                  if (sfm_read_case (iter->reader, &iter->input))
+                    continue;
+                  mtf_delete_file_in_place (mtf, &iter);
+                }
+              break;
+            }
 	}
 
       /* Next sequence number. */