projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
data
/
variable.h
diff --git
a/src/data/variable.h
b/src/data/variable.h
index ecfa6b765ec8447da8ce58f53506d77035cf2bec..03257502a9b28437f802b61d28e74f24cd23f360 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 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,8
+32,6
@@
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. */
#define VAR_NAME_LEN 64 /* Maximum length of variable name, in bytes. */
/* Variable names. */
#define VAR_NAME_LEN 64 /* Maximum length of variable name, in bytes. */
@@
-59,10
+57,6
@@
void var_set_width (struct variable *, int width);
bool var_is_numeric (const struct variable *);
bool var_is_alpha (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. */
const struct missing_values *var_get_missing_values (const struct variable *);
/* Variables' missing values. */
const struct missing_values *var_get_missing_values (const struct variable *);
@@
-73,7
+67,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 *,
@@
-172,16
+166,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 *);