X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.h;h=44cfba703fe56a162f9bd6f418cb311df95c27d1;hb=679e253a4777564db48ccec70b8ce2f6e5b7e46b;hp=88d9b5a78bc96dcafa54ddaa0ced42b3d2e76156;hpb=9f650fc3d2946c216e6cd3c7922a8a63d0f97117;p=pspp-builds.git

diff --git a/src/data/variable.h b/src/data/variable.h
index 88d9b5a7..44cfba70 100644
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #if !variable_h
 #define variable_h 1
@@ -61,6 +59,9 @@ unsigned hash_var_ptr_by_name (const void *, const void *);
 enum var_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 *);
@@ -122,8 +123,10 @@ void var_set_measure (struct variable *, enum measure);
 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 
+enum alignment
   {
     ALIGN_LEFT = 0,
     ALIGN_RIGHT = 1,
@@ -142,9 +145,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 *);
@@ -152,7 +156,7 @@ size_t var_get_case_index (const struct variable *);
 
 /* Variable auxiliary data. */
 void *var_get_aux (const struct variable *);
-void *var_attach_aux (struct variable *,
+void *var_attach_aux (const struct variable *,
                       void *aux, void (*aux_dtor) (struct variable *));
 void var_clear_aux (struct variable *);
 void *var_detach_aux (struct variable *);
@@ -160,11 +164,11 @@ void var_dtor_free (struct variable *);
 
 /* Observed categorical values. */
 struct cat_vals *var_get_obs_vals (const struct variable *);
-void var_set_obs_vals (struct variable *, struct cat_vals *);
+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 
+enum dict_class
   {
     DC_ORDINARY,                /* Ordinary identifier. */
     DC_SYSTEM,                  /* System variable. */