X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmissing-values.c;h=d5bbf108832dc747fa6a9aec418898ac260bcea0;hb=2da08e801be698df268f35ac6e21cc8a345ba1fb;hp=99018c3f4fe381ded138ccc0add09aa89df6cd51;hpb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;p=pspp-builds.git

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 99018c3f..d5bbf108 100644
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,34 +1,32 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    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
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
 #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>
 #include <language/lexer/variable-parser.h>
 #include <language/lexer/range-parser.h>
-#include <libpspp/magic.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
@@ -49,7 +47,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, '('))
@@ -61,7 +59,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
       for (i = 0; i < nv; i++)
         var_clear_missing_values (v[i]);
 
-      if (!lex_match (lexer, ')')) 
+      if (!lex_match (lexer, ')'))
         {
           struct missing_values mv;
 
@@ -76,7 +74,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
                 goto done;
               }
 
-          if (var_is_numeric (v[0])) 
+          if (var_is_numeric (v[0]))
             {
               mv_init (&mv, 0);
               while (!lex_match (lexer, ')'))
@@ -87,32 +85,32 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
 
                   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));
+                        : mv_add_range (&mv, x, y));
                   if (!ok)
                     deferred_errors = true;
 
                   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 "
@@ -130,23 +128,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, var_get_width (v[i]))) 
+              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."),
                        var_get_width (v[i]));
                   deferred_errors = true;
                 }
-              else 
-                {
-                  struct missing_values tmp;
-                  mv_copy (&tmp, &mv);
-                  mv_resize (&tmp, var_get_width (v[i]));
-                  var_set_missing_values (v[i], &tmp);
-                }
             }
         }
 
@@ -155,7 +148,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
       v = NULL;
     }
   retval = lex_end_of_command (lexer);
-  
+
  done:
   free (v);
   if (deferred_errors)