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

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 4610ab286c..912c58cf5a 100644
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
 
-   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>
 
@@ -25,11 +23,11 @@
 #include <data/procedure.h>
 #include <data/value.h>
 #include <data/variable.h>
+#include <data/format.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/value-parser.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>
@@ -40,7 +38,7 @@
 int
 cmd_missing_values (struct lexer *lexer, struct dataset *ds)
 {
-  struct variable **v;
+  struct variable **v = NULL;
   size_t nv;
 
   int retval = CMD_FAILURE;
@@ -53,11 +51,8 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         goto done;
 
-      if (!lex_match (lexer, '('))
-        {
-          lex_error (lexer, _("expecting `('"));
-          goto done;
-        }
+      if (!lex_force_match (lexer, '('))
+        goto done;
 
       for (i = 0; i < nv; i++)
         var_clear_missing_values (v[i]);
@@ -91,7 +86,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
 
                   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;
 
@@ -100,32 +95,31 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
             }
           else
             {
-	      struct string value;
-
-              mv_init (&mv, MAX_SHORT_STRING);
+              mv_init (&mv, MV_MAX_STRING);
               while (!lex_match (lexer, ')'))
                 {
+                  uint8_t value[MV_MAX_STRING];
+                  size_t length;
+
                   if (!lex_force_string (lexer))
                     {
                       deferred_errors = true;
                       break;
                     }
 
-		  ds_init_string (&value, lex_tokstr (lexer));
-
-                  if (ds_length (&value) > MAX_SHORT_STRING)
+                  length = ds_length (lex_tokstr (lexer));
+                  if (length > MV_MAX_STRING)
                     {
-                      ds_truncate (&value, MAX_SHORT_STRING);
-                      msg (SE, _("Truncating missing value to short string "
-                                 "length (%d characters)."),
-                           MAX_SHORT_STRING);
+                      msg (SE, _("Truncating missing value to maximum "
+                                 "acceptable length (%d bytes)."),
+                           MV_MAX_STRING);
+                      length = MV_MAX_STRING;
                     }
-                  else
-                    ds_rpad (&value, MAX_SHORT_STRING, ' ');
+                  memset (value, ' ', MV_MAX_STRING);
+                  memcpy (value, ds_data (lex_tokstr (lexer)), length);
 
-                  if (!mv_add_str (&mv, ds_data (&value)))
+                  if (!mv_add_str (&mv, value))
                     deferred_errors = true;
-		  ds_destroy (&value);
 
                   lex_get (lexer);
                   lex_match (lexer, ',');
@@ -144,6 +138,8 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
                   deferred_errors = true;
                 }
             }
+
+          mv_destroy (&mv);
         }
 
       lex_match (lexer, '/');