X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fvar.h;h=63296b9f4b35c6554e3c244c12d9c934a05b2110;hb=e35ff8ccb29404f2098e6f2fccace1c99c61b7be;hp=60b374ecfc0c16cdc33b32df80409a02e45fd157;hpb=ae692b0ac5ceff417fa9e9fc136d95acae3e99e1;p=pspp

diff --git a/src/var.h b/src/var.h
index 60b374ecfc..63296b9f4b 100644
--- a/src/var.h
+++ b/src/var.h
@@ -20,10 +20,15 @@
 #if !var_h
 #define var_h 1
 
+
 #include <stddef.h>
+#include "config.h"
+#include "bool.h"
 #include "format.h"
 #include "val.h"
 
+
+
 /* Script variables. */
 
 /* Variable type. */
@@ -53,10 +58,12 @@ enum
     MISSING_COUNT
   };
 
+
 /* A variable's dictionary entry.  */
 struct variable
   {
-    char name[9];		/* 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. */
 
@@ -77,13 +84,37 @@ 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 *);
+
+/* Destroy and free up an nte */
+void free_nte(struct name_table_entry *nte);
+
+
+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 *);
 
@@ -108,7 +139,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. */
   };