X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=9068290b7dda666495f24c1fe4499e7f7f28d9cf;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=5e3ea11f24654d0af73ff4cc1113123134bca00b;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 5e3ea11f..9068290b 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, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 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
@@ -19,18 +19,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/value-labels.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/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/procedure.h"
+#include "data/value-labels.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/message.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -65,9 +64,9 @@ 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_WIDTH);
@@ -78,11 +77,11 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
 	}
       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;
@@ -122,6 +121,7 @@ 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;
@@ -134,7 +134,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
           value_destroy (&value, width);
           return 0;
         }
-      lex_match (lexer, ',');
+      lex_match (lexer, T_COMMA);
 
       /* Set label. */
       if (lex_token (lexer) != T_ID && !lex_force_string (lexer))
@@ -143,12 +143,12 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
           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++)
@@ -158,9 +158,9 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
       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;
 }