projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow RANK grouping variables to be strings. Fixes bug #18533.
[pspp]
/
src
/
language
/
dictionary
/
formats.c
diff --git
a/src/language/dictionary/formats.c
b/src/language/dictionary/formats.c
index d6eb8bfbc1e243d3d6e080cd3812f036b19b1a14..a90f46e8b8efe6f4e4ce9f7efa9ca2b27572f450 100644
(file)
--- a/
src/language/dictionary/formats.c
+++ b/
src/language/dictionary/formats.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,49
+17,52
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
+
+#include <data/procedure.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-#include <l
ibpspp/message
.h>
+#include <l
anguage/lexer/format-parser
.h>
#include <language/lexer/lexer.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 <libpspp/misc.h>
#include <libpspp/str.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include <libpspp/debug-print.h>
-
enum
{
FORMATS_PRINT = 001,
FORMATS_WRITE = 002
};
enum
{
FORMATS_PRINT = 001,
FORMATS_WRITE = 002
};
-static int internal_cmd_formats (int);
+static int internal_cmd_formats (
struct lexer *, struct dataset *ds,
int);
int
int
-cmd_print_formats (
void
)
+cmd_print_formats (
struct lexer *lexer, struct dataset *ds
)
{
{
- return internal_cmd_formats (FORMATS_PRINT);
+ return internal_cmd_formats (
lexer, ds,
FORMATS_PRINT);
}
int
}
int
-cmd_write_formats (
void
)
+cmd_write_formats (
struct lexer *lexer, struct dataset *ds
)
{
{
- return internal_cmd_formats (FORMATS_WRITE);
+ return internal_cmd_formats (
lexer, ds,
FORMATS_WRITE);
}
int
}
int
-cmd_formats (
void
)
+cmd_formats (
struct lexer *lexer, struct dataset *ds
)
{
{
- return internal_cmd_formats (FORMATS_PRINT | FORMATS_WRITE);
+ return internal_cmd_formats (
lexer, ds,
FORMATS_PRINT | FORMATS_WRITE);
}
}
-int
-internal_cmd_formats (int which)
+
static
int
+internal_cmd_formats (
struct lexer *lexer, struct dataset *ds,
int which)
{
/* Variables. */
struct variable **v;
{
/* Variables. */
struct variable **v;
@@
-77,24
+79,24
@@
internal_cmd_formats (int which)
for (;;)
{
for (;;)
{
- if (
token
== '.')
+ if (
lex_token (lexer)
== '.')
break;
break;
- if (!parse_variables (
default_dict
, &v, &cv, PV_NUMERIC))
- return CMD_
PART_SUCCESS_MAYB
E;
- type = v
[0]->type
;
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &cv, PV_NUMERIC))
+ return CMD_
FAILUR
E;
+ type = v
ar_get_type (v[0])
;
- if (!lex_match ('('))
+ if (!lex_match (
lexer,
'('))
{
{
- msg (SE, _("`(' expected after variable list"));
+ msg (SE, _("`(' expected after variable list
.
"));
goto fail;
}
goto fail;
}
- if (!parse_format_specifier (
&f, 0
)
- || !
check_output_specifier (&f, true
)
- || !
check_specifier_type (&f, NUMERIC, true
))
+ if (!parse_format_specifier (
lexer, &f
)
+ || !
fmt_check_output (&f
)
+ || !
fmt_check_type_compat (&f, VAR_NUMERIC
))
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;
@@
-103,9
+105,9
@@
internal_cmd_formats (int which)
for (i = 0; i < cv; i++)
{
if (which & FORMATS_PRINT)
for (i = 0; i < cv; i++)
{
if (which & FORMATS_PRINT)
-
v[i]->print = f
;
+
var_set_print_format (v[i], &f)
;
if (which & FORMATS_WRITE)
if (which & FORMATS_WRITE)
-
v[i]->write = f
;
+
var_set_write_format (v[i], &f)
;
}
free (v);
v = NULL;
}
free (v);
v = NULL;
@@
-114,5
+116,5
@@
internal_cmd_formats (int which)
fail:
free (v);
fail:
free (v);
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
}
}