Move var_set and variable parsing declarations into new header.

[pspp-builds.git] / src / data / variable.h

diff --git a/src/data/variable.h b/src/data/variable.h
index aad4fe638cd27e3543d377286ed4177a6668dbb9..8668119b35f511667ea3661a5317727d49fdf869 100644 (file)
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -125,51 +125,6 @@ struct vector
     struct variable **var;     /* Vector of variables. */
     int cnt;                   /* Number of variables. */
   };
-\f
-struct ccase;
-void dump_split_vars (const struct ccase *);
-\f
-struct var_set;
-
-struct dictionary;
-struct var_set *var_set_create_from_dict (const struct dictionary *d);
-struct var_set *var_set_create_from_array (struct variable *const *var,
-                                           size_t);
-
-size_t var_set_get_cnt (const struct var_set *vs);
-struct variable *var_set_get_var (const struct var_set *vs, size_t idx);
-struct variable *var_set_lookup_var (const struct var_set *vs,
-                                     const char *name);
-bool var_set_lookup_var_idx (const struct var_set *vs, const char *name,
-                             size_t *idx);
-void var_set_destroy (struct var_set *vs);
-\f
-/* Variable parsers. */
-
-enum
-  {
-    PV_NONE = 0,               /* No options. */
-    PV_SINGLE = 0001,          /* Restrict to a single name or TO use. */
-    PV_DUPLICATE = 0002,       /* Don't merge duplicates. */
-    PV_APPEND = 0004,          /* Append to existing list. */
-    PV_NO_DUPLICATE = 0010,    /* Error on duplicates. */
-    PV_NUMERIC = 0020,         /* Vars must be numeric. */
-    PV_STRING = 0040,          /* Vars must be string. */
-    PV_SAME_TYPE = 00100,      /* All vars must be the same type. */
-    PV_NO_SCRATCH = 00200      /* Disallow scratch variables. */
-  };
-
-struct pool;
-struct variable *parse_variable (void);
-struct variable *parse_dict_variable (const struct dictionary *);
-int parse_variables (const struct dictionary *, struct variable ***, size_t *,
-                     int opts);
-int parse_var_set_vars (const struct var_set *, struct variable ***, size_t *,
-                        int opts);
-int parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts);
-int parse_mixed_vars (char ***names, size_t *cnt, int opts);
-int parse_mixed_vars_pool (struct pool *,
-                           char ***names, size_t *cnt, int opts);
 
 
 /* Return a string representing this variable, in the form most 
@@ -179,15 +134,6 @@ int parse_mixed_vars_pool (struct pool *,
 const char * var_to_string(const struct variable *var);
 
 
-/* Two complementary functions for dealing with 
-   Very Long String variables */
-
-void copy_demangle (char *dst, size_t dst_size,
-                   const char *src, size_t src_size);
-
-void copy_mangle (char *dst, size_t dst_size,
-                 const char *src, size_t src_size);
-
 int width_to_bytes(int width);