projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed intialization of coefficients
[pspp]
/
src
/
language
/
dictionary
/
modify-variables.c
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index 1b0a27b061016591056d3fead86ee23f28aa3bbf..1632f6ea0db7aecda785b929f72fd544af469b30 100644
(file)
--- a/
src/language/dictionary/modify-variables.c
+++ b/
src/language/dictionary/modify-variables.c
@@
-18,21
+18,25
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <stdlib.h>
#include <stdlib.h>
-#include <libpspp/message.h>
-#include <libpspp/array.h>
+
+#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
+#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/bit-vector.h>
-#include <language/command.h>
#include <libpspp/compiler.h>
#include <libpspp/compiler.h>
-#include <data/dictionary.h>
-#include <libpspp/message.h>
#include <libpspp/hash.h>
#include <libpspp/hash.h>
-#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
-#include <data/procedure.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-256,7
+260,7
@@
cmd_modify_vars (void)
compare_variables_given_ordering,
&forward_positional_ordering)
!= drop_cnt)
compare_variables_given_ordering,
&forward_positional_ordering)
!= drop_cnt)
-
assert (0
);
+
NOT_REACHED (
);
free (keep_vars);
free (all_vars);
free (keep_vars);
free (all_vars);
@@
-417,7
+421,7
@@
validate_var_modification (const struct dictionary *d,
keep_vars,
compare_variables_given_ordering,
&forward_positional_ordering) != keep_cnt)
keep_vars,
compare_variables_given_ordering,
&forward_positional_ordering) != keep_cnt)
-
assert (0
);
+
NOT_REACHED (
);
/* Copy variables into var_renaming array. */
var_renaming = xnmalloc (keep_cnt, sizeof *var_renaming);
/* Copy variables into var_renaming array. */
var_renaming = xnmalloc (keep_cnt, sizeof *var_renaming);
@@
-511,7
+515,7
@@
rearrange_dict (struct dictionary *d, const struct var_modification *vm)
/* Do renaming. */
if (dict_rename_vars (d, rename_vars, rename_new_names, rename_cnt,
NULL) == 0)
/* Do renaming. */
if (dict_rename_vars (d, rename_vars, rename_new_names, rename_cnt,
NULL) == 0)
-
assert (0
);
+
NOT_REACHED (
);
/* Clean up. */
for (i = 0; i < vm->rename_cnt; i++)
/* Clean up. */
for (i = 0; i < vm->rename_cnt; i++)