[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/var.h
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] Changes to pspp/src/var.h |
Date: |
Fri, 04 Nov 2005 22:45:39 -0500 |
Index: pspp/src/var.h
diff -u pspp/src/var.h:1.37 pspp/src/var.h:1.38
--- pspp/src/var.h:1.37 Thu Nov 3 06:21:46 2005
+++ pspp/src/var.h Sat Nov 5 03:45:28 2005
@@ -31,19 +31,21 @@
/* Script variables. */
/* Variable type. */
-enum
+enum var_type
{
NUMERIC, /* A numeric variable. */
- ALPHA /* A string variable.
- (STRING is pre-empted by lexer.h.) */
+ ALPHA /* A string variable. */
};
+const char *var_type_adj (enum var_type);
+const char *var_type_noun (enum var_type);
+
/* A variable's dictionary entry. */
struct variable
{
/* Basic information. */
char name[LONG_NAME_LEN + 1]; /* Variable name. Mixed case. */
- int type; /* NUMERIC or ALPHA. */
+ enum var_type type; /* NUMERIC or ALPHA. */
int width; /* Size of string variables in chars. */
int fv, nv; /* Index into `value's, number of
values. */
unsigned init : 1; /* 1=VFM must init and possibly reinit. */
@@ -215,6 +217,7 @@
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 *,
@@ -223,7 +226,8 @@
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