projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct name of function fn_is_special. Thanks to John McCabe-Dansted
[pspp]
/
src
/
language
/
dictionary
/
numeric.c
diff --git
a/src/language/dictionary/numeric.c
b/src/language/dictionary/numeric.c
index 9d94cf3f7e45350ae49b3e4092d7e0c7f350d359..0cf08ae53770a18dba7fe21a1be940f0cd28033f 100644
(file)
--- a/
src/language/dictionary/numeric.c
+++ b/
src/language/dictionary/numeric.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+ Copyright (C) 1997-9, 2000, 2006 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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-18,21
+17,26
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <stdlib.h>
#include <stdlib.h>
-#include <language/command.h>
+
#include <data/dictionary.h>
#include <data/dictionary.h>
-#include <libpspp/message.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.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 <libpspp/str.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
/* Parses the NUMERIC command. */
int
#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;
{
size_t i;
@@
-46,22
+50,23
@@
cmd_numeric (void)
do
{
do
{
- if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
+ if (!parse_DATA_LIST_vars (
lexer,
&v, &nv, PV_NONE))
return CMD_FAILURE;
/* Get the optional format specification. */
return CMD_FAILURE;
/* Get the optional format specification. */
- if (lex_match ('('))
+ if (lex_match (
lexer,
'('))
{
{
- if (!parse_format_specifier (
&f, 0
))
+ if (!parse_format_specifier (
lexer, &f
))
goto fail;
goto fail;
- if (f
ormats[f.type].cat & FCAT_STRING
)
+ if (f
mt_is_string (f.type)
)
{
{
+ char str[FMT_STRING_LEN_MAX + 1];
msg (SE, _("Format type %s may not be used with a numeric "
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;
}
goto fail;
}
- if (!lex_match (')'))
+ if (!lex_match (
lexer,
')'))
{
msg (SE, _("`)' expected after output format."));
goto fail;
{
msg (SE, _("`)' expected after output format."));
goto fail;
@@
-73,13
+78,13
@@
cmd_numeric (void)
/* Create each variable. */
for (i = 0; i < nv; i++)
{
/* Create each variable. */
for (i = 0; i < nv; i++)
{
- struct variable *new_var = dict_create_var (d
efault_dict
, v[i], 0);
+ struct variable *new_var = dict_create_var (d
ataset_dict (ds)
, v[i], 0);
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
{
if (f.type != -1)
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)
;
}
}
}
}
@@
-88,9
+93,9
@@
cmd_numeric (void)
free (v[i]);
free (v);
}
free (v[i]);
free (v);
}
- while (lex_match ('/'));
+ while (lex_match (
lexer,
'/'));
- 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. */
/* If we have an error at a point where cleanup is required,
flow-of-control comes here. */
@@
-103,7
+108,7
@@
fail:
/* Parses the STRING command. */
int
/* Parses the STRING command. */
int
-cmd_string (
void
)
+cmd_string (
struct lexer *lexer, struct dataset *ds
)
{
size_t i;
{
size_t i;
@@
-119,47
+124,34
@@
cmd_string (void)
do
{
do
{
- if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
+ if (!parse_DATA_LIST_vars (
lexer,
&v, &nv, PV_NONE))
return CMD_FAILURE;
return CMD_FAILURE;
- if (!lex_force_match ('(')
- || !parse_format_specifier (&f, 0))
+ if (!lex_force_match (lexer, '(')
+ || !parse_format_specifier (lexer, &f)
+ || !lex_force_match (lexer, ')'))
goto fail;
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 "
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;
}
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:
- assert (0);
- abort ();
- }
+ width = fmt_var_width (&f);
/* Create each variable. */
for (i = 0; i < nv; i++)
{
/* Create each variable. */
for (i = 0; i < nv; i++)
{
- struct variable *new_var = dict_create_var (d
efault_dict
, v[i],
+ struct variable *new_var = dict_create_var (d
ataset_dict (ds)
, v[i],
width);
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
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. */
}
/* Clean up. */
@@
-167,9
+159,9
@@
cmd_string (void)
free (v[i]);
free (v);
}
free (v[i]);
free (v);
}
- while (lex_match ('/'));
+ while (lex_match (
lexer,
'/'));
- 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. */
/* If we have an error at a point where cleanup is required,
flow-of-control comes here. */
@@
-182,18
+174,18
@@
fail:
/* Parses the LEAVE command. */
int
/* 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;
{
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++)
return CMD_CASCADING_FAILURE;
for (i = 0; i < nv; i++)
- v
[i]->leave = true
;
+ v
ar_set_leave (v[i], true)
;
free (v);
free (v);
- return lex_end_of_command ();
+ return lex_end_of_command (
lexer
);
}
}