pxd: initial work

[pspp] / src / data / variable.h

diff --git a/src/data/variable.h b/src/data/variable.h
index e8f5f101469c1514587b0f24d9b053df5919f3fa..d2b905ad7359c9fd9e66c12efbbfcfd9bb3b3bfd 100644 (file)
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -1,5 +1,5 @@
 /* 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 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
@@ -120,7 +120,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 *);
-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 *);
 
@@ -145,10 +145,10 @@ enum measure var_default_measure (enum val_type);
 /* Intended usage of a variable, for populating dialogs. */
 enum var_role
   {
-    ROLE_NONE,
     ROLE_INPUT,
-    ROLE_OUTPUT,
+    ROLE_TARGET,
     ROLE_BOTH,
+    ROLE_NONE,
     ROLE_PARTITION,
     ROLE_SPLIT
   };
@@ -210,4 +210,8 @@ const char *var_get_encoding (const struct variable *);
 /* Function types. */
 typedef bool var_predicate_func (const struct variable *);
 
+/* Saving and loading. */
+struct pxd_object *var_save (const struct variable *, struct pxd *);
+struct variable *var_load (struct pxd_object *, const struct pxd *);
+
 #endif /* data/variable.h */