projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(binary_search): Fix assertion.
[pspp-builds.git]
/
src
/
language
/
dictionary
/
formats.c
diff --git
a/src/language/dictionary/formats.c
b/src/language/dictionary/formats.c
index 71e4d95f7c52a6207fe14e79ae80d136a650949a..a90f46e8b8efe6f4e4ce9f7efa9ca2b27572f450 100644
(file)
--- a/
src/language/dictionary/formats.c
+++ b/
src/language/dictionary/formats.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
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
@@
-85,7
+84,7
@@
internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
return CMD_FAILURE;
if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
return CMD_FAILURE;
- type = v
[0]->type
;
+ type = v
ar_get_type (v[0])
;
if (!lex_match (lexer, '('))
{
if (!lex_match (lexer, '('))
{
@@
-94,7
+93,7
@@
internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
}
if (!parse_format_specifier (lexer, &f)
|| !fmt_check_output (&f)
}
if (!parse_format_specifier (lexer, &f)
|| !fmt_check_output (&f)
- || !fmt_check_type_compat (&f, NUMERIC))
+ || !fmt_check_type_compat (&f,
VAR_
NUMERIC))
goto fail;
if (!lex_match (lexer, ')'))
goto fail;
if (!lex_match (lexer, ')'))
@@
-106,9
+105,9
@@
internal_cmd_formats (struct lexer *lexer, struct dataset *ds, 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;