X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fexamine.q;h=e35c7049c800fc3698db43168ecc50d80afcd50a;hb=4255c7e5a693e09a97dc7a3cca0634bb2adaba2d;hp=d49f9f165ac3479b4988f07fecefa16b1995b09c;hpb=8b2b804bfce0dfdfb12f60bd2f5f8b9cec12fab9;p=pspp

diff --git a/src/examine.q b/src/examine.q
index d49f9f165a..e35c7049c8 100644
--- a/src/examine.q
+++ b/src/examine.q
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 /* (specification)
    "EXAMINE" (xmn_):
-   *variables=custom;
+   *^variables=custom;
    +total=custom;
    +nototal=custom;
    +missing=miss:pairwise/!listwise,
@@ -218,6 +218,19 @@ cmd_examine(void)
   if ( dependent_vars ) 
     free (dependent_vars);
 
+  {
+    struct factor *f = factors ;
+    while ( f ) 
+      {
+	struct factor *ff = f;
+
+	f = f->next;
+	free ( ff->fs );
+	hsh_destroy ( ff->fstats ) ;
+	free ( ff ) ;
+      }
+  }
+
   subc_list_double_destroy(&percentile_list);
 
   return CMD_SUCCESS;
@@ -359,6 +372,8 @@ output_examine(void)
 }
 
 
+/* Create a hash table of percentiles and their values from the list of
+   percentiles */
 static struct hsh_table *
 list_to_ptile_hash(const subc_list_double *l)
 {
@@ -378,6 +393,7 @@ list_to_ptile_hash(const subc_list_double *l)
       struct percentile *p = xmalloc (sizeof (struct percentile));
       
       p->p = subc_list_double_at(l,i);
+      p->v = SYSMIS;
 
       hsh_insert(h, p);
 
@@ -397,9 +413,9 @@ xmn_custom_percentiles(struct cmd_examine *p UNUSED)
 
   lex_match('(');
 
-  while ( lex_double_p() ) 
+  while ( lex_is_number() ) 
     {
-      subc_list_double_push(&percentile_list,lex_double());
+      subc_list_double_push(&percentile_list,lex_number());
 
       lex_get();
 
@@ -1514,12 +1530,14 @@ populate_descriptives(struct tab_table *tbl, int col, int row,
     
     assert(p);
 
+
     tab_float (tbl, col + 2, 
 	       row + 4,
 	       TAB_CENTER,
 	       p->v,
 	       8, 2);
   }
+    
 
   tab_text (tbl, col, 
 	    row + 5,
@@ -1759,7 +1777,7 @@ box_plot_group(const struct factor *fctr,
 				   s);
 	    }
 	}
-      else
+      else if ( ch )
 	{
 	  const double box_width = (ch->data_right - ch->data_left) / 3.0;
 	  const double box_centre = (ch->data_right + ch->data_left) / 2.0;