X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmatrix-data.c;h=e90aef0955ed5872509a27a4a7726912320346df;hb=2c9a5954d98d4dd508d8fbf2496f2bb819527a46;hp=7c3411bcabc04468b71297cbe7b5ee46eb53a2b2;hpb=f9d47b5bba8416419cf3bcd3aa23c2d40a05fcac;p=pspp

diff --git a/src/matrix-data.c b/src/matrix-data.c
index 7c3411bcab..e90aef0955 100644
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -18,12 +18,13 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <float.h>
 #include "algorithm.h"
 #include "alloc.h"
+#include "case.h"
 #include "command.h"
 #include "data-in.h"
 #include "dfm.h"
@@ -126,7 +127,7 @@ struct matrix_data_pgm
     int contents[EOC * 3 + 1];  /* Contents. */
     int n_contents;             /* Number of entries. */
 
-    
+    /* Continuous variables. */
     int n_continuous;           /* Number of continuous variables. */
     int first_continuous;       /* Index into default_dict.var of
                                    first continuous variable. */
@@ -141,10 +142,6 @@ static void read_matrices_without_rowtype (struct matrix_data_pgm *);
 static void read_matrices_with_rowtype (struct matrix_data_pgm *);
 static int string_to_content_type (char *, int *);
 
-#if DEBUGGING
-static void debug_print (void);
-#endif
-
 int
 cmd_matrix_data (void)
 {
@@ -153,9 +150,6 @@ cmd_matrix_data (void)
   
   unsigned seen = 0;
   
-  lex_match_id ("MATRIX");
-  lex_match_id ("DATA");
-
   discard_variables ();
 
   pool = pool_create ();
@@ -596,9 +590,8 @@ cmd_matrix_data (void)
       goto lossage;
     }
 
-#if DEBUGGING
-  debug_print ();
-#endif
+  if (!dfm_open_for_reading (mx->data_file))
+    goto lossage;
 
   if (mx->explicit_rowtype)
     read_matrices_with_rowtype (mx);
@@ -676,106 +669,6 @@ compare_variables_by_mxd_vartype (const void *a_, const void *b_)
   else
     return a->subtype < b->subtype ? -1 : a->subtype > b->subtype;
 }
-
-#if DEBUGGING
-/* Print out the command as input. */
-static void
-debug_print (void)
-{
-  printf ("MATRIX DATA\n\t/VARIABLES=");
-  
-  {
-    int i;
-    
-    for (i = 0; i < default_dict.nvar; i++)
-      printf ("%s ", default_dict.var[i]->name);
-  }
-  printf ("\n");
-
-  printf ("\t/FORMAT=");
-  if (fmt == LIST)
-    printf ("LIST");
-  else if (fmt == FREE)
-    printf ("FREE");
-  else
-    assert (0);
-  if (section == LOWER)
-    printf (" LOWER");
-  else if (section == UPPER)
-    printf (" UPPER");
-  else if (section == FULL)
-    printf (" FULL");
-  else
-    assert (0);
-  if (diag == DIAGONAL)
-    printf (" DIAGONAL\n");
-  else if (diag == NODIAGONAL)
-    printf (" NODIAGONAL\n");
-  else
-    assert (0);
-
-  if (dict_get_split_cnt (default_dict) != 0)
-    {
-      int i;
-
-      printf ("\t/SPLIT=");
-      for (i = 0; i < dict_get_split_cnt (default_dict); i++)
-	printf ("%s ", dict_get_split_vars (default_dict)[i]->name);
-      if (single_split)
-	printf ("\t/* single split");
-      printf ("\n");
-    }
-  
-  if (n_factors)
-    {
-      int i;
-
-      printf ("\t/FACTORS=");
-      for (i = 0; i < n_factors; i++)
-	printf ("%s ", factors[i]->name);
-      printf ("\n");
-    }
-
-  if (cells != -1)
-    printf ("\t/CELLS=%d\n", cells);
-
-  if (mx->pop_n != -1)
-    printf ("\t/N=%d\n", mx->pop_n);
-
-  if (mx->n_contents)
-    {
-      int i;
-      int space = 0;
-      
-      printf ("\t/CONTENTS=");
-      for (i = 0; i < mx->n_contents; i++)
-	{
-	  if (mx->contents[i] == LPAREN)
-	    {
-	      if (space)
-		printf (" ");
-	      printf ("(");
-	      space = 0;
-	    }
-	  else if (mx->contents[i] == RPAREN)
-	    {
-	      printf (")");
-	      space = 1;
-	    }
-	  else 
-	    {
-
-	      assert (mx->contents[i] >= 0 && mx->contents[i] <= PROX);
-	      if (space)
-		printf (" ");
-	      printf ("%s", content_names[mx->contents[i]]);
-	      space = 1;
-	    }
-	}
-      printf ("\n");
-    }
-}
-#endif /* DEBUGGING */
 
 /* Matrix tokenizer. */
 
@@ -786,6 +679,7 @@ enum matrix_token_type
     MSTR		/* String. */
   };
 
