lexer: Reimplement for better testability and internationalization.

[pspp-builds.git] / src / language / dictionary / variable-label.c

diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c
index 6ddb00a5ef6f8443e9b0e166e179af9fd71a329a..c0f80fbdbeac19a9fbcfac9f915ee57a52dd39bf 100644 (file)
--- a/src/language/dictionary/variable-label.c
+++ b/src/language/dictionary/variable-label.c
@@ -1,40 +1,43 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 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 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 <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
-
 int
-cmd_variable_labels (void)
+cmd_variable_labels (struct lexer *lexer, struct dataset *ds)
 {
+  struct dictionary *dict = dataset_dict (ds);
+  const char *dict_encoding = dict_get_encoding (dict);
+
   do
     {
       struct variable **v;
@@ -42,43 +45,26 @@ cmd_variable_labels (void)
 
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+      if (!parse_variables (lexer, dict, &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
-      if (token != T_STRING)
+      if (!lex_force_string (lexer))
        {
-         msg (SE, _("String expected for variable label."));
          free (v);
-         return CMD_PART_SUCCESS_MAYBE;
-       }
-      if (ds_length (&tokstr) > 255)
-       {
-         msg (SW, _("Truncating variable label to 255 characters."));
-         ds_truncate (&tokstr, 255);
+         return CMD_FAILURE;
        }
+
       for (i = 0; i < nv; i++)
-       {
-         if (v[i]->label)
-           free (v[i]->label);
-         v[i]->label = xstrdup (ds_c_str (&tokstr));
-       }
+        var_set_label (v[i], lex_tokcstr (lexer), dict_encoding, i == 0);
 
-      lex_get ();
-      while (token == '/')
-       lex_get ();
+      lex_get (lexer);
+      while (lex_token (lexer) == T_SLASH)
+       lex_get (lexer);
       free (v);
     }
-  while (token != '.');
+  while (lex_token (lexer) != T_ENDCMD);
   return CMD_SUCCESS;
 }
 
 
 
-const char *
-var_to_string(const struct variable *var)
-{
-  if ( !var ) 
-    return 0;
-
-  return ( var->label ? var->label : var->name);
-}