X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.h;h=c7f86aaf716896541de0909829e8039527627e47;hb=5ee84736663824fe12474b78dace867e42893a14;hp=9cc2b844c9698e08d8ecea96f059cc11fcf332a3;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git
diff --git a/src/data/variable.h b/src/data/variable.h
index 9cc2b844..c7f86aaf 100644
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -14,40 +14,33 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-#if !variable_h
-#define variable_h 1
+#ifndef DATA_VARIABLE_H
+#define DATA_VARIABLE_H 1
#include
#include
+#include
#include
+#include
union value;
-/* Variable type. */
-enum var_type
- {
- VAR_NUMERIC, /* A numeric variable. */
- VAR_STRING /* A string variable. */
- };
-
-bool var_type_is_valid (enum var_type);
-enum var_type var_type_from_width (int width);
-
-/* Variables. */
+/* Variables.
+ These functions should rarely be called directly: use
+ dict_create_var, dict_clone_var, or dict_delete_var
+ instead. */
struct variable *var_create (const char *name, int width);
struct variable *var_clone (const struct variable *);
void var_destroy (struct variable *);
-/* Variable names.
- Long variable names can be used in most contexts, but a few
- procedures and file formats are limited to short names. */
-#define SHORT_NAME_LEN 8
-#define LONG_NAME_LEN 64
+/* Variable names. */
+#define VAR_NAME_LEN 64 /* Maximum length of variable name, in bytes. */
const char *var_get_name (const struct variable *);
void var_set_name (struct variable *, const char *);
bool var_is_valid_name (const char *, bool issue_error);
bool var_is_plausible_name (const char *name, bool issue_error);
+enum dict_class var_get_dict_class (const struct variable *);
int compare_vars_by_name (const void *, const void *, const void *);
unsigned hash_var_by_name (const void *, const void *);
@@ -55,17 +48,16 @@ unsigned hash_var_by_name (const void *, const void *);
int compare_var_ptrs_by_name (const void *, const void *, const void *);
unsigned hash_var_ptr_by_name (const void *, const void *);
-/* Variable types and widths. */
-enum var_type var_get_type (const struct variable *);
+/* Types and widths of values associated with a variable. */
+enum val_type var_get_type (const struct variable *);
int var_get_width (const struct variable *);
void var_set_width (struct variable *, int width);
-typedef bool var_predicate_func (const struct variable *);
-
bool var_is_numeric (const struct variable *);
bool var_is_alpha (const struct variable *);
bool var_is_short_string (const struct variable *);
bool var_is_long_string (const struct variable *);
+
size_t var_get_value_cnt (const struct variable *);
/* Variables' missing values. */
@@ -80,17 +72,25 @@ bool var_is_num_missing (const struct variable *, double, enum mv_class);
bool var_is_str_missing (const struct variable *, const char[], enum mv_class);
/* Value labels. */
-const struct val_labs *var_get_value_labels (const struct variable *);
+const char *var_lookup_value_label (const struct variable *,
+ const union value *);
+struct string;
+void var_append_value_name (const struct variable *, const union value *,
+ struct string *);
+
+const char *
+var_get_value_name (const struct variable *v, const union value *value);
+
+
bool var_has_value_labels (const struct variable *);
+const struct val_labs *var_get_value_labels (const struct variable *);
void var_set_value_labels (struct variable *, const struct val_labs *);
+
bool var_add_value_label (struct variable *,
const union value *, const char *);
void var_replace_value_label (struct variable *,
const union value *, const char *);
void var_clear_value_labels (struct variable *);
-const char *var_lookup_value_label (const struct variable *,
- const union value *);
-const char *var_get_value_name (const struct variable *, const union value *);
/* Print and write formats. */
const struct fmt_spec *var_get_print_format (const struct variable *);
@@ -99,6 +99,8 @@ const struct fmt_spec *var_get_write_format (const struct variable *);
void var_set_write_format (struct variable *, const struct fmt_spec *);
void var_set_both_formats (struct variable *, const struct fmt_spec *);
+struct fmt_spec var_default_formats (int width);
+
/* Variable labels. */
const char *var_to_string (const struct variable *);
const char *var_get_label (const struct variable *);
@@ -119,10 +121,14 @@ bool measure_is_valid (enum measure);
enum measure var_get_measure (const struct variable *);
void var_set_measure (struct variable *, enum measure);
+enum measure var_default_measure (enum val_type);
+
/* GUI display width. */
int var_get_display_width (const struct variable *);
void var_set_display_width (struct variable *, int display_width);
+int var_default_display_width (int width);
+
/* Alignment of data for display. */
enum alignment
{
@@ -136,6 +142,8 @@ bool alignment_is_valid (enum alignment);
enum alignment var_get_alignment (const struct variable *);
void var_set_alignment (struct variable *, enum alignment);
+enum alignment var_default_alignment (enum val_type);
+
/* Whether variables' values should be preserved from case to
case. */
bool var_get_leave (const struct variable *);
@@ -143,9 +151,10 @@ void var_set_leave (struct variable *, bool leave);
bool var_must_leave (const struct variable *);
/* Short names. */
-const char *var_get_short_name (const struct variable *);
-void var_set_short_name (struct variable *, const char *);
-void var_clear_short_name (struct variable *);
+size_t var_get_short_name_cnt (const struct variable *);
+const char *var_get_short_name (const struct variable *, size_t idx);
+void var_set_short_name (struct variable *, size_t, const char *);
+void var_clear_short_names (struct variable *);
/* Relationship with dictionary. */
size_t var_get_dict_index (const struct variable *);
@@ -164,15 +173,7 @@ struct cat_vals *var_get_obs_vals (const struct variable *);
void var_set_obs_vals (const struct variable *, struct cat_vals *);
bool var_has_obs_vals (const struct variable *);
-/* Classes of variables. */
-enum dict_class
- {
- DC_ORDINARY, /* Ordinary identifier. */
- DC_SYSTEM, /* System variable. */
- DC_SCRATCH /* Scratch variable. */
- };
-
-enum dict_class dict_class_from_id (const char *name);
-const char *dict_class_to_name (enum dict_class dict_class);
+/* Function types. */
+typedef bool var_predicate_func (const struct variable *);
-#endif /* !variable.h */
+#endif /* data/variable.h */