X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.h;h=a17470f26b41c6227e9107fca297911821aafecf;hb=ed109bf498216cef15a3cbf180827dc8b20eff0b;hp=25596ad368beac821803ef074bdd3eaea3e8938d;hpb=24c5f7c629e68801492d7ca1766953a2a954a820;p=pspp diff --git a/src/data/variable.h b/src/data/variable.h index 25596ad368..a17470f26b 100644 --- a/src/data/variable.h +++ b/src/data/variable.h @@ -1,5 +1,6 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ -22,6 +23,7 @@ #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 */ @@ -49,7 +51,8 @@ union value; 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 *); @@ -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 *); - -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 *); @@ -210,4 +211,7 @@ const char *var_get_encoding (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 */