X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=98fadb2a56b45b267a9100083100ccfe11634e82;hb=e76e1da37d8bd803dd085a36f978b9c012fbc700;hp=83df065b99728e58745ffc72b08742a562b62e55;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index 83df065b99..98fadb2a56 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, 2011, 2013 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,24 +19,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/dataset.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 "minmax.h" -#include "xalloc.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. - It affects nothing but GUIs -*/ int cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) { @@ -45,93 +41,77 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) struct variable **v; size_t nv; - size_t i; - enum alignment align; - if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match (lexer, '(') ) - { - if ( lex_match_id (lexer, "LEFT")) - align = ALIGN_LEFT; - else if ( lex_match_id (lexer, "RIGHT")) - align = ALIGN_RIGHT; - else if ( lex_match_id (lexer, "CENTER")) - align = ALIGN_CENTRE; - else - { - free (v); - return CMD_FAILURE; - } - - lex_force_match (lexer, ')'); - } + if (!lex_force_match (lexer, T_LPAREN)) + goto error; + + enum alignment align; + if (lex_match_id (lexer, "LEFT")) + align = ALIGN_LEFT; + else if (lex_match_id (lexer, "RIGHT")) + align = ALIGN_RIGHT; + else if (lex_match_id (lexer, "CENTER")) + align = ALIGN_CENTRE; else { - free (v); - return CMD_FAILURE; + lex_error_expecting (lexer, "LEFT", "RIGHT", "CENTER"); + goto error; } - for( i = 0 ; i < nv ; ++i ) + if (!lex_force_match (lexer, T_RPAREN)) + goto error; + + for (size_t 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); + continue; + error: + free (v); + return CMD_FAILURE; } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); return CMD_SUCCESS; } -/* Set variables' display width. - This is the width for GUI display only. - It affects nothing but GUIs -*/ int 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, '(') || !lex_force_int (lexer)) - { - free (v); - return CMD_FAILURE; - } - width = lex_integer (lexer); + if (!lex_force_match (lexer, T_LPAREN) + || !lex_force_int_range (lexer, NULL, 1, INT_MAX)) + goto error; + long width = lex_integer (lexer); lex_get (lexer); - if (!lex_force_match (lexer, ')')) - { - free (v); - return CMD_FAILURE; - } + if (!lex_force_match (lexer, T_RPAREN)) + goto error; - 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 ) + for (size_t 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); + continue; + error: + free (v); + return CMD_FAILURE; } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); return CMD_SUCCESS; } @@ -143,43 +123,84 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds) { struct variable **v; size_t nv; - enum measure level; - size_t i; if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match (lexer, '(') ) - { - if ( lex_match_id (lexer, "SCALE")) - level = MEASURE_SCALE; - else if ( lex_match_id (lexer, "ORDINAL")) - level = MEASURE_ORDINAL; - else if ( lex_match_id (lexer, "NOMINAL")) - level = MEASURE_NOMINAL; - else - { - free (v); - return CMD_FAILURE; - } - - lex_force_match (lexer, ')'); - } + if (!lex_force_match (lexer, T_LPAREN)) + goto error; + + enum measure level; + if (lex_match_id (lexer, "SCALE")) + level = MEASURE_SCALE; + else if (lex_match_id (lexer, "ORDINAL")) + level = MEASURE_ORDINAL; + else if (lex_match_id (lexer, "NOMINAL")) + level = MEASURE_NOMINAL; else { - free (v); - return CMD_FAILURE; + lex_error_expecting (lexer, "SCALE", "ORDINAL", "NOMINAL"); + goto error; } - for( i = 0 ; i < nv ; ++i ) - var_set_measure (v[i], level); + if (!lex_force_match (lexer, T_RPAREN)) + goto error; + for (size_t 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); + continue; + error: + free (v); + return CMD_FAILURE; + } + while (lex_token (lexer) != T_ENDCMD); + return CMD_SUCCESS; +} + +int +cmd_variable_role (struct lexer *lexer, struct dataset *ds) +{ + do + { + if (!lex_force_match (lexer, T_SLASH)) + return CMD_FAILURE; + + enum var_role role; + if (lex_match_id (lexer, "INPUT")) + role = ROLE_INPUT; + else if (lex_match_id (lexer, "TARGET")) + role = ROLE_TARGET; + else if (lex_match_id (lexer, "BOTH")) + role = ROLE_BOTH; + else if (lex_match_id (lexer, "NONE")) + role = ROLE_NONE; + else if (lex_match_id (lexer, "PARTITION")) + role = ROLE_PARTITION; + else if (lex_match_id (lexer, "SPLIT")) + role = ROLE_SPLIT; + else + { + lex_error_expecting (lexer, "INPUT", "TARGET", "BOTH", + "NONE", "PARTITION", "SPLIT"); + return CMD_FAILURE; + } + + struct variable **v; + size_t nv; + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) + return CMD_FAILURE; + + for (size_t i = 0; i < nv; i++) + var_set_role (v[i], role); + + free (v); } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); + return CMD_SUCCESS; }