X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=4b68f902b0535462c2566748ec2e116d7ca02391;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=e6afcb98f596a547c32716a8d7b6e132ef4a858e;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index e6afcb98..4b68f902 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -1,35 +1,37 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by John Darrington +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 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 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 #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) /* Set variables' alignment This is the alignment for GUI display only. @@ -49,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; @@ -57,30 +59,29 @@ 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, ')'); + lex_force_match (lexer, T_RPAREN); } - else + else { free (v); - return CMD_FAILURE; + return CMD_FAILURE; } - for( i = 0 ; i < nv ; ++i ) - v[i]->alignment = align; - + 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; } @@ -94,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 ) - v[i]->display_width = lex_tokval (lexer); + for( i = 0 ; i < nv ; ++i ) + 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; } @@ -135,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; @@ -143,29 +157,29 @@ 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, ')'); + lex_force_match (lexer, T_RPAREN); } else { free (v); - return CMD_FAILURE; + return CMD_FAILURE; } - - for( i = 0 ; i < nv ; ++i ) - v[i]->measure = level ; + + for( i = 0 ; i < nv ; ++i ) + 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; }