X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=461648557a05eaf017ffd1e67f8280c0a99fd3e6;hb=339f1956cc72;hp=cf3bad79449adf25cebccfb2830e61d075fc07c2;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index cf3bad7944..461648557a 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,14 +19,19 @@ #include #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 "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. @@ -46,13 +51,13 @@ 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")) + if (lex_match_id (lexer, "LEFT")) align = ALIGN_LEFT; - else if ( lex_match_id (lexer, "RIGHT")) + else if (lex_match_id (lexer, "RIGHT")) align = ALIGN_RIGHT; - else if ( lex_match_id (lexer, "CENTER")) + else if (lex_match_id (lexer, "CENTER")) align = ALIGN_CENTRE; else { @@ -60,7 +65,8 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - lex_force_match (lexer, ')'); + if (!lex_force_match (lexer, T_RPAREN)) + return CMD_FAILURE; } else { @@ -68,15 +74,15 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - for( i = 0 ; i < nv ; ++i ) + 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 +96,38 @@ 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_range (lexer, NULL, 1, INT_MAX)) + { + free (v); + return CMD_FAILURE; + } + width = lex_integer (lexer); + lex_get (lexer); + if (!lex_force_match (lexer, T_RPAREN)) + { + free (v); + return CMD_FAILURE; + } - for( i = 0 ; i < nv ; ++i ) - var_set_display_width (v[i], lex_integer (lexer)); + width = MIN (width, 2 * MAX_STRING); - while (lex_token (lexer) == '/') + for(i = 0 ; i < nv ; ++i) + var_set_display_width (v[i], width); + + 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,13 +145,13 @@ 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")) + if (lex_match_id (lexer, "SCALE")) level = MEASURE_SCALE; - else if ( lex_match_id (lexer, "ORDINAL")) + else if (lex_match_id (lexer, "ORDINAL")) level = MEASURE_ORDINAL; - else if ( lex_match_id (lexer, "NOMINAL")) + else if (lex_match_id (lexer, "NOMINAL")) level = MEASURE_NOMINAL; else { @@ -145,7 +159,8 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - lex_force_match (lexer, ')'); + if (!lex_force_match (lexer, T_RPAREN)) + return CMD_FAILURE; } else { @@ -153,15 +168,55 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - for( i = 0 ; i < nv ; ++i ) + 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; +} + +/* Set variables' role */ +int +cmd_variable_role (struct lexer *lexer, struct dataset *ds) +{ + while (lex_match (lexer, T_SLASH)) + { + struct variable **v; + size_t nv; + enum var_role role; + size_t i; + + 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 (lexer, NULL); + return CMD_FAILURE; + } + + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) + return CMD_FAILURE; + + for (i = 0; i < nv; i++) + var_set_role (v[i], role); + free (v); + } + return CMD_SUCCESS; }