X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvar.h;h=f13606be9f546ebf8b14c143d6b0c5ab0de317aa;hb=05e356b2a3087e819ef3b5388e29c822f41502e1;hp=680a4c3cce76fb7082a1a5a4a25195d9f9504326;hpb=a7cc8b259f0fe963aa30d4e64f7d39551ded1454;p=pspp-builds.git diff --git a/src/var.h b/src/var.h index 680a4c3c..f13606be 100644 --- a/src/var.h +++ b/src/var.h @@ -20,11 +20,15 @@ #if !var_h #define var_h 1 + #include +#include "config.h" #include "bool.h" #include "format.h" #include "val.h" + + /* Script variables. */ /* Variable type. */ @@ -54,12 +58,12 @@ enum MISSING_COUNT }; -#define MAX_VAR_NAME_LEN 8 /* A variable's dictionary entry. */ struct variable { - char name[MAX_VAR_NAME_LEN + 1]; /* As a string. */ + char name[SHORT_NAME_LEN + 1]; /* As a string. */ + char *longname; /* Pointer to entry in dictionary's table */ int index; /* Index into its dictionary's var[]. */ int type; /* NUMERIC or ALPHA. */ @@ -80,14 +84,34 @@ struct variable struct val_labs *val_labs; /* Value labels. */ char *label; /* Variable label. */ + + /* GUI display parameters */ + enum measure measure; /* Nominal ordinal or continuous */ + int display_width; /* Width of data editor column */ + enum alignment alignment; /* Alignment of data in gui */ + /* Per-command info. */ void *aux; void (*aux_dtor) (struct variable *); }; + +/* A tuple containing short names and longnames */ +struct name_table_entry +{ + char *longname; + char *name; +}; + bool var_is_valid_name (const char *, bool issue_error); int compare_var_names (const void *, const void *, void *); unsigned hash_var_name (const void *, void *); + + +unsigned hash_long_name (const void *e_, void *aux UNUSED) ; +int compare_long_names(const void *a_, const void *b_, void *aux); + + int compare_var_ptr_names (const void *, const void *, void *); unsigned hash_var_ptr_name (const void *, void *); @@ -112,7 +136,7 @@ const char *dict_class_to_name (enum dict_class dict_class); struct vector { int idx; /* Index for dict_get_vector(). */ - char name[9]; /* Name. */ + char name[SHORT_NAME_LEN + 1]; /* Name. */ struct variable **var; /* Vector of variables. */ int cnt; /* Number of variables. */ };