X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fformats.c;h=817cdbd6d922cd03dc401a073214116cf8f9ec32;hb=a049ee0f979beac54c06e05c568539eebdb77a5f;hp=a90f46e8b8efe6f4e4ce9f7efa9ca2b27572f450;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index a90f46e8b8..817cdbd6d9 100644
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* 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
@@ -22,15 +20,16 @@
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "data/dataset.h"
+#include "data/format.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -68,37 +67,34 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
struct variable **v;
size_t cv;
- /* Format to set the variables to. */
- struct fmt_spec f;
-
- /* Numeric or string. */
- int type;
-
- /* Counter. */
- size_t i;
-
for (;;)
{
- if (lex_token (lexer) == '.')
+ struct fmt_spec f;
+ int width;
+ size_t i;
+
+ lex_match (lexer, T_SLASH);
+
+ if (lex_token (lexer) == T_ENDCMD)
break;
- if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_SAME_WIDTH))
return CMD_FAILURE;
- type = var_get_type (v[0]);
+ width = var_get_width (v[0]);
- if (!lex_match (lexer, '('))
+ if (!lex_match (lexer, T_LPAREN))
{
- msg (SE, _("`(' expected after variable list."));
+ lex_error_expecting (lexer, "`('");
goto fail;
}
if (!parse_format_specifier (lexer, &f)
|| !fmt_check_output (&f)
- || !fmt_check_type_compat (&f, VAR_NUMERIC))
+ || !fmt_check_width_compat (&f, width))
goto fail;
- if (!lex_match (lexer, ')'))
+ if (!lex_match (lexer, T_RPAREN))
{
- msg (SE, _("`)' expected after output format."));
+ lex_error_expecting (lexer, "`)'");
goto fail;
}