X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=1fa17017e09556c662bf8ab7d0da5a7cd398eb71;hb=5d612c43713291cae1aa473ee3d31786ef6f5b99;hp=13285918263d872d56d2e5a81e0828fd664be6f8;hpb=164d1274fcb70c54897f2a03fc7c27152ed4821a;p=pspp
diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 1328591826..1fa17017e0 100644
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -1,34 +1,37 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 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/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.
@@ -48,37 +51,38 @@ 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
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
- lex_force_match (lexer, ')');
+ if (!lex_force_match (lexer, T_RPAREN))
+ return CMD_FAILURE;
}
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ 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;
}
@@ -92,30 +96,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 )
- var_set_display_width (v[i], lex_integer (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;
}
@@ -133,37 +150,78 @@ 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
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
- lex_force_match (lexer, ')');
+ if (!lex_force_match (lexer, T_RPAREN))
+ return CMD_FAILURE;
}
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);
- 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;
}