projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added initial innovations functions
[pspp-builds.git]
/
src
/
language
/
dictionary
/
numeric.c
diff --git
a/src/language/dictionary/numeric.c
b/src/language/dictionary/numeric.c
index 3e3d7651dbe83b73e244ec9f822805fb1f891900..379348835462343d0bce897170e31bb106039506 100644
(file)
--- a/
src/language/dictionary/numeric.c
+++ b/
src/language/dictionary/numeric.c
@@
-18,14
+18,17
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <stdlib.h>
#include <stdlib.h>
-#include <language/command.h>
+
#include <data/dictionary.h>
#include <data/dictionary.h>
-#include <libpspp/message.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/str.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-47,7
+50,7
@@
cmd_numeric (void)
do
{
if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
do
{
if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
/* Get the optional format specification. */
if (lex_match ('('))
/* Get the optional format specification. */
if (lex_match ('('))
@@
-98,7
+101,7
@@
fail:
for (i = 0; i < nv; i++)
free (v[i]);
free (v);
for (i = 0; i < nv; i++)
free (v[i]);
free (v);
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
}
/* Parses the STRING command. */
}
/* Parses the STRING command. */
@@
-120,7
+123,7
@@
cmd_string (void)
do
{
if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
do
{
if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
if (!lex_force_match ('(')
|| !parse_format_specifier (&f, 0))
if (!lex_force_match ('(')
|| !parse_format_specifier (&f, 0))
@@
-177,7
+180,7
@@
fail:
for (i = 0; i < nv; i++)
free (v[i]);
free (v);
for (i = 0; i < nv; i++)
free (v[i]);
free (v);
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
}
/* Parses the LEAVE command. */
}
/* Parses the LEAVE command. */
@@
-192,12
+195,7
@@
cmd_leave (void)
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_CASCADING_FAILURE;
for (i = 0; i < nv; i++)
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_CASCADING_FAILURE;
for (i = 0; i < nv; i++)
- {
- if (!v[i]->reinit)
- continue;
- v[i]->reinit = 0;
- v[i]->init = 1;
- }
+ v[i]->leave = true;
free (v);
return lex_end_of_command ();
free (v);
return lex_end_of_command ();