X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=8c312ab8cee23ebec567ac3e1a8189285aa80e47;hb=ea026a235eb11c9082696d0bb970096ccc6e48f6;hp=6af0b62c57aa981175253e0f5dd04f2ad10f9640;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 6af0b62c..8c312ab8 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 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
@@ -24,12 +24,13 @@
 #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/alloc.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -37,7 +38,6 @@
 
 static int do_value_labels (struct lexer *,
 			    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);
 
@@ -64,26 +64,24 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
   size_t var_cnt;         /* Number of variables. */
   int parse_err=0;        /* true if error parsing variables */
 
-  lex_match (lexer, '/');
+  lex_match (lexer, T_SLASH);
 
-  while (lex_token (lexer) != '.')
+  while (lex_token (lexer) != T_ENDCMD)
     {
       parse_err = !parse_variables (lexer, dict, &vars, &var_cnt,
-				    PV_SAME_TYPE) ;
+				    PV_SAME_WIDTH);
       if (var_cnt < 1)
 	{
 	  free(vars);
 	  return CMD_FAILURE;
 	}
-      if (!verify_val_labs (vars, var_cnt))
-        goto lossage;
       if (erase)
         erase_labels (vars, var_cnt);
-      while (lex_token (lexer) != '/' && lex_token (lexer) != '.')
+      while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
 	if (!get_label (lexer, vars, var_cnt))
           goto lossage;
 
-      if (lex_token (lexer) != '/')
+      if (lex_token (lexer) != T_SLASH)
 	{
           free (vars);
           break;
@@ -104,27 +102,6 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
   return CMD_FAILURE;
 }
 
-/* Verifies that none of the VAR_CNT variables in VARS are long
-   string variables. */
-static int
-verify_val_labs (struct variable **vars, size_t var_cnt)
-{
-  size_t i;
-
-  for (i = 0; i < var_cnt; i++)
-    {
-      const struct variable *vp = vars[i];
-
-      if (var_is_long_string (vp))
-	{
-	  msg (SE, _("It is not possible to assign value labels to long "
-		     "string variables such as %s."), var_get_name (vp));
-	  return 0;
-	}
-    }
-  return 1;
-}
-
 /* Erases all the labels for the VAR_CNT variables in VARS. */
 static void
 erase_labels (struct variable **vars, size_t var_cnt)
@@ -144,55 +121,46 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
   /* Parse all the labels and add them to the variables. */
   do
     {
+      enum { MAX_LABEL_LEN = 255 };
+      int width = var_get_width (vars[0]);
       union value value;
       struct string label;
       size_t i;
 
       /* Set value. */
-      if (var_is_alpha (vars[0]))
-	{
-	  if (lex_token (lexer) != T_STRING)
-	    {
-              lex_error (lexer, _("expecting string"));
-	      return 0;
-	    }
-	  buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_cstr (lex_tokstr (lexer)));
-	}
-      else
-	{
-	  if (!lex_is_number (lexer))
-	    {
-	      lex_error (lexer, _("expecting integer"));
-	      return 0;
-	    }
-	  if (!lex_is_integer (lexer))
-	    msg (SW, _("Value label `%g' is not integer."), lex_tokval (lexer));
-	  value.f = lex_tokval (lexer);
-	}
-      lex_get (lexer);
-      lex_match (lexer, ',');
+      value_init (&value, width);
+      if (!parse_value (lexer, &value, width))
+        {
+          value_destroy (&value, width);
+          return 0;
+        }
+      lex_match (lexer, T_COMMA);
 
       /* Set label. */
-      if (!lex_force_string (lexer))
-	return 0;
+      if (lex_token (lexer) != T_ID && !lex_force_string (lexer))
+        {
+          value_destroy (&value, width);
+          return 0;
+        }
 
-      ds_init_string (&label, lex_tokstr (lexer));
+      ds_init_substring (&label, lex_tokss (lexer));
 
-      if (ds_length (&label) > 60)
+      if (ds_length (&label) > MAX_LABEL_LEN)
 	{
-	  msg (SW, _("Truncating value label to 60 characters."));
-	  ds_truncate (&label, 60);
+	  msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN);
+	  ds_truncate (&label, MAX_LABEL_LEN);
 	}
 
       for (i = 0; i < var_cnt; i++)
         var_replace_value_label (vars[i], &value, ds_cstr (&label));
 
       ds_destroy (&label);
+      value_destroy (&value, width);
 
       lex_get (lexer);
-      lex_match (lexer, ',');
+      lex_match (lexer, T_COMMA);
     }
-  while (lex_token (lexer) != '/' && lex_token (lexer) != '.');
+  while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD);
 
   return 1;
 }