X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fdictionary.c;h=44504ed96525ec5c4af0eaffd82f5de2fe3634c1;hb=f514231dd2fc0c2adc1ebab5c46a4b55d2bd9c2b;hp=a7478596c0b0be2c9ef9d752aee9a70a979f7567;hpb=7579fa32442ac9b623043f8cd995d9b6aa550e51;p=pspp-builds.git
diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index a7478596..44504ed9 100644
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2006, 2007 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -24,7 +22,6 @@
#include
#include "case.h"
-#include "cat-routines.h"
#include "category.h"
#include "settings.h"
#include "value-labels.h"
@@ -52,13 +49,13 @@ struct dictionary
size_t var_cnt, var_cap; /* Number of variables, capacity. */
struct hsh_table *name_tab; /* Variable index by name. */
int next_value_idx; /* Index of next `union value' to allocate. */
- struct variable **split; /* SPLIT FILE vars. */
+ const struct variable **split; /* SPLIT FILE vars. */
size_t split_cnt; /* SPLIT FILE count. */
struct variable *weight; /* WEIGHT variable. */
struct variable *filter; /* FILTER variable. */
size_t case_limit; /* Current case limit (N command). */
char *label; /* File label. */
- char *documents; /* Documents, as a string. */
+ struct string documents; /* Documents, as a string. */
struct vector **vector; /* Vectors of variables. */
size_t vector_cnt; /* Number of vectors. */
const struct dict_callbacks *callbacks; /* Callbacks on dictionary
@@ -81,6 +78,14 @@ dict_set_callbacks (struct dictionary *dict,
dict->cb_data = callback_data;
}
+/* Shallow copy the callbacks from SRC to DEST */
+void
+dict_copy_callbacks (struct dictionary *dest,
+ const struct dictionary *src)
+{
+ dest->callbacks = src->callbacks;
+ dest->cb_data = src->cb_data;
+}
/* Creates and returns a new dictionary. */
struct dictionary *
@@ -88,21 +93,8 @@ dict_create (void)
{
struct dictionary *d = xzalloc (sizeof *d);
- d->var = NULL;
- d->var_cnt = d->var_cap = 0;
d->name_tab = hsh_create (8, compare_vars_by_name, hash_var_by_name,
NULL, NULL);
- d->next_value_idx = 0;
- d->split = NULL;
- d->split_cnt = 0;
- d->weight = NULL;
- d->filter = NULL;
- d->case_limit = 0;
- d->label = NULL;
- d->documents = NULL;
- d->vector = NULL;
- d->vector_cnt = 0;
-
return d;
}
@@ -136,10 +128,10 @@ dict_clone (const struct dictionary *s)
}
if (s->weight != NULL)
- d->weight = dict_lookup_var_assert (d, var_get_name (s->weight));
+ dict_set_weight (d, dict_lookup_var_assert (d, var_get_name (s->weight)));
if (s->filter != NULL)
- d->filter = dict_lookup_var_assert (d, var_get_name (s->filter));
+ dict_set_filter (d, dict_lookup_var_assert (d, var_get_name (s->filter)));
d->case_limit = s->case_limit;
dict_set_label (d, dict_get_label (s));
@@ -160,30 +152,38 @@ dict_clear (struct dictionary *d)
{
/* FIXME? Should we really clear case_limit, label, documents?
Others are necessarily cleared by deleting all the variables.*/
- int i;
-
assert (d != NULL);
- for (i = 0; i < d->var_cnt; i++)
+ while (d->var_cnt > 0 )
{
- var_clear_vardict (d->var[i]);
- var_destroy (d->var[i]);
+ struct variable *v = d->var[d->var_cnt - 1];
+ int dict_index = var_get_dict_index (v);
+ int case_index = var_get_case_index (v);
+ int val_cnt = var_get_value_cnt (v);
+
+ var_clear_vardict (v);
+ var_destroy (v);
+
+ d->var_cnt--;
+
+ if (d->callbacks && d->callbacks->var_deleted )
+ d->callbacks->var_deleted (d,
+ dict_index, case_index, val_cnt,
+ d->cb_data);
}
+
free (d->var);
d->var = NULL;
d->var_cnt = d->var_cap = 0;
hsh_clear (d->name_tab);
d->next_value_idx = 0;
- free (d->split);
- d->split = NULL;
- d->split_cnt = 0;
- d->weight = NULL;
- d->filter = NULL;
+ dict_set_split_vars (d, NULL, 0);
+ dict_set_weight (d, NULL);
+ dict_set_filter (d, NULL);
d->case_limit = 0;
free (d->label);
d->label = NULL;
- free (d->documents);
- d->documents = NULL;
+ ds_destroy (&d->documents);
dict_clear_vectors (d);
}
@@ -206,6 +206,10 @@ dict_destroy (struct dictionary *d)
{
if (d != NULL)
{
+ /* In general, we don't want callbacks occuring, if the dictionary
+ is being destroyed */
+ d->callbacks = NULL ;
+
dict_clear (d);
hsh_destroy (d->name_tab);
free (d);
@@ -233,13 +237,20 @@ dict_get_var (const struct dictionary *d, size_t idx)
return d->var[idx];
}
+inline void
+dict_get_vars (const struct dictionary *d, const struct variable ***vars,
+ size_t *cnt, unsigned exclude_classes)
+{
+ dict_get_vars_mutable (d, (struct variable ***) vars, cnt, exclude_classes);
+}
+
/* Sets *VARS to an array of pointers to variables in D and *CNT
to the number of variables in *D. All variables are returned
if EXCLUDE_CLASSES is 0, or it may contain one or more of (1u
<< DC_ORDINARY), (1u << DC_SYSTEM), or (1u << DC_SCRATCH) to
exclude the corresponding type of variable. */
void
-dict_get_vars (const struct dictionary *d, struct variable ***vars,
+dict_get_vars_mutable (const struct dictionary *d, struct variable ***vars,
size_t *cnt, unsigned exclude_classes)
{
size_t count;
@@ -290,8 +301,8 @@ add_var (struct dictionary *d, struct variable *v)
d->var[d->var_cnt++] = v;
hsh_force_insert (d->name_tab, v);
- if ( d->callbacks && d->callbacks->var_added )
- d->callbacks->var_added (d, d->next_value_idx, d->cb_data);
+ if ( d->callbacks && d->callbacks->var_added )
+ d->callbacks->var_added (d, var_get_dict_index (v), d->cb_data);
d->next_value_idx += var_get_value_cnt (v);
@@ -352,9 +363,16 @@ dict_clone_var_assert (struct dictionary *d, const struct variable *old_var,
struct variable *
dict_lookup_var (const struct dictionary *d, const char *name)
{
- struct variable *target = var_create (name, 0);
- struct variable *result = hsh_find (d->name_tab, target);
+ struct variable *target ;
+ struct variable *result ;
+
+ if ( ! var_is_valid_name (name, false))
+ return NULL;
+
+ target = var_create (name, 0);
+ result = hsh_find (d->name_tab, target);
var_destroy (target);
+
return result;
}
@@ -387,7 +405,7 @@ dict_contains_var (const struct dictionary *d, const struct variable *v)
/* Compares two double pointers to variables, which should point
to elements of a struct dictionary's `var' member array. */
static int
-compare_var_ptrs (const void *a_, const void *b_, const void *aux UNUSED)
+compare_var_ptrs (const void *a_, const void *b_, const void *aux UNUSED)
{
struct variable *const *a = a_;
struct variable *const *b = b_;
@@ -404,11 +422,11 @@ set_var_dict_index (struct variable *v, int dict_index)
vdi.dict_index = dict_index;
var_set_vardict (v, &vdi);
- if ( d->callbacks && d->callbacks->var_changed )
+ if ( d->callbacks && d->callbacks->var_changed )
d->callbacks->var_changed (d, dict_index, d->cb_data);
}
-/* Sets the case_index in V's vardict to DICT_INDEX. */
+/* Sets the case_index in V's vardict to CASE_INDEX. */
static void
set_var_case_index (struct variable *v, int case_index)
{
@@ -431,32 +449,36 @@ reindex_vars (struct dictionary *d, size_t from, size_t to)
/* Deletes variable V from dictionary D and frees V.
This is a very bad idea if there might be any pointers to V
- from outside D. In general, no variable in should be deleted when
- any transformations are active on the dictionary's dataset, because
- those transformations might reference the deleted variable.
- The safest time to delete a variable is just after a procedure
- has been executed, as done by MODIFY VARS.
+ from outside D. In general, no variable in the active file's
+ dictionary should be deleted when any transformations are
+ active on the dictionary's dataset, because those
+ transformations might reference the deleted variable. The
+ safest time to delete a variable is just after a procedure has
+ been executed, as done by MODIFY VARS.
Pointers to V within D are not a problem, because
dict_delete_var() knows to remove V from split variables,
weights, filters, etc. */
void
-dict_delete_var (struct dictionary *d, struct variable *v)
+dict_delete_var (struct dictionary *d, struct variable *v)
{
int dict_index = var_get_dict_index (v);
+ const int case_index = var_get_case_index (v);
+ const int val_cnt = var_get_value_cnt (v);
assert (dict_contains_var (d, v));
/* Delete aux data. */
var_clear_aux (v);
- /* Remove V from splits, weight, filter variables. */
- d->split_cnt = remove_equal (d->split, d->split_cnt, sizeof *d->split,
- &v, compare_var_ptrs, NULL);
+ dict_unset_split_var (d, v);
+
if (d->weight == v)
- d->weight = NULL;
+ dict_set_weight (d, NULL);
+
if (d->filter == v)
- d->filter = NULL;
+ dict_set_filter (d, NULL);
+
dict_clear_vectors (d);
/* Remove V from var array. */
@@ -474,15 +496,15 @@ dict_delete_var (struct dictionary *d, struct variable *v)
var_clear_vardict (v);
var_destroy (v);
- if (d->callbacks && d->callbacks->var_deleted )
- d->callbacks->var_deleted (d, dict_index, d->cb_data);
+ if (d->callbacks && d->callbacks->var_deleted )
+ d->callbacks->var_deleted (d, dict_index, case_index, val_cnt, d->cb_data);
}
/* Deletes the COUNT variables listed in VARS from D. This is
unsafe; see the comment on dict_delete_var() for details. */
-void
+void
dict_delete_vars (struct dictionary *d,
- struct variable *const *vars, size_t count)
+ struct variable *const *vars, size_t count)
{
/* FIXME: this can be done in O(count) time, but this algorithm
is O(count**2). */
@@ -497,12 +519,12 @@ dict_delete_vars (struct dictionary *d,
is unsafe; see the comment on dict_delete_var() for
details. */
void
-dict_delete_consecutive_vars (struct dictionary *d, size_t idx, size_t count)
+dict_delete_consecutive_vars (struct dictionary *d, size_t idx, size_t count)
{
/* FIXME: this can be done in O(count) time, but this algorithm
is O(count**2). */
assert (idx + count <= d->var_cnt);
-
+
while (count-- > 0)
dict_delete_var (d, d->var[idx]);
}
@@ -528,7 +550,7 @@ dict_delete_scratch_vars (struct dictionary *d)
if any, retain their relative positions. Runs in time linear
in the distance moved. */
void
-dict_reorder_var (struct dictionary *d, struct variable *v, size_t new_index)
+dict_reorder_var (struct dictionary *d, struct variable *v, size_t new_index)
{
size_t old_index = var_get_dict_index (v);
@@ -575,7 +597,7 @@ dict_reorder_vars (struct dictionary *d,
/* Changes the name of variable V in dictionary D to NEW_NAME. */
static void
-rename_var (struct dictionary *d, struct variable *v, const char *new_name)
+rename_var (struct dictionary *d, struct variable *v, const char *new_name)
{
struct vardict_info vdi;
@@ -604,7 +626,7 @@ dict_rename_var (struct dictionary *d, struct variable *v,
if (get_algorithm () == ENHANCED)
var_clear_short_name (v);
- if ( d->callbacks && d->callbacks->var_changed )
+ if ( d->callbacks && d->callbacks->var_changed )
d->callbacks->var_changed (d, var_get_dict_index (v), d->cb_data);
}
@@ -617,7 +639,7 @@ dict_rename_var (struct dictionary *d, struct variable *v,
bool
dict_rename_vars (struct dictionary *d,
struct variable **vars, char **new_names, size_t count,
- char **err_name)
+ char **err_name)
{
struct pool *pool;
char **old_names;
@@ -629,12 +651,12 @@ dict_rename_vars (struct dictionary *d,
/* Save the names of the variables to be renamed. */
pool = pool_create ();
old_names = pool_nalloc (pool, count, sizeof *old_names);
- for (i = 0; i < count; i++)
+ for (i = 0; i < count; i++)
old_names[i] = pool_strdup (pool, var_get_name (vars[i]));
-
+
/* Remove the variables to be renamed from the name hash,
and rename them. */
- for (i = 0; i < count; i++)
+ for (i = 0; i < count; i++)
{
hsh_force_delete (d->name_tab, vars[i]);
rename_var (d, vars[i], new_names[i]);
@@ -649,12 +671,12 @@ dict_rename_vars (struct dictionary *d,
Back out all the name changes that have already
taken place, and indicate failure. */
size_t fail_idx = i;
- if (err_name != NULL)
+ if (err_name != NULL)
*err_name = new_names[i];
for (i = 0; i < fail_idx; i++)
hsh_force_delete (d->name_tab, vars[i]);
-
+
for (i = 0; i < count; i++)
{
rename_var (d, vars[i], old_names[i]);
@@ -677,11 +699,11 @@ dict_rename_vars (struct dictionary *d,
/* Returns the weighting variable in dictionary D, or a null
pointer if the dictionary is unweighted. */
struct variable *
-dict_get_weight (const struct dictionary *d)
+dict_get_weight (const struct dictionary *d)
{
assert (d != NULL);
assert (d->weight == NULL || dict_contains_var (d, d->weight));
-
+
return d->weight;
}
@@ -691,7 +713,7 @@ dict_get_weight (const struct dictionary *d)
warn_on_invalid is true. The function will set warn_on_invalid to false
if an invalid weight is found. */
double
-dict_get_case_weight (const struct dictionary *d, const struct ccase *c,
+dict_get_case_weight (const struct dictionary *d, const struct ccase *c,
bool *warn_on_invalid)
{
assert (d != NULL);
@@ -699,12 +721,12 @@ dict_get_case_weight (const struct dictionary *d, const struct ccase *c,
if (d->weight == NULL)
return 1.0;
- else
+ else
{
double w = case_num (c, d->weight);
if (w < 0.0 || var_is_num_missing (d->weight, w, MV_ANY))
w = 0.0;
- if ( w == 0.0 && *warn_on_invalid ) {
+ if ( w == 0.0 && warn_on_invalid != NULL && *warn_on_invalid ) {
*warn_on_invalid = false;
msg (SW, _("At least one case in the data file had a weight value "
"that was user-missing, system-missing, zero, or "
@@ -717,23 +739,28 @@ dict_get_case_weight (const struct dictionary *d, const struct ccase *c,
/* Sets the weighting variable of D to V, or turning off
weighting if V is a null pointer. */
void
-dict_set_weight (struct dictionary *d, struct variable *v)
+dict_set_weight (struct dictionary *d, struct variable *v)
{
assert (d != NULL);
assert (v == NULL || dict_contains_var (d, v));
assert (v == NULL || var_is_numeric (v));
d->weight = v;
+
+ if ( d->callbacks && d->callbacks->weight_changed )
+ d->callbacks->weight_changed (d,
+ v ? var_get_dict_index (v) : -1,
+ d->cb_data);
}
/* Returns the filter variable in dictionary D (see cmd_filter())
or a null pointer if the dictionary is unfiltered. */
struct variable *
-dict_get_filter (const struct dictionary *d)
+dict_get_filter (const struct dictionary *d)
{
assert (d != NULL);
assert (d->filter == NULL || dict_contains_var (d, d->filter));
-
+
return d->filter;
}
@@ -746,12 +773,17 @@ dict_set_filter (struct dictionary *d, struct variable *v)
assert (v == NULL || dict_contains_var (d, v));
d->filter = v;
+
+ if ( d->callbacks && d->callbacks->filter_changed )
+ d->callbacks->filter_changed (d,
+ v ? var_get_dict_index (v) : -1,
+ d->cb_data);
}
/* Returns the case limit for dictionary D, or zero if the number
of cases is unlimited. */
size_t
-dict_get_case_limit (const struct dictionary *d)
+dict_get_case_limit (const struct dictionary *d)
{
assert (d != NULL);
@@ -761,7 +793,7 @@ dict_get_case_limit (const struct dictionary *d)
/* Sets CASE_LIMIT as the case limit for dictionary D. Use
0 for CASE_LIMIT to indicate no limit. */
void
-dict_set_case_limit (struct dictionary *d, size_t case_limit)
+dict_set_case_limit (struct dictionary *d, size_t case_limit)
{
assert (d != NULL);
@@ -772,7 +804,7 @@ dict_set_case_limit (struct dictionary *d, size_t case_limit)
This value is the number of `union value's that need to be
allocated to store a case for dictionary D. */
int
-dict_get_next_value_idx (const struct dictionary *d)
+dict_get_next_value_idx (const struct dictionary *d)
{
assert (d != NULL);
@@ -782,7 +814,7 @@ dict_get_next_value_idx (const struct dictionary *d)
/* Returns the number of bytes needed to store a case for
dictionary D. */
size_t
-dict_get_case_size (const struct dictionary *d)
+dict_get_case_size (const struct dictionary *d)
{
assert (d != NULL);
@@ -792,7 +824,7 @@ dict_get_case_size (const struct dictionary *d)
/* Deletes scratch variables in dictionary D and reassigns values
so that fragmentation is eliminated. */
void
-dict_compact_values (struct dictionary *d)
+dict_compact_values (struct dictionary *d)
{
size_t i;
@@ -801,7 +833,7 @@ dict_compact_values (struct dictionary *d)
{
struct variable *v = d->var[i];
- if (dict_class_from_id (var_get_name (v)) != DC_SCRATCH)
+ if (dict_class_from_id (var_get_name (v)) != DC_SCRATCH)
{
set_var_case_index (v, d->next_value_idx);
d->next_value_idx += var_get_value_cnt (v);
@@ -812,17 +844,44 @@ dict_compact_values (struct dictionary *d)
}
}
+
+/*
+ Reassigns case indices for D, increasing each index above START by
+ the value PADDING.
+*/
+static void
+dict_pad_values (struct dictionary *d, int start, int padding)
+{
+ size_t i;
+
+ if ( padding <= 0 )
+ return;
+
+ for (i = 0; i < d->var_cnt; ++i)
+ {
+ struct variable *v = d->var[i];
+
+ int index = var_get_case_index (v);
+
+ if ( index >= start)
+ set_var_case_index (v, index + padding);
+ }
+
+ d->next_value_idx += padding;
+}
+
+
/* Returns the number of values that would be used by a case if
dict_compact_values() were called. */
size_t
-dict_get_compacted_value_cnt (const struct dictionary *d)
+dict_get_compacted_value_cnt (const struct dictionary *d)
{
size_t i;
size_t cnt;
cnt = 0;
for (i = 0; i < d->var_cnt; i++)
- if (dict_class_from_id (var_get_name (d->var[i])) != DC_SCRATCH)
+ if (dict_class_from_id (var_get_name (d->var[i])) != DC_SCRATCH)
cnt += var_get_value_cnt (d->var[i]);
return cnt;
}
@@ -833,24 +892,24 @@ dict_get_compacted_value_cnt (const struct dictionary *d)
receive -1 for case index because dict_compact_values() will
delete them. */
int *
-dict_get_compacted_dict_index_to_case_index (const struct dictionary *d)
+dict_get_compacted_dict_index_to_case_index (const struct dictionary *d)
{
size_t i;
size_t next_value_idx;
int *map;
-
+
map = xnmalloc (d->var_cnt, sizeof *map);
next_value_idx = 0;
for (i = 0; i < d->var_cnt; i++)
{
struct variable *v = d->var[i];
- if (dict_class_from_id (var_get_name (v)) != DC_SCRATCH)
+ if (dict_class_from_id (var_get_name (v)) != DC_SCRATCH)
{
map[i] = next_value_idx;
next_value_idx += var_get_value_cnt (v);
}
- else
+ else
map[i] = -1;
}
return map;
@@ -866,7 +925,7 @@ dict_get_compacted_dict_index_to_case_index (const struct dictionary *d)
rearrange values even if it didn't reduce space
requirements. */
bool
-dict_compacting_would_shrink (const struct dictionary *d)
+dict_compacting_would_shrink (const struct dictionary *d)
{
return dict_get_compacted_value_cnt (d) < dict_get_next_value_idx (d);
}
@@ -880,13 +939,13 @@ dict_compacting_would_shrink (const struct dictionary *d)
from dictionary D would *shrink* the case: compacting could
rearrange values without reducing space requirements. */
bool
-dict_compacting_would_change (const struct dictionary *d)
+dict_compacting_would_change (const struct dictionary *d)
{
size_t case_idx;
size_t i;
case_idx = 0;
- for (i = 0; i < dict_get_var_cnt (d); i++)
+ for (i = 0; i < dict_get_var_cnt (d); i++)
{
struct variable *v = dict_get_var (d, i);
if (var_get_case_index (v) != case_idx)
@@ -905,7 +964,7 @@ struct copy_map
};
/* How to compact a case. */
-struct dict_compactor
+struct dict_compactor
{
struct copy_map *maps; /* Array of mappings. */
size_t map_cnt; /* Number of mappings. */
@@ -933,15 +992,15 @@ dict_make_compactor (const struct dictionary *d)
value_idx = 0;
map = NULL;
- for (i = 0; i < d->var_cnt; i++)
+ for (i = 0; i < d->var_cnt; i++)
{
struct variable *v = d->var[i];
if (dict_class_from_id (var_get_name (v)) == DC_SCRATCH)
continue;
- if (map != NULL && map->src_idx + map->cnt == var_get_case_index (v))
+ if (map != NULL && map->src_idx + map->cnt == var_get_case_index (v))
map->cnt += var_get_value_cnt (v);
- else
+ else
{
if (compactor->map_cnt == map_allocated)
compactor->maps = x2nrealloc (compactor->maps, &map_allocated,
@@ -965,11 +1024,11 @@ dict_make_compactor (const struct dictionary *d)
by scratch variables). */
void
dict_compactor_compact (const struct dict_compactor *compactor,
- struct ccase *dst, const struct ccase *src)
+ struct ccase *dst, const struct ccase *src)
{
size_t i;
- for (i = 0; i < compactor->map_cnt; i++)
+ for (i = 0; i < compactor->map_cnt; i++)
{
const struct copy_map *map = &compactor->maps[i];
case_copy (dst, map->dst_idx, src, map->src_idx, map->cnt);
@@ -978,9 +1037,9 @@ dict_compactor_compact (const struct dict_compactor *compactor,
/* Destroys COMPACTOR. */
void
-dict_compactor_destroy (struct dict_compactor *compactor)
+dict_compactor_destroy (struct dict_compactor *compactor)
{
- if (compactor != NULL)
+ if (compactor != NULL)
{
free (compactor->maps);
free (compactor);
@@ -991,23 +1050,39 @@ dict_compactor_destroy (struct dict_compactor *compactor)
dict_get_split_cnt() to determine how many SPLIT FILE vars
there are. Returns a null pointer if and only if there are no
SPLIT FILE vars. */
-struct variable *const *
-dict_get_split_vars (const struct dictionary *d)
+const struct variable *const *
+dict_get_split_vars (const struct dictionary *d)
{
assert (d != NULL);
-
+
return d->split;
}
/* Returns the number of SPLIT FILE vars. */
size_t
-dict_get_split_cnt (const struct dictionary *d)
+dict_get_split_cnt (const struct dictionary *d)
{
assert (d != NULL);
return d->split_cnt;
}
+/* Removes variable V from the set of split variables in dictionary D */
+void
+dict_unset_split_var (struct dictionary *d,
+ struct variable *v)
+{
+ const int count = d->split_cnt;
+ d->split_cnt = remove_equal (d->split, d->split_cnt, sizeof *d->split,
+ &v, compare_var_ptrs, NULL);
+
+ if ( count == d->split_cnt)
+ return;
+
+ if ( d->callbacks && d->callbacks->split_changed )
+ d->callbacks->split_changed (d, d->cb_data);
+}
+
/* Sets CNT split vars SPLIT in dictionary D. */
void
dict_set_split_vars (struct dictionary *d,
@@ -1017,14 +1092,17 @@ dict_set_split_vars (struct dictionary *d,
assert (cnt == 0 || split != NULL);
d->split_cnt = cnt;
- d->split = xnrealloc (d->split, cnt, sizeof *d->split);
+ d->split = cnt > 0 ? xnrealloc (d->split, cnt, sizeof *d->split) : NULL;
memcpy (d->split, split, cnt * sizeof *d->split);
+
+ if ( d->callbacks && d->callbacks->split_changed )
+ d->callbacks->split_changed (d, d->cb_data);
}
/* Returns the file label for D, or a null pointer if D is
unlabeled (see cmd_file_label()). */
const char *
-dict_get_label (const struct dictionary *d)
+dict_get_label (const struct dictionary *d)
{
assert (d != NULL);
@@ -1034,7 +1112,7 @@ dict_get_label (const struct dictionary *d)
/* Sets D's file label to LABEL, truncating it to a maximum of 60
characters. */
void
-dict_set_label (struct dictionary *d, const char *label)
+dict_set_label (struct dictionary *d, const char *label)
{
assert (d != NULL);
@@ -1043,7 +1121,7 @@ dict_set_label (struct dictionary *d, const char *label)
d->label = NULL;
else if (strlen (label) < 60)
d->label = xstrdup (label);
- else
+ else
{
d->label = xmalloc (61);
memcpy (d->label, label, 60);
@@ -1052,27 +1130,73 @@ dict_set_label (struct dictionary *d, const char *label)
}
/* Returns the documents for D, or a null pointer if D has no
- documents (see cmd_document()).. */
+ documents. If the return value is nonnull, then the string
+ will be an exact multiple of DOC_LINE_LENGTH bytes in length,
+ with each segment corresponding to one line. */
const char *
-dict_get_documents (const struct dictionary *d)
+dict_get_documents (const struct dictionary *d)
{
- assert (d != NULL);
-
- return d->documents;
+ return ds_is_empty (&d->documents) ? NULL : ds_cstr (&d->documents);
}
/* Sets the documents for D to DOCUMENTS, or removes D's
- documents if DOCUMENT is a null pointer. */
+ documents if DOCUMENT is a null pointer. If DOCUMENTS is
+ nonnull, then it should be an exact multiple of
+ DOC_LINE_LENGTH bytes in length, with each segment
+ corresponding to one line. */
void
dict_set_documents (struct dictionary *d, const char *documents)
{
- assert (d != NULL);
+ size_t remainder;
- free (d->documents);
- if (documents == NULL)
- d->documents = NULL;
- else
- d->documents = xstrdup (documents);
+ ds_assign_cstr (&d->documents, documents != NULL ? documents : "");
+
+ /* In case the caller didn't get it quite right, pad out the
+ final line with spaces. */
+ remainder = ds_length (&d->documents) % DOC_LINE_LENGTH;
+ if (remainder != 0)
+ ds_put_char_multiple (&d->documents, ' ', DOC_LINE_LENGTH - remainder);
+}
+
+/* Drops the documents from dictionary D. */
+void
+dict_clear_documents (struct dictionary *d)
+{
+ ds_clear (&d->documents);
+}
+
+/* Appends LINE to the documents in D. LINE will be truncated or
+ padded on the right with spaces to make it exactly
+ DOC_LINE_LENGTH bytes long. */
+void
+dict_add_document_line (struct dictionary *d, const char *line)
+{
+ if (strlen (line) > DOC_LINE_LENGTH)
+ {
+ /* Note to translators: "bytes" is correct, not characters */
+ msg (SW, _("Truncating document line to %d bytes."), DOC_LINE_LENGTH);
+ }
+ buf_copy_str_rpad (ds_put_uninit (&d->documents, DOC_LINE_LENGTH),
+ DOC_LINE_LENGTH, line);
+}
+
+/* Returns the number of document lines in dictionary D. */
+size_t
+dict_get_document_line_cnt (const struct dictionary *d)
+{
+ return ds_length (&d->documents) / DOC_LINE_LENGTH;
+}
+
+/* Copies document line number IDX from dictionary D into
+ LINE, trimming off any trailing white space. */
+void
+dict_get_document_line (const struct dictionary *d,
+ size_t idx, struct string *line)
+{
+ assert (idx < dict_get_document_line_cnt (d));
+ ds_assign_substring (line, ds_substr (&d->documents, idx * DOC_LINE_LENGTH,
+ DOC_LINE_LENGTH));
+ ds_rtrim (line, ss_cstr (CC_SPACES));
}
/* Creates in D a vector named NAME that contains the CNT
@@ -1081,7 +1205,7 @@ dict_set_documents (struct dictionary *d, const char *documents)
bool
dict_create_vector (struct dictionary *d,
const char *name,
- struct variable **var, size_t cnt)
+ struct variable **var, size_t cnt)
{
size_t i;
@@ -1089,21 +1213,33 @@ dict_create_vector (struct dictionary *d,
assert (cnt > 0);
for (i = 0; i < cnt; i++)
assert (dict_contains_var (d, var[i]));
-
+
if (dict_lookup_vector (d, name) == NULL)
{
d->vector = xnrealloc (d->vector, d->vector_cnt + 1, sizeof *d->vector);
d->vector[d->vector_cnt++] = vector_create (name, var, cnt);
- return true;
+ return true;
}
else
return false;
}
+/* Creates in D a vector named NAME that contains the CNT
+ variables in VAR. A vector named NAME must not already exist
+ in D. */
+void
+dict_create_vector_assert (struct dictionary *d,
+ const char *name,
+ struct variable **var, size_t cnt)
+{
+ assert (dict_lookup_vector (d, name) == NULL);
+ dict_create_vector (d, name, var, cnt);
+}
+
/* Returns the vector in D with index IDX, which must be less
than dict_get_vector_cnt (D). */
const struct vector *
-dict_get_vector (const struct dictionary *d, size_t idx)
+dict_get_vector (const struct dictionary *d, size_t idx)
{
assert (d != NULL);
assert (idx < d->vector_cnt);
@@ -1113,7 +1249,7 @@ dict_get_vector (const struct dictionary *d, size_t idx)
/* Returns the number of vectors in D. */
size_t
-dict_get_vector_cnt (const struct dictionary *d)
+dict_get_vector_cnt (const struct dictionary *d)
{
assert (d != NULL);
@@ -1123,7 +1259,7 @@ dict_get_vector_cnt (const struct dictionary *d)
/* Looks up and returns the vector within D with the given
NAME. */
const struct vector *
-dict_lookup_vector (const struct dictionary *d, const char *name)
+dict_lookup_vector (const struct dictionary *d, const char *name)
{
size_t i;
for (i = 0; i < d->vector_cnt; i++)
@@ -1134,10 +1270,10 @@ dict_lookup_vector (const struct dictionary *d, const char *name)
/* Deletes all vectors from D. */
void
-dict_clear_vectors (struct dictionary *d)
+dict_clear_vectors (struct dictionary *d)
{
size_t i;
-
+
for (i = 0; i < d->vector_cnt; i++)
vector_destroy (d->vector[i]);
free (d->vector);
@@ -1148,14 +1284,14 @@ dict_clear_vectors (struct dictionary *d)
/* Compares two strings. */
static int
-compare_strings (const void *a, const void *b, const void *aux UNUSED)
+compare_strings (const void *a, const void *b, const void *aux UNUSED)
{
return strcmp (a, b);
}
/* Hashes a string. */
static unsigned
-hash_string (const void *s, const void *aux UNUSED)
+hash_string (const void *s, const void *aux UNUSED)
{
return hsh_hash_string (s);
}
@@ -1182,7 +1318,7 @@ set_var_short_name_suffix (struct variable *v, const char *base,
/* Compose suffix. */
start = end = suffix + sizeof suffix - 1;
*end = '\0';
- do
+ do
{
*--start = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[suffix_number % 26];
if (start <= suffix + 1)
@@ -1214,7 +1350,7 @@ set_var_short_name_suffix (struct variable *v, const char *base,
truncated to form short names. If that causes conflicts,
variables are renamed as PREFIX_A, PREFIX_B, and so on. */
void
-dict_assign_short_names (struct dictionary *d)
+dict_assign_short_names (struct dictionary *d)
{
struct hsh_table *short_names;
size_t i;
@@ -1243,13 +1379,13 @@ dict_assign_short_names (struct dictionary *d)
if (name != NULL && hsh_insert (short_names, (char *) name) != NULL)
var_clear_short_name (v);
}
-
+
/* Now assign short names to remaining variables. */
for (i = 0; i < d->var_cnt; i++)
{
struct variable *v = d->var[i];
const char *name = var_get_short_name (v);
- if (name == NULL)
+ if (name == NULL)
{
/* Form initial short_name from the variable name, then
try _A, _B, ... _AA, _AB, etc., if needed.*/
@@ -1265,7 +1401,7 @@ dict_assign_short_names (struct dictionary *d)
}
while (hsh_insert (short_names, (char *) var_get_short_name (v))
!= NULL);
- }
+ }
}
/* Get rid of hash table. */
@@ -1273,7 +1409,7 @@ dict_assign_short_names (struct dictionary *d)
}
-/* Called from variable.c to notify the dictionary that some property of
+/* Called from variable.c to notify the dictionary that some property of
the variable has changed */
void
dict_var_changed (const struct variable *v)
@@ -1289,3 +1425,23 @@ dict_var_changed (const struct variable *v)
d->callbacks->var_changed (d, var_get_dict_index (v), d->cb_data);
}
}
+
+
+/* Called from variable.c to notify the dictionary that the variable's width
+ has changed */
+void
+dict_var_resized (const struct variable *v, int delta)
+{
+ if ( var_has_vardict (v))
+ {
+ const struct vardict_info *vdi = var_get_vardict (v);
+ struct dictionary *d;
+
+ d = vdi->dict;
+
+ dict_pad_values (d, var_get_case_index(v) + 1, delta);
+
+ if ( d->callbacks && d->callbacks->var_resized )
+ d->callbacks->var_resized (d, var_get_dict_index (v), delta, d->cb_data);
+ }
+}