projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging works
[pspp]
/
src
/
language
/
dictionary
/
numeric.c
diff --git
a/src/language/dictionary/numeric.c
b/src/language/dictionary/numeric.c
index 25b2ecf8f06719fb43cceb3ba0467448fc17049e..c04e8eba7a0f9f4797dbaf95276c5bae16b24c6f 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,11
+45,11
@@
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;
struct fmt_spec f;
- if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE))
+ if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
+ &v, &nv, PV_NO_DUPLICATE))
return CMD_FAILURE;
/* Get the optional format specification. */
return CMD_FAILURE;
/* Get the optional format specification. */
@@
-58,7
+58,7
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
if (!parse_format_specifier (lexer, &f))
goto fail;
if (!parse_format_specifier (lexer, &f))
goto fail;
- if (
! fmt_check_output (&f))
+ if (! fmt_check_output (&f))
goto fail;
if (fmt_is_string (f.type))
goto fail;
if (fmt_is_string (f.type))
@@
-71,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, "`)'"
);
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++)
@@
-85,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. */
@@
-98,7
+95,7
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
}
while (lex_match (lexer, T_SLASH));
}
while (lex_match (lexer, T_SLASH));
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
/* 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. */
@@
-127,7
+124,8
@@
cmd_string (struct lexer *lexer, struct dataset *ds)
do
{
do
{
- if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE))
+ if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
+ &v, &nv, PV_NO_DUPLICATE))
return CMD_FAILURE;
if (!lex_force_match (lexer, T_LPAREN)
return CMD_FAILURE;
if (!lex_force_match (lexer, T_LPAREN)
@@
-164,7
+162,7
@@
cmd_string (struct lexer *lexer, struct dataset *ds)
}
while (lex_match (lexer, T_SLASH));
}
while (lex_match (lexer, T_SLASH));
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
/* 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. */
@@
-190,5
+188,5
@@
cmd_leave (struct lexer *lexer, struct dataset *ds)
var_set_leave (v[i], true);
free (v);
var_set_leave (v[i], true);
free (v);
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
}
}