projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Count Dialog: Replace deprecated widgets
[pspp]
/
src
/
language
/
dictionary
/
numeric.c
diff --git
a/src/language/dictionary/numeric.c
b/src/language/dictionary/numeric.c
index c88d514345c9d2986364553dfcabc4aff19c9b43..82b175725d27e2ff15070459bea9a899b0ae432d 100644
(file)
--- a/
src/language/dictionary/numeric.c
+++ b/
src/language/dictionary/numeric.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2010, 2011
, 2014
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
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
@@
-18,8
+18,8
@@
#include <stdlib.h>
#include <stdlib.h>
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/variable.h"
#include "data/format.h"
#include "language/command.h"
#include "data/variable.h"
#include "data/format.h"
#include "language/command.h"
@@
-45,8
+45,7
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
do
{
do
{
- /* Format spec for variables to create. f.type==-1 if default is to
- be used. */
+ /* Format spec for variables to create. */
struct fmt_spec f;
if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
struct fmt_spec f;
if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
@@
-72,12
+71,12
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
if (!lex_match (lexer, T_RPAREN))
{
if (!lex_match (lexer, T_RPAREN))
{
-
msg (SE, _("`)' expected after output format.")
);
+
lex_error_expecting (lexer, "`)'", NULL_SENTINEL
);
goto fail;
}
}
else
goto fail;
}
}
else
- f
.type = -1
;
+ f
= var_default_formats (0)
;
/* Create each variable. */
for (i = 0; i < nv; i++)
/* Create each variable. */
for (i = 0; i < nv; i++)
@@
-86,10
+85,7
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
- {
- if (f.type != -1)
- var_set_both_formats (new_var, &f);
- }
+ var_set_both_formats (new_var, &f);
}
/* Clean up. */
}
/* Clean up. */