X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.c;h=2ceeb0d0e9610a6396d58246db942ed8c0302ac1;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=dd5e6152f3f42a13bc4b7b71a848eb9caadd818b;hpb=844259de34f3b5ed9c1b4a024da63f96f4f2194e;p=pspp-builds.git
diff --git a/src/data/variable.c b/src/data/variable.c
index dd5e6152..2ceeb0d0 100644
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 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
@@ -15,29 +15,28 @@
along with this program. If not, see . */
#include
-#include "variable.h"
+
+#include "data/variable.h"
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/attributes.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/identifier.h"
+#include "data/missing-values.h"
+#include "data/value-labels.h"
+#include "data/vardict.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -46,7 +45,7 @@
struct variable
{
/* Dictionary information. */
- char name[VAR_NAME_LEN + 1]; /* Variable name. Mixed case. */
+ char *name; /* Variable name. Mixed case. */
int width; /* 0 for numeric, otherwise string width. */
struct missing_values miss; /* Missing values. */
struct fmt_spec print; /* Default format for PRINT. */
@@ -63,7 +62,7 @@ struct variable
bool leave; /* Leave value from case to case? */
/* Data for use by containing dictionary. */
- struct vardict_info vardict;
+ struct vardict_info *vardict;
/* Used only for system and portable file input and output.
See short-names.h. */
@@ -74,11 +73,6 @@ struct variable
void *aux;
void (*aux_dtor) (struct variable *);
- /* Values of a categorical variable. Procedures need
- vectors with binary entries, so any variable of type ALPHA will
- have its values stored here. */
- struct cat_vals *obs_vals;
-
/* Custom attributes. */
struct attrset attributes;
};
@@ -96,7 +90,8 @@ var_create (const char *name, int width)
assert (width >= 0 && width <= MAX_STRING);
v = xmalloc (sizeof *v);
- v->vardict.dict_index = v->vardict.case_index = -1;
+ v->vardict = NULL;
+ v->name = NULL;
var_set_name (v, name);
v->width = width;
mv_init (&v->miss, width);
@@ -112,7 +107,6 @@ var_create (const char *name, int width)
v->short_name_cnt = 0;
v->aux = NULL;
v->aux_dtor = NULL;
- v->obs_vals = NULL;
attrset_init (&v->attributes);
return v;
@@ -127,8 +121,7 @@ var_create (const char *name, int width)
- The new variable is not added to OLD_VAR's dictionary by
default. Use dict_clone_var, instead, to do that.
-
- - Auxiliary data and obs_vals are not copied. */
+*/
struct variable *
var_clone (const struct variable *old_var)
{
@@ -159,11 +152,11 @@ var_destroy (struct variable *v)
{
assert (!var_has_vardict (v));
mv_destroy (&v->miss);
- cat_stored_values_destroy (v->obs_vals);
var_clear_short_names (v);
var_clear_aux (v);
val_labs_destroy (v->val_labs);
var_clear_label (v);
+ free (v->name);
free (v);
}
}
@@ -183,10 +176,11 @@ var_get_name (const struct variable *v)
void
var_set_name (struct variable *v, const char *name)
{
- assert (v->vardict.dict_index == -1);
+ assert (!var_has_vardict (v));
assert (var_is_plausible_name (name, false));
- str_copy_trunc (v->name, sizeof v->name, name);
+ free (v->name);
+ v->name = xstrdup (name);
dict_var_changed (v);
}
@@ -199,8 +193,6 @@ var_is_valid_name (const char *name, bool issue_error)
bool plausible;
size_t length, i;
- assert (name != NULL);
-
/* Note that strlen returns number of BYTES, not the number of
CHARACTERS */
length = strlen (name);
@@ -246,8 +238,6 @@ var_is_plausible_name (const char *name, bool issue_error)
{
size_t length;
- assert (name != NULL);
-
/* Note that strlen returns number of BYTES, not the number of
CHARACTERS */
length = strlen (name);
@@ -519,8 +509,8 @@ alloc_value_labels (struct variable *v)
}
/* Attempts to add a value label with the given VALUE and LABEL
- to V. Returns true if successful, false if VALUE has an
- existing label or if V is a long string variable. */
+ to V. Returns true if successful, false otherwise (probably
+ due to an existing label). */
bool
var_add_value_label (struct variable *v,
const union value *value, const char *label)
@@ -531,7 +521,7 @@ var_add_value_label (struct variable *v,
/* Adds or replaces a value label with the given VALUE and LABEL
to V.
- Has no effect if V is a long string variable. */
+*/
void
var_replace_value_label (struct variable *v,
const union value *value, const char *label)
@@ -849,7 +839,6 @@ var_get_short_name (const struct variable *var, size_t idx)
void
var_set_short_name (struct variable *var, size_t idx, const char *short_name)
{
- assert (var != NULL);
assert (short_name == NULL || var_is_plausible_name (short_name, false));
/* Clear old short name numbered IDX, if any. */
@@ -900,8 +889,8 @@ var_clear_short_names (struct variable *v)
size_t
var_get_dict_index (const struct variable *v)
{
- assert (v->vardict.dict_index != -1);
- return v->vardict.dict_index;
+ assert (var_has_vardict (v));
+ return vardict_get_dict_index (v->vardict);
}
/* Returns V's index within the case represented by its
@@ -911,8 +900,8 @@ var_get_dict_index (const struct variable *v)
size_t
var_get_case_index (const struct variable *v)
{
- assert (v->vardict.case_index != -1);
- return v->vardict.case_index;
+ assert (var_has_vardict (v));
+ return vardict_get_case_index (v->vardict);
}
/* Returns V's auxiliary data, or a null pointer if none has been
@@ -955,7 +944,6 @@ var_detach_aux (struct variable *v)
void
var_clear_aux (struct variable *v)
{
- assert (v != NULL);
if (v->aux != NULL)
{
if (v->aux_dtor != NULL)
@@ -973,35 +961,6 @@ var_dtor_free (struct variable *v)
free (v->aux);
}
-/* Observed categorical values. */
-
-/* Returns V's observed categorical values,
- which V must have. */
-struct cat_vals *
-var_get_obs_vals (const struct variable *v)
-{
- assert (v->obs_vals != NULL);
- return v->obs_vals;
-}
-
-/* Sets V's observed categorical values to CAT_VALS.
- V becomes the owner of CAT_VALS. */
-void
-var_set_obs_vals (const struct variable *v_, struct cat_vals *cat_vals)
-{
- struct variable *v = CONST_CAST (struct variable *, v_ );
- cat_stored_values_destroy (v->obs_vals);
- v->obs_vals = cat_vals;
-}
-
-/* Returns true if V has observed categorical values,
- false otherwise. */
-bool
-var_has_obs_vals (const struct variable *v)
-{
- return v->obs_vals != NULL;
-}
-
/* Returns variable V's attribute set. The caller may examine or
modify the attribute set, but must not destroy it. Destroying
V, or calling var_set_attributes() on V, will also destroy its
@@ -1033,37 +992,35 @@ var_has_attributes (const struct variable *v)
const char *
var_get_encoding (const struct variable *var)
{
- return var_has_vardict (var) ? dict_get_encoding (var->vardict.dict) : NULL;
+ return (var_has_vardict (var)
+ ? dict_get_encoding (vardict_get_dictionary (var->vardict))
+ : NULL);
}
/* Returns V's vardict structure. */
-const struct vardict_info *
+struct vardict_info *
var_get_vardict (const struct variable *v)
{
- assert (var_has_vardict (v));
- return &v->vardict;
+ return CONST_CAST (struct vardict_info *, v->vardict);
}
/* Sets V's vardict data to VARDICT. */
void
-var_set_vardict (struct variable *v, const struct vardict_info *vardict)
+var_set_vardict (struct variable *v, struct vardict_info *vardict)
{
- assert (vardict->dict_index >= 0);
- assert (vardict->case_index >= 0);
- assert (vardict->dict != NULL);
- v->vardict = *vardict;
+ v->vardict = vardict;
}
/* Returns true if V has vardict data. */
bool
var_has_vardict (const struct variable *v)
{
- return v->vardict.dict_index != -1;
+ return v->vardict != NULL;
}
/* Clears V's vardict data. */
void
var_clear_vardict (struct variable *v)
{
- v->vardict.dict_index = v->vardict.case_index = -1;
+ v->vardict = NULL;
}