#include "dictionary.h"
#include <stdlib.h>
#include <ctype.h>
-#include "array.h"
-#include "alloc.h"
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
#include "case.h"
#include "category.h"
#include "cat-routines.h"
-#include "compiler.h"
-#include "message.h"
-#include "hash.h"
-#include "misc.h"
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <libpspp/misc.h>
#include "settings.h"
-#include "str.h"
+#include <libpspp/str.h>
#include "value-labels.h"
#include "variable.h"
assert (width >= 0 && width < 256);
- assert (var_is_valid_name(name,0));
+ assert (var_is_plausible_name(name,0));
/* Make sure there's not already a variable by that name. */
if (dict_lookup_var (d, name) != NULL)
assert (d != NULL);
assert (v != NULL);
assert (new_name != NULL);
- assert (var_is_valid_name (new_name, false));
+ assert (var_is_plausible_name (new_name, false));
assert (dict_contains_var (d, v));
assert (!compare_var_names (v->name, new_name, NULL)
|| dict_lookup_var (d, new_name) == NULL);
for (i = 0; i < count; i++)
{
assert (d->var[vars[i]->index] == vars[i]);
- assert (var_is_valid_name (new_names[i], false));
+ assert (var_is_plausible_name (new_names[i], false));
hsh_force_delete (d->name_tab, vars[i]);
old_names[i] = xstrdup (vars[i]->name);
strcpy (vars[i]->name, new_names[i]);
assert (d != NULL);
assert (name != NULL);
- assert (var_is_valid_name (name, false));
+ assert (var_is_plausible_name (name, false));
assert (var != NULL);
assert (cnt > 0);