X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmatrix-data.c;h=e90b2ac68e8ea818ca2f4d4c9384a9c1fc44f83b;hb=897a260ef7a8b954d56698cc40241a3197127505;hp=a699738ddb04ce8ddbc38d847e371f60fed306bd;hpb=b321086267ad1014dc5d09886396cde30f094437;p=pspp

diff --git a/src/matrix-data.c b/src/matrix-data.c
index a699738ddb..e90b2ac68e 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"
@@ -38,6 +38,9 @@
 #include "var.h"
 #include "vfm.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "debug-print.h"
 
 /* FIXME: /N subcommand not implemented.  It should be pretty simple,
@@ -218,7 +221,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 +239,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 +309,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 +398,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 +417,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 +672,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;
@@ -767,7 +771,7 @@ context (struct dfm_reader *reader)
     strcpy (buf, "at end of file");
   else 
     {
-      struct len_string line;
+      struct fixed_string line;
       const char *sp;
       
       dfm_get_record (reader, &line);
@@ -801,7 +805,7 @@ another_token (struct dfm_reader *reader)
 {
   for (;;)
     {
-      struct len_string line;
+      struct fixed_string line;
       const char *cp;
       
       if (dfm_eof (reader))
@@ -826,7 +830,7 @@ another_token (struct dfm_reader *reader)
 static int
 (mget_token) (struct matrix_token *token, struct dfm_reader *reader)
 {
-  struct len_string line;
+  struct fixed_string line;
   int first_column;
   char *cp;
 
@@ -883,9 +887,7 @@ static int
 	  di.e = token->string + token->length;
 	  di.v = (union value *) &token->number;
 	  di.f1 = first_column;
-	  di.format.type = FMT_F;
-	  di.format.w = token->length;
-	  di.format.d = 0;
+	  di.format = make_output_format (FMT_F, token->length, 0);
 
 	  if (!data_in (&di))
 	    return 0;
@@ -904,7 +906,7 @@ static int
 static int
 force_eol (struct dfm_reader *reader, const char *content)
 {
-  struct len_string line;
+  struct fixed_string line;
   const char *cp;
 
   if (dfm_eof (reader))
@@ -963,8 +965,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);
 
@@ -1347,8 +1348,8 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
   int type = content_type[content];
 
   {
-    st_bare_pad_copy (case_data_rw (c, mx->rowtype_->fv)->s,
-		      content_names[content], 8);
+    buf_copy_str_rpad (case_data_rw (c, mx->rowtype_->fv)->s, 8,
+                       content_names[content]);
     
     if (type != 1)
       memset (case_data_rw (c, mx->varname_->fv)->s, ' ', 8);
@@ -1369,10 +1370,9 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp,
 	    cp++;
 	  }
 	if (type == 1)
-	  st_bare_pad_copy (case_data_rw (c, mx->varname_->fv)->s,
-                            dict_get_var (default_dict,
-                                          mx->first_continuous + i)->name,
-			    8);
+	  buf_copy_str_rpad (case_data_rw (c, mx->varname_->fv)->s, 8,
+                             dict_get_var (default_dict,
+                                           mx->first_continuous + i)->name);
 	write_case (wc_data);
       }
   }
@@ -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];
 	}
 	
 	{