Changed a lot of non-const pointers to const.

[pspp-builds.git] / src / language / dictionary / value-labels.c

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 12948e28ee0328a33d50cb2d7016245374390834..a1585a8a906c94e99a7499b5282055541aaef638 100644 (file)
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 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
@@ -39,7 +38,7 @@
 /* Declarations. */
 
 static int do_value_labels (struct lexer *, 
-                           const struct dictionary *dict, int);
+                           const struct dictionary *dict, bool);
 static int verify_val_labs (struct variable **vars, size_t var_cnt);
 static void erase_labels (struct variable **vars, size_t var_cnt);
 static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
@@ -49,19 +48,19 @@ static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
 int
 cmd_value_labels (struct lexer *lexer, struct dataset *ds)
 {
-  return do_value_labels (lexer, dataset_dict (ds), 1);
+  return do_value_labels (lexer, dataset_dict (ds), true);
 }
 
 int
 cmd_add_value_labels (struct lexer *lexer, struct dataset *ds)
 {
-  return do_value_labels (lexer, dataset_dict (ds), 0);
+  return do_value_labels (lexer, dataset_dict (ds), false);
 }
 \f
 /* Do it. */
 
 static int
-do_value_labels (struct lexer *lexer, const struct dictionary *dict, int erase)
+do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
 {
   struct variable **vars; /* Variable list. */
   size_t var_cnt;         /* Number of variables. */
@@ -116,12 +115,12 @@ verify_val_labs (struct variable **vars, size_t var_cnt)
 
   for (i = 0; i < var_cnt; i++)
     {
-      struct variable *vp = vars[i];
+      const struct variable *vp = vars[i];
 
-      if (vp->type == ALPHA && vp->width > MAX_SHORT_STRING)
+      if (var_is_long_string (vp))
        {
          msg (SE, _("It is not possible to assign value labels to long "
-                    "string variables such as %s."), vp->name);
+                    "string variables such as %s."), var_get_name (vp));
          return 0;
        }
     }
@@ -136,7 +135,7 @@ erase_labels (struct variable **vars, size_t var_cnt)
 
   /* Erase old value labels if desired. */
   for (i = 0; i < var_cnt; i++)
-    val_labs_clear (vars[i]->val_labs);
+    var_clear_value_labels (vars[i]);
 }
 
 /* Parse all the labels for the VAR_CNT variables in VARS and add
@@ -152,7 +151,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
       size_t i;
 
       /* Set value. */
-      if (vars[0]->type == ALPHA)
+      if (var_is_alpha (vars[0]))
        {
          if (lex_token (lexer) != T_STRING)
            {
@@ -173,6 +172,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
          value.f = lex_tokval (lexer);
        }
       lex_get (lexer);
+      lex_match (lexer, ',');
 
       /* Set label. */
       if (!lex_force_string (lexer))
@@ -187,11 +187,12 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
        }
 
       for (i = 0; i < var_cnt; i++)
-        val_labs_replace (vars[i]->val_labs, value, ds_cstr (&label));
+        var_replace_value_label (vars[i], &value, ds_cstr (&label));
 
       ds_destroy (&label);
 
       lex_get (lexer);
+      lex_match (lexer, ',');
     }
   while (lex_token (lexer) != '/' && lex_token (lexer) != '.');