X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmissing-values.c;h=a906b8a8f3cacbd889bce5b9be004357e687dc39;hb=2be9bee9da6a2ce27715e58128569594319abfa2;hp=819b0a9021cfe5821b4060e02b9932830b2a6120;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp-builds.git

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 819b0a90..a906b8a8 100644
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 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
@@ -18,19 +18,20 @@
 
 #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 <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 <libpspp/message.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/data-in.h"
+#include "data/dictionary.h"
+#include "data/dataset.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -38,29 +39,26 @@
 int
 cmd_missing_values (struct lexer *lexer, struct dataset *ds)
 {
-  struct variable **v;
+  struct dictionary *dict = dataset_dict (ds);
+  struct variable **v = NULL;
   size_t nv;
 
-  int retval = CMD_FAILURE;
-  bool deferred_errors = false;
+  bool ok = true;
 
-  while (lex_token (lexer) != '.')
+  while (lex_token (lexer) != T_ENDCMD)
     {
       size_t i;
 
-      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
-        goto done;
+      if (!parse_variables (lexer, dict, &v, &nv, PV_NONE))
+        goto error;
 
-      if (!lex_match (lexer, '('))
-        {
-          lex_error (lexer, _("expecting `('"));
-          goto done;
-        }
+      if (!lex_force_match (lexer, T_LPAREN))
+        goto error;
 
       for (i = 0; i < nv; i++)
         var_clear_missing_values (v[i]);
 
-      if (!lex_match (lexer, ')'))
+      if (!lex_match (lexer, T_RPAREN))
         {
           struct missing_values mv;
 
@@ -72,60 +70,66 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
                 msg (SE, _("Cannot mix numeric variables (e.g. %s) and "
                            "string variables (e.g. %s) within a single list."),
                      var_get_name (n), var_get_name (s));
-                goto done;
+                goto error;
               }
 
           if (var_is_numeric (v[0]))
             {
               mv_init (&mv, 0);
-              while (!lex_match (lexer, ')'))
+              while (!lex_match (lexer, T_RPAREN))
                 {
                   enum fmt_type type = var_get_print_format (v[0])->type;
                   double x, y;
                   bool ok;
 
                   if (!parse_num_range (lexer, &x, &y, &type))
-                    goto done;
+                    goto error;
 
                   ok = (x == y
                         ? mv_add_num (&mv, x)
                         : mv_add_range (&mv, x, y));
                   if (!ok)
-                    deferred_errors = true;
+                    ok = false;
 
-                  lex_match (lexer, ',');
+                  lex_match (lexer, T_COMMA);
                 }
             }
           else
             {
               mv_init (&mv, MV_MAX_STRING);
-              while (!lex_match (lexer, ')'))
+              while (!lex_match (lexer, T_RPAREN))
                 {
                   uint8_t value[MV_MAX_STRING];
+                  char *dict_mv;
                   size_t length;
 
                   if (!lex_force_string (lexer))
                     {
-                      deferred_errors = true;
+                      ok = false;
                       break;
                     }
 
-                  length = ds_length (lex_tokstr (lexer));
+                  dict_mv = recode_string (dict_get_encoding (dict), "UTF-8",
+                                           lex_tokcstr (lexer),
+                                           ss_length (lex_tokss (lexer)));
+                  length = strlen (dict_mv);
                   if (length > MV_MAX_STRING)
                     {
+                      /* XXX truncate graphemes not bytes */
                       msg (SE, _("Truncating missing value to maximum "
                                  "acceptable length (%d bytes)."),
                            MV_MAX_STRING);
                       length = MV_MAX_STRING;
                     }
                   memset (value, ' ', MV_MAX_STRING);
-                  memcpy (value, ds_data (lex_tokstr (lexer)), length);
+                  memcpy (value, dict_mv, length);
+                  free (dict_mv);
 
                   if (!mv_add_str (&mv, value))
-                    deferred_errors = true;
+                    ok = false;
 
                   lex_get (lexer);
-                  lex_match (lexer, ',');
+                  lex_match (lexer, T_COMMA);
                 }
             }
 
@@ -138,23 +142,23 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
                   msg (SE, _("Missing values provided are too long to assign "
                              "to variable of width %d."),
                        var_get_width (v[i]));
-                  deferred_errors = true;
+                  ok = false;
                 }
             }
 
           mv_destroy (&mv);
         }
 
-      lex_match (lexer, '/');
+      lex_match (lexer, T_SLASH);
       free (v);
       v = NULL;
     }
-  retval = lex_end_of_command (lexer);
 
- done:
   free (v);
-  if (deferred_errors)
-    retval = CMD_FAILURE;
-  return retval;
+  return ok ? CMD_SUCCESS : CMD_FAILURE;
+
+error:
+  free (v);
+  return CMD_FAILURE;
 }