X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=25b2ecf8f06719fb43cceb3ba0467448fc17049e;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=71de3d8770ef1bc1e9f5085d96acc534bb641bbd;hpb=8e018d25310cb53e5339b46e95f0abe02db83782;p=pspp-builds.git diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index 71de3d87..25b2ecf8 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -1,43 +1,41 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 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 +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "data/format.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) /* Parses the NUMERIC command. */ int -cmd_numeric (void) +cmd_numeric (struct lexer *lexer, struct dataset *ds) { size_t i; @@ -45,28 +43,33 @@ cmd_numeric (void) char **v; size_t nv; - /* Format spec for variables to create. f.type==-1 if default is to - be used. */ - struct fmt_spec f; - do { - if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE)) + /* Format spec for variables to create. f.type==-1 if default is to + be used. */ + struct fmt_spec f; + + if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE)) return CMD_FAILURE; /* Get the optional format specification. */ - if (lex_match ('(')) + if (lex_match (lexer, T_LPAREN)) { - if (!parse_format_specifier (&f)) + if (!parse_format_specifier (lexer, &f)) goto fail; - if (formats[f.type].cat & FCAT_STRING) + + if ( ! fmt_check_output (&f)) + goto fail; + + if (fmt_is_string (f.type)) { + char str[FMT_STRING_LEN_MAX + 1]; msg (SE, _("Format type %s may not be used with a numeric " - "variable."), fmt_to_string (&f)); + "variable."), fmt_to_string (&f, str)); goto fail; } - if (!lex_match (')')) + if (!lex_match (lexer, T_RPAREN)) { msg (SE, _("`)' expected after output format.")); goto fail; @@ -78,13 +81,13 @@ cmd_numeric (void) /* Create each variable. */ for (i = 0; i < nv; i++) { - struct variable *new_var = dict_create_var (default_dict, v[i], 0); + struct variable *new_var = dict_create_var (dataset_dict (ds), v[i], 0); if (!new_var) msg (SE, _("There is already a variable named %s."), v[i]); else { if (f.type != -1) - new_var->print = new_var->write = f; + var_set_both_formats (new_var, &f); } } @@ -93,9 +96,9 @@ cmd_numeric (void) free (v[i]); free (v); } - while (lex_match ('/')); + while (lex_match (lexer, T_SLASH)); - return lex_end_of_command (); + return lex_end_of_command (lexer); /* If we have an error at a point where cleanup is required, flow-of-control comes here. */ @@ -108,7 +111,7 @@ fail: /* Parses the STRING command. */ int -cmd_string (void) +cmd_string (struct lexer *lexer, struct dataset *ds) { size_t i; @@ -124,45 +127,34 @@ cmd_string (void) do { - if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE)) + if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE)) return CMD_FAILURE; - if (!lex_force_match ('(') || !parse_format_specifier (&f)) + if (!lex_force_match (lexer, T_LPAREN) + || !parse_format_specifier (lexer, &f) + || !lex_force_match (lexer, T_RPAREN)) goto fail; - if (!(formats[f.type].cat & FCAT_STRING)) + if (!fmt_is_string (f.type)) { + char str[FMT_STRING_LEN_MAX + 1]; msg (SE, _("Format type %s may not be used with a string " - "variable."), fmt_to_string (&f)); + "variable."), fmt_to_string (&f, str)); goto fail; } + if (!fmt_check_output (&f)) + goto fail; - if (!lex_match (')')) - { - msg (SE, _("`)' expected after output format.")); - goto fail; - } - - switch (f.type) - { - case FMT_A: - width = f.w; - break; - case FMT_AHEX: - width = f.w / 2; - break; - default: - NOT_REACHED (); - } + width = fmt_var_width (&f); /* Create each variable. */ for (i = 0; i < nv; i++) { - struct variable *new_var = dict_create_var (default_dict, v[i], + struct variable *new_var = dict_create_var (dataset_dict (ds), v[i], width); if (!new_var) msg (SE, _("There is already a variable named %s."), v[i]); else - new_var->print = new_var->write = f; + var_set_both_formats (new_var, &f); } /* Clean up. */ @@ -170,9 +162,9 @@ cmd_string (void) free (v[i]); free (v); } - while (lex_match ('/')); + while (lex_match (lexer, T_SLASH)); - return lex_end_of_command (); + return lex_end_of_command (lexer); /* If we have an error at a point where cleanup is required, flow-of-control comes here. */ @@ -185,18 +177,18 @@ fail: /* Parses the LEAVE command. */ int -cmd_leave (void) +cmd_leave (struct lexer *lexer, struct dataset *ds) { struct variable **v; size_t nv; size_t i; - if (!parse_variables (default_dict, &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_CASCADING_FAILURE; for (i = 0; i < nv; i++) - v[i]->leave = true; + var_set_leave (v[i], true); free (v); - return lex_end_of_command (); + return lex_end_of_command (lexer); }