X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=83df065b99728e58745ffc72b08742a562b62e55;hb=5c3291dc396b795696e94f47780308fd7ace6fc4;hp=fa6eae467f152ac944e691c4a0e29f43776c8ce7;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp-builds.git diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index fa6eae46..83df065b 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by John Darrington - 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 @@ -27,16 +24,21 @@ #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 */ int -cmd_variable_alignment (struct dataset *ds) +cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) { do { @@ -46,41 +48,40 @@ cmd_variable_alignment (struct dataset *ds) size_t i; enum alignment align; - if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match('(') ) + if ( lex_force_match (lexer, '(') ) { - if ( lex_match_id("LEFT")) + if ( lex_match_id (lexer, "LEFT")) align = ALIGN_LEFT; - else if ( lex_match_id("RIGHT")) + else if ( lex_match_id (lexer, "RIGHT")) align = ALIGN_RIGHT; - else if ( lex_match_id("CENTER")) + else if ( lex_match_id (lexer, "CENTER")) align = ALIGN_CENTRE; - else + else { free (v); - return CMD_FAILURE; + return CMD_FAILURE; } - lex_force_match(')'); + lex_force_match (lexer, ')'); } - 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 (token == '/') - lex_get (); + while (lex_token (lexer) == '/') + lex_get (lexer); free (v); } - while (token != '.'); + while (lex_token (lexer) != '.'); return CMD_SUCCESS; } @@ -89,41 +90,54 @@ cmd_variable_alignment (struct dataset *ds) It affects nothing but GUIs */ int -cmd_variable_width (struct dataset *ds) +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 (dataset_dict (ds), &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match('(') ) - { - if ( lex_force_int()) - lex_get(); - else - return CMD_FAILURE; - lex_force_match(')'); - } + 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; + } + + 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 = tokval; + for( i = 0 ; i < nv ; ++i ) + var_set_display_width (v[i], width); - while (token == '/') - lex_get (); + while (lex_token (lexer) == '/') + lex_get (lexer); free (v); } - while (token != '.'); + while (lex_token (lexer) != '.'); return CMD_SUCCESS; } /* Set variables' measurement level */ int -cmd_variable_level (struct dataset *ds) +cmd_variable_level (struct lexer *lexer, struct dataset *ds) { do { @@ -132,40 +146,40 @@ cmd_variable_level (struct dataset *ds) enum measure level; size_t i; - if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match('(') ) + if ( lex_force_match (lexer, '(') ) { - if ( lex_match_id("SCALE")) + if ( lex_match_id (lexer, "SCALE")) level = MEASURE_SCALE; - else if ( lex_match_id("ORDINAL")) + else if ( lex_match_id (lexer, "ORDINAL")) level = MEASURE_ORDINAL; - else if ( lex_match_id("NOMINAL")) + else if ( lex_match_id (lexer, "NOMINAL")) level = MEASURE_NOMINAL; - else + else { free (v); - return CMD_FAILURE; + return CMD_FAILURE; } - lex_force_match(')'); + lex_force_match (lexer, ')'); } 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 (token == '/') - lex_get (); + while (lex_token (lexer) == '/') + lex_get (lexer); free (v); } - while (token != '.'); + while (lex_token (lexer) != '.'); return CMD_SUCCESS; }