projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
language
/
dictionary
/
numeric.c
diff --git
a/src/language/dictionary/numeric.c
b/src/language/dictionary/numeric.c
index 25b2ecf8f06719fb43cceb3ba0467448fc17049e..1a81e0e494ceb9300e468fc3520768d46212d8be 100644
(file)
--- a/
src/language/dictionary/numeric.c
+++ b/
src/language/dictionary/numeric.c
@@
-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"
@@
-49,7
+49,8
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
be used. */
struct fmt_spec f;
be used. */
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. */
@@
-71,7
+72,7
@@
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;
}
}
goto fail;
}
}
@@
-98,7
+99,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
+128,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
+166,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
+192,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
;
}
}