X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=83df065b99728e58745ffc72b08742a562b62e55;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=13285918263d872d56d2e5a81e0828fd664be6f8;hpb=164d1274fcb70c54897f2a03fc7c27152ed4821a;p=pspp-builds.git
diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 13285918..83df065b 100644
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 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 . */
#include
@@ -26,10 +24,15 @@
#include
#include
#include
-#include
#include
#include
+#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
@@ -48,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, '(') )
{
if ( lex_match_id (lexer, "LEFT"))
align = ALIGN_LEFT;
@@ -56,18 +59,18 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
align = ALIGN_RIGHT;
else if ( lex_match_id (lexer, "CENTER"))
align = ALIGN_CENTRE;
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
lex_force_match (lexer, ')');
}
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
for( i = 0 ; i < nv ; ++i )
@@ -92,23 +95,36 @@ 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, '(') || !lex_force_int (lexer))
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
+ width = lex_integer (lexer);
+ lex_get (lexer);
+ if (!lex_force_match (lexer, ')'))
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
- for( i = 0 ; i < nv ; ++i )
- var_set_display_width (v[i], lex_integer (lexer));
+ 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], width);
while (lex_token (lexer) == '/')
lex_get (lexer);
@@ -133,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, '(') )
{
if ( lex_match_id (lexer, "SCALE"))
level = MEASURE_SCALE;
@@ -141,10 +157,10 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
level = MEASURE_ORDINAL;
else if ( lex_match_id (lexer, "NOMINAL"))
level = MEASURE_NOMINAL;
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
lex_force_match (lexer, ')');
@@ -152,10 +168,10 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
-
- for( i = 0 ; i < nv ; ++i )
+
+ for( i = 0 ; i < nv ; ++i )
var_set_measure (v[i], level);