projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ONEWAY: Fix printf format specifier.
[pspp]
/
src
/
data
/
variable.h
diff --git
a/src/data/variable.h
b/src/data/variable.h
index 2752aeb325faaa03d86e92c3aa0a57a228552962..aeed5a5e09e14e63e5c2ff73d70009c8b0a0c8c7 100644
(file)
--- a/
src/data/variable.h
+++ b/
src/data/variable.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 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
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
@@
-19,9
+19,9
@@
#include <stddef.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdbool.h>
-#include
<data/dict-class.h>
-#include
<data/missing-values.h>
-#include
<data/val-type.h>
+#include
"data/dict-class.h"
+#include
"data/missing-values.h"
+#include
"data/val-type.h"
union value;
union value;
@@
-32,16
+32,10
@@
union value;
struct variable *var_create (const char *name, int width);
struct variable *var_clone (const struct variable *);
void var_destroy (struct variable *);
struct variable *var_create (const char *name, int width);
struct variable *var_clone (const struct variable *);
void var_destroy (struct variable *);
-struct variable *var_create_internal (int case_idx);
-
/* Variable names. */
/* 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 *);
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 *);
enum dict_class var_get_dict_class (const struct variable *);
int compare_vars_by_name (const void *, const void *, const void *);
@@
-69,7
+63,7
@@
bool var_has_missing_values (const struct variable *);
bool var_is_value_missing (const struct variable *, const union value *,
enum mv_class);
bool var_is_num_missing (const struct variable *, double, enum mv_class);
bool var_is_value_missing (const struct variable *, const union value *,
enum mv_class);
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);
+bool var_is_str_missing (const struct variable *, const
uint8_t
[], enum mv_class);
/* Value labels. */
const char *var_lookup_value_label (const struct variable *,
/* Value labels. */
const char *var_lookup_value_label (const struct variable *,
@@
-104,7
+98,7
@@
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 *);
/* Variable labels. */
const char *var_to_string (const struct variable *);
const char *var_get_label (const struct variable *);
-
void var_set_label (struct variable *, const char *
);
+
bool var_set_label (struct variable *, const char *label, bool issue_warning
);
void var_clear_label (struct variable *);
bool var_has_label (const struct variable *);
void var_clear_label (struct variable *);
bool var_has_label (const struct variable *);
@@
-118,6
+112,8
@@
enum measure
};
bool measure_is_valid (enum measure);
};
bool measure_is_valid (enum measure);
+const char *measure_to_string (enum measure);
+
enum measure var_get_measure (const struct variable *);
void var_set_measure (struct variable *, enum measure);
enum measure var_get_measure (const struct variable *);
void var_set_measure (struct variable *, enum measure);
@@
-134,11
+130,12
@@
enum alignment
{
ALIGN_LEFT = 0,
ALIGN_RIGHT = 1,
{
ALIGN_LEFT = 0,
ALIGN_RIGHT = 1,
- ALIGN_CENTRE = 2,
- n_ALIGN
+ ALIGN_CENTRE = 2
};
bool alignment_is_valid (enum alignment);
};
bool alignment_is_valid (enum alignment);
+const char *alignment_to_string (enum alignment);
+
enum alignment var_get_alignment (const struct variable *);
void var_set_alignment (struct variable *, enum alignment);
enum alignment var_get_alignment (const struct variable *);
void var_set_alignment (struct variable *, enum alignment);
@@
-168,16
+165,14
@@
void var_clear_aux (struct variable *);
void *var_detach_aux (struct variable *);
void var_dtor_free (struct variable *);
void *var_detach_aux (struct variable *);
void var_dtor_free (struct variable *);
-/* Observed categorical values. */
-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 *);
-
/* Custom attributes. */
struct attrset *var_get_attributes (const struct variable *);
void var_set_attributes (struct variable *, const struct attrset *);
bool var_has_attributes (const struct variable *);
/* Custom attributes. */
struct attrset *var_get_attributes (const struct variable *);
void var_set_attributes (struct variable *, const struct attrset *);
bool var_has_attributes (const struct variable *);
+/* Encoding. */
+const char *var_get_encoding (const struct variable *);
+
/* Function types. */
typedef bool var_predicate_func (const struct variable *);
/* Function types. */
typedef bool var_predicate_func (const struct variable *);