X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmatrix-data.c;h=73d473d177c2f90f8597f2fa73896a5cdf2695f3;hb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;hp=a57680d841e9174f44556361801d10074bd3f836;hpb=d807ad29cc0d3caa4f0e04ee4b75c70a225cfeaf;p=pspp

diff --git a/src/matrix-data.c b/src/matrix-data.c
index a57680d841..73d473d177 100644
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "error.h"
@@ -218,7 +218,7 @@ cmd_matrix_data (void)
 	    int i;
 
 	    for (i = 0; i < nv; i++)
-	      if (!strcmp (v[i], "VARNAME_"))
+	      if (!strcasecmp (v[i], "VARNAME_"))
 		{
 		  msg (SE, _("VARNAME_ cannot be explicitly specified on "
 			     "VARIABLES."));
@@ -236,7 +236,7 @@ cmd_matrix_data (void)
 	      {
 		struct variable *new_var;
 		
-		if (strcmp (v[i], "ROWTYPE_"))
+		if (strcasecmp (v[i], "ROWTYPE_"))
 		  {
 		    new_var = dict_create_var_assert (default_dict, v[i], 0);
                     attach_mxd_aux (new_var, MXD_CONTINUOUS, i);
@@ -306,7 +306,8 @@ cmd_matrix_data (void)
 	  if (dict_lookup_var (default_dict, tokid) == NULL
 	      && (lex_look_ahead () == '.' || lex_look_ahead () == '/'))
 	    {
-	      if (!strcmp (tokid, "ROWTYPE_") || !strcmp (tokid, "VARNAME_"))
+	      if (!strcasecmp (tokid, "ROWTYPE_")
+                  || !strcasecmp (tokid, "VARNAME_"))
 		{
 		  msg (SE, _("Split variable may not be named ROWTYPE_ "
 			     "or VARNAME_."));
@@ -394,7 +395,7 @@ cmd_matrix_data (void)
 	      goto lossage;
 	    }
 
-	  if (!lex_integer_p () || lex_integer () < 1)
+	  if (!lex_is_integer () || lex_integer () < 1)
 	    {
 	      lex_error (_("expecting positive integer"));
 	      goto lossage;
@@ -413,7 +414,7 @@ cmd_matrix_data (void)
 	      goto lossage;
 	    }
 
-	  if (!lex_integer_p () || lex_integer () < 1)
+	  if (!lex_is_integer () || lex_integer () < 1)
 	    {
 	      lex_error (_("expecting positive integer"));
 	      goto lossage;
@@ -668,7 +669,7 @@ string_to_content_type (char *s, int *collide)
     };
 
   for (tp = tab; tp->value != -1; tp++)
-    if (!strcmp (s, tp->string))
+    if (!strcasecmp (s, tp->string))
       {
 	if (collide)
 	  *collide = tp->collide;
@@ -963,8 +964,7 @@ read_matrices_without_rowtype (struct matrix_data_pgm *mx)
   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,
-                                   default_dict, &nr);
+  vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr);
   
   procedure (NULL, NULL);
 
@@ -1495,7 +1495,7 @@ read_matrices_with_rowtype (struct matrix_data_pgm *mx)
   mx->cells = 0;
 
   vfm_source = create_case_source (&matrix_data_with_rowtype_source_class,
-                                   default_dict, &wr);
+                                   &wr);
   procedure (NULL, NULL);
 
   free (wr.split_values);
@@ -1667,11 +1667,8 @@ wr_output_data (struct wr_aux_data *wr,
 	  int factor;
 
 	  for (factor = 0; factor < mx->n_factors; factor++)
-	    {
-	      case_data_rw (c, mx->factors[factor]->fv)->f
-		= iter->factors[factor];
-	      debug_printf (("f:%s ", factors[factor]->name));
-	    }
+            case_data_rw (c, mx->factors[factor]->fv)->f
+              = iter->factors[factor];
 	}
 	
 	{