projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: Move nesting_countdown into macro_expander.
[pspp]
/
src
/
data
/
variable.h
diff --git
a/src/data/variable.h
b/src/data/variable.h
index 3210a78f9a8456e483f7684208622e2d6339b640..a17470f26b41c6227e9107fca297911821aafecf 100644
(file)
--- a/
src/data/variable.h
+++ b/
src/data/variable.h
@@
-1,5
+1,6
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013,
+ 2014, 2020 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
@@
-22,6
+23,7
@@
#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"
+#include "data/settings.h"
/* Bitfields to identify traits of a variable */
/* Bitfields to identify traits of a variable */
@@
-49,7
+51,8
@@
union value;
instead. */
struct variable *var_create (const char *name, int width);
struct variable *var_clone (const struct variable *);
instead. */
struct variable *var_create (const char *name, int width);
struct variable *var_clone (const struct variable *);
-void var_destroy (struct variable *);
+struct variable * var_ref (struct variable *) WARN_UNUSED_RESULT;
+void var_unref (struct variable *);
/* Variable names. */
const char *var_get_name (const struct variable *);
/* Variable names. */
const char *var_get_name (const struct variable *);
@@
-93,10
+96,8
@@
const char *var_lookup_value_label (const struct variable *,
struct string;
void var_append_value_name (const struct variable *, const union value *,
struct string *);
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);
-
+void var_append_value_name__ (const struct variable *, const union value *,
+ enum settings_value_show, struct string *);
bool var_has_value_labels (const struct variable *);
const struct val_labs *var_get_value_labels (const struct variable *);
bool var_has_value_labels (const struct variable *);
const struct val_labs *var_get_value_labels (const struct variable *);
@@
-120,7
+121,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 *);
-
bool var_set_label (struct variable *, const char *label, bool issue_warning
);
+
void var_set_label (struct variable *, const char *label
);
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 *);
@@
-146,7
+147,7
@@
enum measure var_default_measure (enum val_type);
enum var_role
{
ROLE_INPUT,
enum var_role
{
ROLE_INPUT,
- ROLE_
OUTPU
T,
+ ROLE_
TARGE
T,
ROLE_BOTH,
ROLE_NONE,
ROLE_PARTITION,
ROLE_BOTH,
ROLE_NONE,
ROLE_PARTITION,
@@
-210,4
+211,7
@@
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 *);
+double var_force_valid_weight (const struct variable *wv, double w,
+ bool *warn_on_invalid);
+
#endif /* data/variable.h */
#endif /* data/variable.h */