+/* A MATRIX DATA parsing token. */
 struct matrix_token
   {
     enum matrix_token_type type; 
@@ -830,22 +724,34 @@ static const char *
 context (struct file_handle *data_file)
 {
   static char buf[32];
-  int len;
-  char *p = dfm_get_record (data_file, &len);
-  
-  if (!p || !len)
-    strcpy (buf, "at end of line");
-  else
+
+  if (dfm_eof (data_file))
+    strcpy (buf, "at end of file");
+  else 
     {
-      char *cp = buf;
-      int n_copy = min (10, len);
-      cp = stpcpy (buf, "before `");
-      while (n_copy && isspace ((unsigned char) *p))
-	p++, n_copy++;
-      while (n_copy && !isspace ((unsigned char) *p))
-	*cp++ = *p++, n_copy--;
-      *cp++ = '\'';
-      *cp = 0;
+      struct len_string line;
+      const char *sp;
+      
+      dfm_get_record (data_file, &line);
+      sp = ls_c_str (&line);
+      while (sp < ls_end (&line) && isspace ((unsigned char) *sp))
+        sp++;
+      if (sp >= ls_end (&line))
+        strcpy (buf, "at end of line");
+      else
+        {
+          char *dp;
+          size_t copy_cnt = 0;
+
+          dp = stpcpy (buf, "before `");
+          while (sp < ls_end (&line) && !isspace ((unsigned char) *sp)
+                 && copy_cnt < 10) 
+            {
+              *dp++ = *sp++;
+              copy_cnt++; 
+            }
+          strcpy (dp, "'");
+        }
     }
   
   return buf;
@@ -855,68 +761,55 @@ context (struct file_handle *data_file)
 static int
 another_token (struct file_handle *data_file)
 {
-  char *cp, *ep;
-  int len;
-
   for (;;)
     {
-      cp = dfm_get_record (data_file, &len);
-      if (!cp)
-	return 0;
+      struct len_string line;
+      const char *cp;
+      
+      if (dfm_eof (data_file))
+        return 0;
+      dfm_get_record (data_file, &line);
 
-      ep = cp + len;
-      while (isspace ((unsigned char) *cp) && cp < ep)
+      cp = ls_c_str (&line);
+      while (isspace ((unsigned char) *cp) && cp < ls_end (&line))
 	cp++;
 
-      if (cp < ep)
-	break;
+      if (cp < ls_end (&line)) 
+        {
+          dfm_forward_columns (data_file, cp - ls_c_str (&line));
+          return 1;
+        }
 
-      dfm_fwd_record (data_file);
+      dfm_forward_record (data_file);
     }
-  
-  dfm_set_record (data_file, cp);
-
-  return 1;
 }
 
 /* Parse a MATRIX DATA token from mx->data_file into TOKEN. */
 static int
 (mget_token) (struct matrix_token *token, struct file_handle *data_file)
 {
-  char *cp, *ep;
-  int len;
+  struct len_string line;
   int first_column;
-    
-  for (;;)
-    {
-      cp = dfm_get_record (data_file, &len);
-      if (!cp)
-        return 0;
+  char *cp;
 
-      ep = cp + len;
-      while (isspace ((unsigned char) *cp) && cp < ep)
-	cp++;
+  if (!another_token (data_file))
+    return 0;
 
-      if (cp < ep)
-	break;
-
-      dfm_fwd_record (data_file);
-    }
-  
-  dfm_set_record (data_file, cp);
-  first_column = dfm_get_cur_col (data_file) + 1;
+  dfm_get_record (data_file, &line);
+  first_column = dfm_column_start (data_file);
 
   /* Three types of fields: quoted with ', quoted with ", unquoted. */
+  cp = ls_c_str (&line);
   if (*cp == '\'' || *cp == '"')
     {
       int quote = *cp;
 
       token->type = MSTR;
       token->string = ++cp;
-      while (cp < ep && *cp != quote)
+      while (cp < ls_end (&line) && *cp != quote)
 	cp++;
       token->length = cp - token->string;
-      if (cp < ep)
+      if (cp < ls_end (&line))
 	cp++;
       else
 	msg (SW, _("Scope of string exceeds line."));
@@ -926,7 +819,8 @@ static int
       int is_num = isdigit ((unsigned char) *cp) || *cp == '.';
 
       token->string = cp++;
-      while (cp < ep && !isspace ((unsigned char) *cp) && *cp != ','
+      while (cp < ls_end (&line)
+             && !isspace ((unsigned char) *cp) && *cp != ','
 	     && *cp != '-' && *cp != '+')
 	{
 	  if (isdigit ((unsigned char) *cp))
@@ -962,7 +856,7 @@ static int
 	token->type = MSTR;
     }
 
-  dfm_set_record (data_file, cp);
+  dfm_forward_columns (data_file, cp - ls_c_str (&line));
     
   return 1;
 }
@@ -972,46 +866,46 @@ static int
 static int
 force_eol (struct file_handle *data_file, const char *content)
 {
-  char *cp;
-  int len;
-  
-  cp = dfm_get_record (data_file, &len);
-  if (!cp)
+  struct len_string line;
+  const char *cp;
+
+  if (dfm_eof (data_file))
     return 0;
-  while (len && isspace (*cp))
-    cp++, len--;
+  dfm_get_record (data_file, &line);
+
+  cp = ls_c_str (&line);
+  while (isspace ((unsigned char) *cp) && cp < ls_end (&line))
+    cp++;
   
-  if (len)
+  if (cp < ls_end (&line))
     {
       msg (SE, _("End of line expected %s while reading %s."),
 	   context (data_file), content);
       return 0;
     }
   
-  dfm_fwd_record (data_file);
-  
+  dfm_forward_record (data_file);
   return 1;
 }
 
 /* Back end, omitting ROWTYPE_. */
 
-/* MATRIX DATA data. */
-static double ***nr_data;
-
-/* Factor values. */
-static double *nr_factor_values;
-
-/* Largest-numbered cell that we have read in thus far, plus one. */
-static int max_cell_index;
-
-/* SPLIT FILE variable values. */
-static double *split_values;
+struct nr_aux_data 
+  {
+    struct matrix_data_pgm *mx; /* MATRIX DATA program. */
+    double ***data;             /* MATRIX DATA data. */
+    double *factor_values;      /* Factor values. */
+    int max_cell_idx;           /* Max-numbered cell that we have
+                                   read so far, plus one. */
+    double *split_values;       /* SPLIT FILE variable values. */
+  };
 
-static int nr_read_splits (struct matrix_data_pgm *, int compare);
-static int nr_read_factors (struct matrix_data_pgm *, int cell);
-static void nr_output_data (struct matrix_data_pgm *,
+static int nr_read_splits (struct nr_aux_data *, int compare);
+static int nr_read_factors (struct nr_aux_data *, int cell);
+static void nr_output_data (struct nr_aux_data *, struct ccase *,
                             write_case_func *, write_case_data);
 static void matrix_data_read_without_rowtype (struct case_source *source,
+                                              struct ccase *,
                                               write_case_func *,
                                               write_case_data);
 
@@ -1019,21 +913,25 @@ static void matrix_data_read_without_rowtype (struct case_source *source,
 static void
 read_matrices_without_rowtype (struct matrix_data_pgm *mx)
 {
+  struct nr_aux_data nr;
+  
   if (mx->cells == -1)
     mx->cells = 1;
-  
-  split_values = xmalloc (sizeof *split_values
-                          * dict_get_split_cnt (default_dict));
-  nr_factor_values = xmalloc (sizeof *nr_factor_values * mx->n_factors * mx->cells);
-  max_cell_index = 0;
+
+  nr.mx = mx;
+  nr.data = NULL;
+  nr.factor_values = xmalloc (sizeof *nr.factor_values * mx->n_factors * mx->cells);
+  nr.max_cell_idx = 0;
+  nr.split_values = xmalloc (sizeof *nr.split_values
+                             * dict_get_split_cnt (default_dict));
 
   vfm_source = create_case_source (&matrix_data_without_rowtype_source_class,
-                                   mx);
+                                   default_dict, &nr);
   
-  procedure (NULL, NULL, NULL, NULL);
+  procedure (NULL, NULL);
 
-  free (split_values);
-  free (nr_factor_values);
+  free (nr.split_values);
+  free (nr.factor_values);
 
   fh_close_handle (mx->data_file);
 }
@@ -1091,20 +989,13 @@ fill_matrix (struct matrix_data_pgm *mx, int content, double *cp)
    If PER_FACTOR is nonzero, then factor information is read from
    the data file.  Data is for cell number CELL. */
 static int
-nr_read_data_lines (struct matrix_data_pgm *mx,
+nr_read_data_lines (struct nr_aux_data *nr,
                     int per_factor, int cell, int content, int compare)
 {
-  /* Content type. */
-  const int type = content_type[content];
-  
-  /* Number of lines that must be parsed from the data file for this
-     content type. */
-  int n_lines;
-  
-  /* Current position in vector or matrix. */
-  double *cp;
-
-  /* Counter. */
+  struct matrix_data_pgm *mx = nr->mx;
+  const int type = content_type[content];               /* Content type. */
+  int n_lines; /* Number of lines to parse from data file for this type. */
+  double *cp;                   /* Current position in vector or matrix. */
   int i;
 
   if (type != 1)
@@ -1116,7 +1007,7 @@ nr_read_data_lines (struct matrix_data_pgm *mx,
 	n_lines--;
     }
 
-  cp = nr_data[content][cell];
+  cp = nr->data[content][cell];
   if (type == 1 && mx->section == LOWER && mx->diag == NODIAGONAL)
     cp += mx->n_continuous;
 
@@ -1124,9 +1015,9 @@ nr_read_data_lines (struct matrix_data_pgm *mx,
     {
       int n_cols;
       
-      if (!nr_read_splits (mx, 1))
+      if (!nr_read_splits (nr, 1))
 	return 0;
-      if (per_factor && !nr_read_factors (mx, cell))
+      if (per_factor && !nr_read_factors (nr, cell))
 	return 0;
       compare = 1;
 
@@ -1155,6 +1046,7 @@ nr_read_data_lines (struct matrix_data_pgm *mx,
 	      break;
 	    default:
 	      assert (0);
+              abort ();
 	    }
 	  break;
 	case 2:
@@ -1162,6 +1054,7 @@ nr_read_data_lines (struct matrix_data_pgm *mx,
 	  break;
 	default:
 	  assert (0);
+          abort ();
 	}
 
       {
@@ -1192,7 +1085,7 @@ nr_read_data_lines (struct matrix_data_pgm *mx,
 	cp += mx->n_continuous - n_cols;
     }
 
-  fill_matrix (mx, content, nr_data[content][cell]);
+  fill_matrix (mx, content, nr->data[content][cell]);
 
   return 1;
 }
@@ -1201,21 +1094,23 @@ nr_read_data_lines (struct matrix_data_pgm *mx,
    writes them to the output file.  Returns success. */
 static void
 matrix_data_read_without_rowtype (struct case_source *source,
+                                  struct ccase *c,
                                   write_case_func *write_case,
                                   write_case_data wc_data)
 {
-  struct matrix_data_pgm *mx = source->aux;
+  struct nr_aux_data *nr = source->aux;
+  struct matrix_data_pgm *mx = nr->mx;
 
   {
     int *cp;
 
-    nr_data = pool_alloc (mx->container, (PROX + 1) * sizeof *nr_data);
+    nr->data = pool_alloc (mx->container, (PROX + 1) * sizeof *nr->data);
     
     {
       int i;
 
       for (i = 0; i <= PROX; i++)
-	nr_data[i] = NULL;
+	nr->data[i] = NULL;
     }
     
     for (cp = mx->contents; *cp != EOC; cp++)
@@ -1232,12 +1127,12 @@ matrix_data_read_without_rowtype (struct case_source *source,
 	    int n_vectors = per_factor ? mx->cells : 1;
 	    int i;
 	    
-	    nr_data[*cp] = pool_alloc (mx->container,
-				       n_vectors * sizeof **nr_data);
+	    nr->data[*cp] = pool_alloc (mx->container,
+				       n_vectors * sizeof **nr->data);
 	    
 	    for (i = 0; i < n_vectors; i++)
-	      nr_data[*cp][i] = pool_alloc (mx->container,
-					    n_entries * sizeof ***nr_data);
+	      nr->data[*cp][i] = pool_alloc (mx->container,
+					    n_entries * sizeof ***nr->data);
 	  }
 	}
   }
@@ -1246,7 +1141,7 @@ matrix_data_read_without_rowtype (struct case_source *source,
     {
       int *bp, *ep, *np;
       
-      if (!nr_read_splits (mx, 0))
+      if (!nr_read_splits (nr, 0))
 	return;
       
       for (bp = mx->contents; *bp != EOC; bp = np)
@@ -1281,13 +1176,13 @@ matrix_data_read_without_rowtype (struct case_source *source,
 		int *cp;
 
 		for (cp = bp; cp < ep; cp++) 
-		  if (!nr_read_data_lines (mx, per_factor, i, *cp, cp != bp))
+		  if (!nr_read_data_lines (nr, per_factor, i, *cp, cp != bp))
 		    return;
 	      }
 	  }
 	}
 
-      nr_output_data (mx, write_case, wc_data);
+      nr_output_data (nr, c, write_case, wc_data);
 
       if (dict_get_split_cnt (default_dict) == 0
           || !another_token (mx->data_file))
@@ -1299,9 +1194,10 @@ matrix_data_read_without_rowtype (struct case_source *source,
    values read to the last values read and returns 1 if they're equal,
    0 otherwise. */
 static int
-nr_read_splits (struct matrix_data_pgm *mx, int compare)
+nr_read_splits (struct nr_aux_data *nr, int compare)
 {
-  static int just_read = 0;
+  struct matrix_data_pgm *mx = nr->mx;
+  static int just_read = 0; /* FIXME: WTF? */
   size_t split_cnt;
   size_t i;
 
@@ -1317,7 +1213,7 @@ nr_read_splits (struct matrix_data_pgm *mx, int compare)
   if (mx->single_split)
     {
       if (!compare)
-	split_values[0]
+	nr->split_values[0]
           = ++dict_get_split_vars (default_dict)[0]->p.mxd.subtype;
       return 1;
     }
@@ -1339,11 +1235,12 @@ nr_read_splits (struct matrix_data_pgm *mx, int compare)
         }
 
       if (!compare)
-        split_values[i] = token.number;
-      else if (split_values[i] != token.number)
+        nr->split_values[i] = token.number;
+      else if (nr->split_values[i] != token.number)
         {
           msg (SE, _("Expecting value %g for %s."),
-               split_values[i], dict_get_split_vars (default_dict)[i]->name);
+               nr->split_values[i],
+               dict_get_split_vars (default_dict)[i]->name);
           return 0;
         }
     }
@@ -1355,20 +1252,21 @@ nr_read_splits (struct matrix_data_pgm *mx, int compare)
    values read to the last values read and returns 1 if they're equal,
    0 otherwise. */
 static int
-nr_read_factors (struct matrix_data_pgm *mx, int cell)
+nr_read_factors (struct nr_aux_data *nr, int cell)
 {
+  struct matrix_data_pgm *mx = nr->mx;
   int compare;
   
   if (mx->n_factors == 0)
     return 1;
 
-  assert (max_cell_index >= cell);
-  if (cell != max_cell_index)
+  assert (nr->max_cell_idx >= cell);
+  if (cell != nr->max_cell_idx)
     compare = 1;
   else
     {
       compare = 0;
-      max_cell_index++;
+      nr->max_cell_idx++;
     }
       
   {
@@ -1387,11 +1285,11 @@ nr_read_factors (struct matrix_data_pgm *mx, int cell)
 	  }
 	
 	if (!compare)
-	  nr_factor_values[i + mx->n_factors * cell] = token.number;
-	else if (nr_factor_values[i + mx->n_factors * cell] != token.number)
+	  nr->factor_values[i + mx->n_factors * cell] = token.number;
+	else if (nr->factor_values[i + mx->n_factors * cell] != token.number)
 	  {
 	    msg (SE, _("Syntax error expecting value %g for %s %s."),
-		 nr_factor_values[i + mx->n_factors * cell],
+		 nr->factor_values[i + mx->n_factors * cell],
 		 mx->factors[i]->name, context (mx->data_file));
 	    return 0;
 	  }
@@ -1405,16 +1303,17 @@ nr_read_factors (struct matrix_data_pgm *mx, int cell)
    CP to the active file. */
 static void
 dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
+                   struct ccase *c,
                    write_case_func *write_case, write_case_data wc_data)
 {
   int type = content_type[content];
 
   {
-    st_bare_pad_copy (temp_case->data[mx->rowtype_->fv].s,
+    st_bare_pad_copy (case_data_rw (c, mx->rowtype_->fv)->s,
 		      content_names[content], 8);
     
     if (type != 1)
-      memset (&temp_case->data[mx->varname_->fv].s, ' ', 8);
+      memset (case_data_rw (c, mx->varname_->fv)->s, ' ', 8);
   }
 
   {
@@ -1428,11 +1327,11 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
 	for (j = 0; j < mx->n_continuous; j++)
 	  {
             int fv = dict_get_var (default_dict, mx->first_continuous + j)->fv;
-	    temp_case->data[fv].f = *cp;
+            case_data_rw (c, fv)->f = *cp;
 	    cp++;
 	  }
 	if (type == 1)
-	  st_bare_pad_copy (temp_case->data[mx->varname_->fv].s,
+	  st_bare_pad_copy (case_data_rw (c, mx->varname_->fv)->s,
                             dict_get_var (default_dict,
                                           mx->first_continuous + i)->name,
 			    8);
@@ -1443,17 +1342,20 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
 
 /* Finally dump out everything from nr_data[] to the output file. */
 static void
-nr_output_data (struct matrix_data_pgm *mx,
+nr_output_data (struct nr_aux_data *nr, struct ccase *c,
                 write_case_func *write_case, write_case_data wc_data)
 {
+  struct matrix_data_pgm *mx = nr->mx;
+  
   {
     struct variable *const *split;
     size_t split_cnt;
     size_t i;
 
     split_cnt = dict_get_split_cnt (default_dict);
+    split = dict_get_split_vars (default_dict);
     for (i = 0; i < split_cnt; i++)
-      temp_case->data[split[i]->fv].f = split_values[i];
+      case_data_rw (c, split[i]->fv)->f = nr->split_values[i];
   }
 
   if (mx->n_factors)
@@ -1467,8 +1369,8 @@ nr_output_data (struct matrix_data_pgm *mx,
 
 	    for (factor = 0; factor < mx->n_factors; factor++)
 	      {
-		temp_case->data[mx->factors[factor]->fv].f
-		  = nr_factor_values[factor + cell * mx->n_factors];
+		case_data_rw (c, mx->factors[factor]->fv)->f
+		  = nr->factor_values[factor + cell * mx->n_factors];
 		debug_printf (("f:%s ", mx->factors[factor]->name));
 	      }
 	  }
@@ -1479,11 +1381,11 @@ nr_output_data (struct matrix_data_pgm *mx,
 	    for (content = 0; content <= PROX; content++)
 	      if (mx->is_per_factor[content])
 		{
-		  assert (nr_data[content] != NULL
-			  && nr_data[content][cell] != NULL);
+		  assert (nr->data[content] != NULL
+			  && nr->data[content][cell] != NULL);
 
-		  dump_cell_content (mx, content, nr_data[content][cell],
-                                     write_case, wc_data);
+		  dump_cell_content (mx, content, nr->data[content][cell],
+                                     c, write_case, wc_data);
 		}
 	  }
 	}
@@ -1496,21 +1398,18 @@ nr_output_data (struct matrix_data_pgm *mx,
       int factor;
 
       for (factor = 0; factor < mx->n_factors; factor++)
-	temp_case->data[mx->factors[factor]->fv].f = SYSMIS;
+	case_data_rw (c, mx->factors[factor]->fv)->f = SYSMIS;
     }
     
     for (content = 0; content <= PROX; content++)
-      if (!mx->is_per_factor[content] && nr_data[content] != NULL)
-	dump_cell_content (mx, content, nr_data[content][0],
-                           write_case, wc_data);
+      if (!mx->is_per_factor[content] && nr->data[content] != NULL)
+	dump_cell_content (mx, content, nr->data[content][0],
+                           c, write_case, wc_data);
   }
 }
 
 /* Back end, with ROWTYPE_. */
 
-/* Type of current row. */
-static int wr_content;
-
 /* All the data for one set of factor values. */
 struct factor_data
   {
@@ -1520,19 +1419,26 @@ struct factor_data
     struct factor_data *next;
   };
 
-/* All the data, period. */
-struct factor_data *wr_data;
-
-/* Current factor. */
-struct factor_data *wr_current;
+/* With ROWTYPE_ auxiliary data. */
+struct wr_aux_data 
+  {
+    struct matrix_data_pgm *mx;         /* MATRIX DATA program. */
+    int content;                        /* Type of current row. */
+    double *split_values;               /* SPLIT FILE variable values. */
+    struct factor_data *data;           /* All the data. */
+    struct factor_data *current;        /* Current factor. */
+  };
 
-static int wr_read_splits (struct matrix_data_pgm *,
+static int wr_read_splits (struct wr_aux_data *, struct ccase *,
+                           write_case_func *, write_case_data);
+static int wr_output_data (struct wr_aux_data *, struct ccase *,
                            write_case_func *, write_case_data);
-static int wr_output_data (struct matrix_data_pgm *, write_case_func *, write_case_data);
-static int wr_read_rowtype (const struct matrix_token *, struct file_handle *);
-static int wr_read_factors (struct matrix_data_pgm *);
-static int wr_read_indeps (struct matrix_data_pgm *);
+static int wr_read_rowtype (struct wr_aux_data *, 
+                            const struct matrix_token *, struct file_handle *);
+static int wr_read_factors (struct wr_aux_data *);
+static int wr_read_indeps (struct wr_aux_data *);
 static void matrix_data_read_with_rowtype (struct case_source *,
+                                           struct ccase *,
                                            write_case_func *,
                                            write_case_data);
 
@@ -1541,48 +1447,57 @@ static void matrix_data_read_with_rowtype (struct case_source *,
 static void
 read_matrices_with_rowtype (struct matrix_data_pgm *mx)
 {
-  wr_data = wr_current = NULL;
-  split_values = NULL;
+  struct wr_aux_data wr;
+
+  wr.mx = mx;
+  wr.content = -1;
+  wr.split_values = NULL;
+  wr.data = NULL;
+  wr.current = NULL;
   mx->cells = 0;
 
-  vfm_source = create_case_source (&matrix_data_with_rowtype_source_class, mx);
-  
-  procedure (NULL, NULL, NULL, NULL);
+  vfm_source = create_case_source (&matrix_data_with_rowtype_source_class,
+                                   default_dict, &wr);
+  procedure (NULL, NULL);
 
-  free (split_values);
+  free (wr.split_values);
   fh_close_handle (mx->data_file);
 }
 
 /* Read from the data file and write it to the active file. */
 static void
 matrix_data_read_with_rowtype (struct case_source *source,
+                               struct ccase *c,
                                write_case_func *write_case,
                                write_case_data wc_data)
 {
-  struct matrix_data_pgm *mx = source->aux;
+  struct wr_aux_data *wr = source->aux;
+  struct matrix_data_pgm *mx = wr->mx;
 
   do
     {
-      if (!wr_read_splits (mx, write_case, wc_data))
+      if (!wr_read_splits (wr, c, write_case, wc_data))
 	return;
 
-      if (!wr_read_factors (mx))
+      if (!wr_read_factors (wr))
 	return;
 
-      if (!wr_read_indeps (mx))
+      if (!wr_read_indeps (wr))
 	return;
     }
   while (another_token (mx->data_file));
 
-  wr_output_data (mx, write_case, wc_data);
+  wr_output_data (wr, c, write_case, wc_data);
 }
 
 /* Read the split file variables.  If they differ from the previous
    set of split variables then output the data.  Returns success. */
 static int 
-wr_read_splits (struct matrix_data_pgm *mx,
+wr_read_splits (struct wr_aux_data *wr,
+                struct ccase *c,
                 write_case_func *write_case, write_case_data wc_data)
 {
+  struct matrix_data_pgm *mx = wr->mx;
   int compare;
   size_t split_cnt;
 
@@ -1590,17 +1505,16 @@ wr_read_splits (struct matrix_data_pgm *mx,
   if (split_cnt == 0)
     return 1;
 
-  if (split_values)
+  if (wr->split_values)
     compare = 1;
   else
     {
       compare = 0;
-      split_values = xmalloc (split_cnt * sizeof *split_values);
+      wr->split_values = xmalloc (split_cnt * sizeof *wr->split_values);
     }
   
   {
     int different = 0;
-    size_t split_cnt;
     int i;
 
     for (i = 0; i < split_cnt; i++)
@@ -1615,14 +1529,14 @@ wr_read_splits (struct matrix_data_pgm *mx,
 	    return 0;
 	  }
 
-	if (compare && split_values[i] != token.number && !different)
+	if (compare && wr->split_values[i] != token.number && !different)
 	  {
-	    if (!wr_output_data (mx, write_case, wc_data))
+	    if (!wr_output_data (wr, c, write_case, wc_data))
 	      return 0;
 	    different = 1;
 	    mx->cells = 0;
 	  }
-	split_values[i] = token.number;
+	wr->split_values[i] = token.number;
       }
   }
 
@@ -1668,20 +1582,24 @@ compare_factors (const void *a_, const void *b_, void *mx_)
 /* Write out the data for the current split file to the active
    file. */
 static int 
-wr_output_data (struct matrix_data_pgm *mx,
+wr_output_data (struct wr_aux_data *wr,
+                struct ccase *c,
                 write_case_func *write_case, write_case_data wc_data)
 {
+  struct matrix_data_pgm *mx = wr->mx;
+
   {
     struct variable *const *split;
     size_t split_cnt;
     size_t i;
 
     split_cnt = dict_get_split_cnt (default_dict);
+    split = dict_get_split_vars (default_dict);
     for (i = 0; i < split_cnt; i++)
-      temp_case->data[split[i]->fv].f = split_values[i];
+      case_data_rw (c, split[i]->fv)->f = wr->split_values[i];
   }
 
-  /* Sort the wr_data list. */
+  /* Sort the wr->data list. */
   {
     struct factor_data **factors;
     struct factor_data *iter;
@@ -1689,12 +1607,12 @@ wr_output_data (struct matrix_data_pgm *mx,
 
     factors = xmalloc (sizeof *factors * mx->cells);
 
-    for (i = 0, iter = wr_data; iter; iter = iter->next, i++)
+    for (i = 0, iter = wr->data; iter; iter = iter->next, i++)
       factors[i] = iter;
 
     sort (factors, mx->cells, sizeof *factors, compare_factors, mx);
 
-    wr_data = factors[0];
+    wr->data = factors[0];
     for (i = 0; i < mx->cells - 1; i++)
       factors[i]->next = factors[i + 1];
     factors[mx->cells - 1]->next = NULL;
@@ -1706,14 +1624,14 @@ wr_output_data (struct matrix_data_pgm *mx,
   {
     struct factor_data *iter;
     
-    for (iter = wr_data; iter; iter = iter->next)
+    for (iter = wr->data; iter; iter = iter->next)
       {
 	{
 	  int factor;
 
 	  for (factor = 0; factor < mx->n_factors; factor++)
 	    {
-	      temp_case->data[mx->factors[factor]->fv].f
+	      case_data_rw (c, mx->factors[factor]->fv)->f
 		= iter->factors[factor];
 	      debug_printf (("f:%s ", factors[factor]->name));
 	    }
@@ -1748,7 +1666,7 @@ wr_output_data (struct matrix_data_pgm *mx,
 	      fill_matrix (mx, content, iter->data[content]);
 
 	      dump_cell_content (mx, content, iter->data[content],
-                                 write_case, wc_data);
+                                 c, write_case, wc_data);
 	    }
 	}
       }
@@ -1757,7 +1675,7 @@ wr_output_data (struct matrix_data_pgm *mx,
   pool_destroy (mx->container);
   mx->container = pool_create ();
   
-  wr_data = wr_current = NULL;
+  wr->data = wr->current = NULL;
   
   return 1;
 }
@@ -1765,10 +1683,11 @@ wr_output_data (struct matrix_data_pgm *mx,
 /* Sets ROWTYPE_ based on the given TOKEN read from DATA_FILE.
    Return success. */
 static int 
-wr_read_rowtype (const struct matrix_token *token,
+wr_read_rowtype (struct wr_aux_data *wr,
+                 const struct matrix_token *token,
                  struct file_handle *data_file)
 {
-  if (wr_content != -1)
+  if (wr->content != -1)
     {
       msg (SE, _("Multiply specified ROWTYPE_ %s."), context (data_file));
       return 0;
@@ -1790,10 +1709,10 @@ wr_read_rowtype (const struct matrix_token *token,
     for (cp = s; *cp; cp++)
       *cp = toupper ((unsigned char) *cp);
 
-    wr_content = string_to_content_type (s, NULL);
+    wr->content = string_to_content_type (s, NULL);
   }
 
-  if (wr_content == -1)
+  if (wr->content == -1)
     {
       msg (SE, _("Syntax error %s."), context (data_file));
       return 0;
@@ -1805,11 +1724,12 @@ wr_read_rowtype (const struct matrix_token *token,
 /* Read the factors for the current row.  Select a set of factors and
    point wr_current to it. */
 static int 
-wr_read_factors (struct matrix_data_pgm *mx)
+wr_read_factors (struct wr_aux_data *wr)
 {
+  struct matrix_data_pgm *mx = wr->mx;
   double *factor_values = local_alloc (sizeof *factor_values * mx->n_factors);
 
-  wr_content = -1;
+  wr->content = -1;
   {
     int i;
   
@@ -1820,7 +1740,7 @@ wr_read_factors (struct matrix_data_pgm *mx)
 	  goto lossage;
 	if (token.type == MSTR)
 	  {
-	    if (!wr_read_rowtype (&token, mx->data_file))
+	    if (!wr_read_rowtype (wr, &token, mx->data_file))
 	      goto lossage;
 	    if (!mget_token (&token, mx->data_file))
 	      goto lossage;
@@ -1835,23 +1755,23 @@ wr_read_factors (struct matrix_data_pgm *mx)
 	factor_values[i] = token.number;
       }
   }
-  if (wr_content == -1)
+  if (wr->content == -1)
     {
       struct matrix_token token;
       if (!mget_token (&token, mx->data_file))
 	goto lossage;
-      if (!wr_read_rowtype (&token, mx->data_file))
+      if (!wr_read_rowtype (wr, &token, mx->data_file))
 	goto lossage;
     }
   
   /* Try the most recent factor first as a simple caching
      mechanism. */
-  if (wr_current)
+  if (wr->current)
     {
       int i;
       
       for (i = 0; i < mx->n_factors; i++)
-	if (factor_values[i] != wr_current->factors[i])
+	if (factor_values[i] != wr->current->factors[i])
 	  goto cache_miss;
       goto winnage;
     }
@@ -1861,7 +1781,7 @@ cache_miss:
   {
     struct factor_data *iter;
 
-    for (iter = wr_data; iter; iter = iter->next)
+    for (iter = wr->data; iter; iter = iter->next)
       {
 	int i;
 
@@ -1869,7 +1789,7 @@ cache_miss:
 	  if (factor_values[i] != iter->factors[i])
 	    goto next_item;
 	
-	wr_current = iter;
+	wr->current = iter;
 	goto winnage;
 	
       next_item: ;
@@ -1899,8 +1819,8 @@ cache_miss:
 	}
     }
 
-    new->next = wr_data;
-    wr_data = wr_current = new;
+    new->next = wr->data;
+    wr->data = wr->current = new;
     mx->cells++;
   }
 
@@ -1913,28 +1833,29 @@ lossage:
   return 0;
 }
 
-/* Read the independent variables into wr_current. */
+/* Read the independent variables into wr->current. */
 static int 
-wr_read_indeps (struct matrix_data_pgm *mx)
+wr_read_indeps (struct wr_aux_data *wr)
 {
-  struct factor_data *c = wr_current;
-  const int type = content_type[wr_content];
-  const int n_rows = c->n_rows[wr_content];
+  struct matrix_data_pgm *mx = wr->mx;
+  struct factor_data *c = wr->current;
+  const int type = content_type[wr->content];
+  const int n_rows = c->n_rows[wr->content];
   double *cp;
   int n_cols;
 
   /* Allocate room for data if necessary. */
-  if (c->data[wr_content] == NULL)
+  if (c->data[wr->content] == NULL)
     {
       int n_items = mx->n_continuous;
       if (type == 1)
 	n_items *= mx->n_continuous;
       
-      c->data[wr_content] = pool_alloc (mx->container,
+      c->data[wr->content] = pool_alloc (mx->container,
 					sizeof **c->data * n_items);
     }
 
-  cp = &c->data[wr_content][n_rows * mx->n_continuous];
+  cp = &c->data[wr->content][n_rows * mx->n_continuous];
 
   /* Figure out how much to read from this line. */
   switch (type)
@@ -1944,7 +1865,7 @@ wr_read_indeps (struct matrix_data_pgm *mx)
       if (n_rows > 0)
 	{
 	  msg (SE, _("Duplicate specification for %s."),
-	       content_names[wr_content]);
+	       content_names[wr->content]);
 	  return 0;
 	}
       if (type == 0)
@@ -1956,7 +1877,7 @@ wr_read_indeps (struct matrix_data_pgm *mx)
       if (n_rows >= mx->n_continuous - (mx->section != FULL && mx->diag == NODIAGONAL))
 	{
 	  msg (SE, _("Too many rows of matrix data for %s."),
-	       content_names[wr_content]);
+	       content_names[wr->content]);
 	  return 0;
 	}
       
@@ -1981,12 +1902,14 @@ wr_read_indeps (struct matrix_data_pgm *mx)
 	  break;
 	default:
 	  assert (0);
+          abort ();
 	}
       break;
     default:
       assert (0);
+      abort ();
     }
-  c->n_rows[wr_content]++;
+  c->n_rows[wr->content]++;
 
   debug_printf ((" (c=%p,r=%d,n=%d)", c, n_rows + 1, n_cols));
 
@@ -2010,7 +1933,7 @@ wr_read_indeps (struct matrix_data_pgm *mx)
 	*cp++ = token.number;
       }
     if (mx->fmt != FREE
-        && !force_eol (mx->data_file, content_names[wr_content]))
+        && !force_eol (mx->data_file, content_names[wr->content]))
       return 0;
     debug_printf (("\n"));
   }
@@ -2023,6 +1946,7 @@ wr_read_indeps (struct matrix_data_pgm *mx)
 static const struct case_source_class matrix_data_with_rowtype_source_class = 
   {
     "MATRIX DATA",
+    NULL,
     matrix_data_read_with_rowtype,
     NULL,
   };
@@ -2031,6 +1955,7 @@ static const struct case_source_class
 matrix_data_without_rowtype_source_class =
   {
     "MATRIX DATA",
+    NULL,
     matrix_data_read_without_rowtype,
     NULL,
   };