X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=8351ff613d69155a05fe816028d983260a7c48d2;hb=691c25e36fd1ee722dd35419d6110e3876b99f9c;hp=cf3bad79449adf25cebccfb2830e61d075fc07c2;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index cf3bad79..8351ff61 100644
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.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, 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,10 +24,15 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "minmax.h"
+#include "xalloc.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Set variables' alignment
    This is the alignment for GUI display only.
    It affects nothing but GUIs
@@ -46,7 +51,7 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if ( lex_force_match (lexer, '(') )
+      if ( lex_force_match (lexer, T_LPAREN) )
 	{
 	  if ( lex_match_id (lexer, "LEFT"))
 	    align = ALIGN_LEFT;
@@ -60,7 +65,7 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
               return CMD_FAILURE;
             }
 
-	  lex_force_match (lexer, ')');
+	  lex_force_match (lexer, T_RPAREN);
 	}
       else
         {
@@ -71,12 +76,12 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
       for( i = 0 ; i < nv ; ++i )
         var_set_alignment (v[i], align);
 
-      while (lex_token (lexer) == '/')
+      while (lex_token (lexer) == T_SLASH)
 	lex_get (lexer);
       free (v);
 
     }
-  while (lex_token (lexer) != '.');
+  while (lex_token (lexer) != T_ENDCMD);
   return CMD_SUCCESS;
 }
 
@@ -90,30 +95,43 @@ cmd_variable_width (struct lexer *lexer, struct dataset *ds)
   do
     {
       struct variable **v;
+      long int width;
       size_t nv;
       size_t i;
 
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if ( lex_force_match (lexer, '(') )
-	{
-	  if ( lex_force_int (lexer))
-	    lex_get (lexer);
-	  else
-	    return CMD_FAILURE;
-	  lex_force_match (lexer, ')');
-	}
+      if (!lex_force_match (lexer, T_LPAREN) || !lex_force_int (lexer))
+        {
+          free (v);
+          return CMD_FAILURE;
+        }
+      width = lex_integer (lexer);
+      lex_get (lexer);
+      if (!lex_force_match (lexer, T_RPAREN))
+        {
+          free (v);
+          return CMD_FAILURE;
+        }
+
+      if (width < 0)
+        {
+          msg (SE, _("Variable display width must be a positive integer."));
+          free (v);
+          return CMD_FAILURE;
+        }
+      width = MIN (width, 2 * MAX_STRING);
 
       for( i = 0 ; i < nv ; ++i )
-        var_set_display_width (v[i], lex_integer (lexer));
+        var_set_display_width (v[i], width);
 
-      while (lex_token (lexer) == '/')
+      while (lex_token (lexer) == T_SLASH)
 	lex_get (lexer);
       free (v);
 
     }
-  while (lex_token (lexer) != '.');
+  while (lex_token (lexer) != T_ENDCMD);
   return CMD_SUCCESS;
 }
 
@@ -131,7 +149,7 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if ( lex_force_match (lexer, '(') )
+      if ( lex_force_match (lexer, T_LPAREN) )
 	{
 	  if ( lex_match_id (lexer, "SCALE"))
 	    level = MEASURE_SCALE;
@@ -145,7 +163,7 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
               return CMD_FAILURE;
             }
 
-	  lex_force_match (lexer, ')');
+	  lex_force_match (lexer, T_RPAREN);
 	}
       else
         {
@@ -157,11 +175,11 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
 	var_set_measure (v[i], level);
 
 
-      while (lex_token (lexer) == '/')
+      while (lex_token (lexer) == T_SLASH)
 	lex_get (lexer);
       free (v);
 
     }
-  while (lex_token (lexer) != '.');
+  while (lex_token (lexer) != T_ENDCMD);
   return CMD_SUCCESS;
 }