X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmissing-values.c;h=4610ab286c5b6c6addadb4fb7f1103758afe7837;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=f68369967152f6393f9b22def3ec338950769439;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index f6836996..4610ab28 100644
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -22,7 +21,9 @@
 #include <stdlib.h>
 
 #include <data/data-in.h>
+#include <data/missing-values.h>
 #include <data/procedure.h>
+#include <data/value.h>
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
@@ -49,7 +50,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
     {
       size_t i;
 
-      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) 
+      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         goto done;
 
       if (!lex_match (lexer, '('))
@@ -59,34 +60,35 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
         }
 
       for (i = 0; i < nv; i++)
-        mv_init (&v[i]->miss, v[i]->width);
+        var_clear_missing_values (v[i]);
 
-      if (!lex_match (lexer, ')')) 
+      if (!lex_match (lexer, ')'))
         {
           struct missing_values mv;
 
           for (i = 0; i < nv; i++)
-            if (v[i]->type != v[0]->type)
+            if (var_get_type (v[i]) != var_get_type (v[0]))
               {
-                const struct variable *n = v[0]->type == NUMERIC ? v[0] : v[i];
-                const struct variable *s = v[0]->type == NUMERIC ? v[i] : v[0];
+                const struct variable *n = var_is_numeric (v[0]) ? v[0] : v[i];
+                const struct variable *s = var_is_numeric (v[0]) ? v[i] : v[0];
                 msg (SE, _("Cannot mix numeric variables (e.g. %s) and "
                            "string variables (e.g. %s) within a single list."),
-                     n->name, s->name);
+                     var_get_name (n), var_get_name (s));
                 goto done;
               }
 
-          if (v[0]->type == NUMERIC) 
+          if (var_is_numeric (v[0]))
             {
               mv_init (&mv, 0);
               while (!lex_match (lexer, ')'))
                 {
+                  enum fmt_type type = var_get_print_format (v[0])->type;
                   double x, y;
                   bool ok;
 
-                  if (!parse_num_range (lexer, &x, &y, &v[0]->print))
+                  if (!parse_num_range (lexer, &x, &y, &type))
                     goto done;
-                  
+
                   ok = (x == y
                         ? mv_add_num (&mv, x)
                         : mv_add_num_range (&mv, x, y));
@@ -96,22 +98,22 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
                   lex_match (lexer, ',');
                 }
             }
-          else 
+          else
             {
 	      struct string value;
 
               mv_init (&mv, MAX_SHORT_STRING);
-              while (!lex_match (lexer, ')')) 
+              while (!lex_match (lexer, ')'))
                 {
                   if (!lex_force_string (lexer))
                     {
                       deferred_errors = true;
                       break;
                     }
-		  
+
 		  ds_init_string (&value, lex_tokstr (lexer));
 
-                  if (ds_length (&value) > MAX_SHORT_STRING) 
+                  if (ds_length (&value) > MAX_SHORT_STRING)
                     {
                       ds_truncate (&value, MAX_SHORT_STRING);
                       msg (SE, _("Truncating missing value to short string "
@@ -129,21 +131,18 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
                   lex_match (lexer, ',');
                 }
             }
-          
-          for (i = 0; i < nv; i++) 
+
+          for (i = 0; i < nv; i++)
             {
-              if (!mv_is_resizable (&mv, v[i]->width)) 
+              if (mv_is_resizable (&mv, var_get_width (v[i])))
+                var_set_missing_values (v[i], &mv);
+              else
                 {
                   msg (SE, _("Missing values provided are too long to assign "
                              "to variable of width %d."),
-                       v[i]->width);
+                       var_get_width (v[i]));
                   deferred_errors = true;
                 }
-              else 
-                {
-                  mv_copy (&v[i]->miss, &mv);
-                  mv_resize (&v[i]->miss, v[i]->width);
-                }
             }
         }
 
@@ -152,7 +151,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
       v = NULL;
     }
   retval = lex_end_of_command (lexer);
-  
+
  done:
   free (v);
   if (deferred_errors)