projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for value labels on long string variables.
[pspp-builds.git]
/
src
/
data
/
variable.c
diff --git
a/src/data/variable.c
b/src/data/variable.c
index ccbe65dc0ed9757be75091637bb346b276182d84..e4961b23843177078371176d346620d6e62f8d75 100644
(file)
--- a/
src/data/variable.c
+++ b/
src/data/variable.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 2009
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
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
@@
-36,6
+36,7
@@
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "minmax.h"
#include "xalloc.h"
#include "gettext.h"
#include "xalloc.h"
#include "gettext.h"
@@
-148,17
+149,21
@@
var_clone (const struct variable *old_var)
return new_var;
}
return new_var;
}
-/* Create a variable to be used for internal calculations only */
+/* Create a variable to be used for internal calculations only.
+ The variable is assigned a unique dictionary index and a case
+ index of CASE_IDX. */
struct variable *
var_create_internal (int case_idx)
{
struct variable *v = var_create ("$internal", 0);
struct variable *
var_create_internal (int case_idx)
{
struct variable *v = var_create ("$internal", 0);
-
struct vardict_info vdi;
struct vardict_info vdi;
+ static int counter = INT_MAX / 2;
vdi.dict = NULL;
vdi.dict = NULL;
- vdi.dict_index = 0;
vdi.case_index = case_idx;
vdi.case_index = case_idx;
+ vdi.dict_index = counter++;
+ if (counter == INT_MAX)
+ counter = INT_MAX / 2;
var_set_vardict (v, &vdi);
var_set_vardict (v, &vdi);
@@
-319,7
+324,7
@@
hash_var_by_name (const void *v_, const void *aux UNUSED)
{
const struct variable *v = v_;
{
const struct variable *v = v_;
- return h
sh_hash_case_string (v->name
);
+ return h
ash_case_string (v->name, 0
);
}
/* A hsh_compare_func that orders pointers to variables A and B
}
/* A hsh_compare_func that orders pointers to variables A and B
@@
-355,7
+360,7
@@
hash_var_ptr_by_name (const void *v_, const void *aux UNUSED)
{
struct variable *const *v = v_;
{
struct variable *const *v = v_;
- return h
sh_hash_case_string (var_get_name (*v)
);
+ return h
ash_case_string (var_get_name (*v), 0
);
}
\f
/* Returns the type of variable V. */
}
\f
/* Returns the type of variable V. */
@@
-379,6
+384,9
@@
var_set_width (struct variable *v, int new_width)
{
const int old_width = v->width;
{
const int old_width = v->width;
+ if (old_width == new_width)
+ return;
+
if (mv_is_resizable (&v->miss, new_width))
mv_resize (&v->miss, new_width);
else
if (mv_is_resizable (&v->miss, new_width))
mv_resize (&v->miss, new_width);
else
@@
-399,15
+407,7
@@
var_set_width (struct variable *v, int new_width)
fmt_resize (&v->write, new_width);
v->width = new_width;
fmt_resize (&v->write, new_width);
v->width = new_width;
-
- {
- const int old_val_count = value_cnt_from_width (old_width);
- const int new_val_count = value_cnt_from_width (new_width);
-
- if ( old_val_count != new_val_count)
- dict_var_resized (v, new_val_count - old_val_count);
- }
-
+ dict_var_resized (v, old_width);
dict_var_changed (v);
}
dict_var_changed (v);
}
@@
-441,14
+441,6
@@
var_is_long_string (const struct variable *v)
{
return v->width > MAX_SHORT_STRING;
}
{
return v->width > MAX_SHORT_STRING;
}
-
-/* Returns the number of "union value"s need to store a value of
- variable V. */
-size_t
-var_get_value_cnt (const struct variable *v)
-{
- return value_cnt_from_width (v->width);
-}
\f
/* Returns variable V's missing values. */
const struct missing_values *
\f
/* Returns variable V's missing values. */
const struct missing_values *
@@
-558,7
+550,6
@@
var_set_value_labels (struct variable *v, const struct val_labs *vls)
static void
alloc_value_labels (struct variable *v)
{
static void
alloc_value_labels (struct variable *v)
{
- assert (!var_is_long_string (v));
if (v->val_labs == NULL)
v->val_labs = val_labs_create (v->width);
}
if (v->val_labs == NULL)
v->val_labs = val_labs_create (v->width);
}
@@
-571,7
+562,7
@@
var_add_value_label (struct variable *v,
const union value *value, const char *label)
{
alloc_value_labels (v);
const union value *value, const char *label)
{
alloc_value_labels (v);
- return val_labs_add (v->val_labs,
*
value, label);
+ return val_labs_add (v->val_labs, value, label);
}
/* Adds or replaces a value label with the given VALUE and LABEL
}
/* Adds or replaces a value label with the given VALUE and LABEL
@@
-582,7
+573,7
@@
var_replace_value_label (struct variable *v,
const union value *value, const char *label)
{
alloc_value_labels (v);
const union value *value, const char *label)
{
alloc_value_labels (v);
- val_labs_replace (v->val_labs,
*
value, label);
+ val_labs_replace (v->val_labs, value, label);
}
/* Removes V's value labels, if any. */
}
/* Removes V's value labels, if any. */
@@
-597,7
+588,7
@@
var_clear_value_labels (struct variable *v)
const char *
var_lookup_value_label (const struct variable *v, const union value *value)
{
const char *
var_lookup_value_label (const struct variable *v, const union value *value)
{
- return val_labs_find (v->val_labs,
*
value);
+ return val_labs_find (v->val_labs, value);
}
/* Append STR with a string representing VALUE for variable V.
}
/* Append STR with a string representing VALUE for variable V.
@@
-716,8
+707,8
@@
var_set_label (struct variable *v, const char *label)
ss_truncate (&s, 255);
if (!ss_is_empty (s))
v->label = ss_xstrdup (s);
ss_truncate (&s, 255);
if (!ss_is_empty (s))
v->label = ss_xstrdup (s);
- dict_var_changed (v);
}
}
+ dict_var_changed (v);
}
/* Removes any variable label from V. */
}
/* Removes any variable label from V. */