From: Ben Pfaff <blp@gnu.org>
Date: Sun, 6 Nov 2005 02:21:47 +0000 (+0000)
Subject: * var.h: (struct variable) Make `init', `reinit' bool values.
X-Git-Tag: v0.6.0~1145
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47106fcdfb1a24d0fff77dc0323c3c4d4a30daa4;p=pspp-builds.git

* var.h: (struct variable) Make `init', `reinit' bool values.
Rearrange fields.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 15429058..ad549b14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov  5 18:21:00 2005  Ben Pfaff  <blp@gnu.org>
+
+	* var.h: (struct variable) Make `init', `reinit' bool values.
+	Rearrange fields.
+
 Fri Nov  4 19:43:01 2005  Ben Pfaff  <blp@gnu.org>
 
 	* recode.c: Rewrote whole file, as clean-up.
diff --git a/src/var.h b/src/var.h
index ca644a4d..ae81fa8c 100644
--- a/src/var.h
+++ b/src/var.h
@@ -43,32 +43,26 @@ const char *var_type_noun (enum var_type);
 /* A variable's dictionary entry.  */
 struct variable
   {
-    /* Basic information. */
+    /* Dictionary information. */
     char name[LONG_NAME_LEN + 1]; /* Variable name.  Mixed case. */
     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. */
-    unsigned reinit : 1;        /* Cases are: 1=reinitialized; 0=left. */
-
-    /* Data for use by containing dictionary. */
-    int index;			/* Dictionary index. */
-
-    /* Missing values. */
     struct missing_values miss; /* Missing values. */
-
-    /* Display formats. */
     struct fmt_spec print;	/* Default format for PRINT. */
     struct fmt_spec write;	/* Default format for WRITE. */
-
-    /* Labels. */
     struct val_labs *val_labs;  /* Value labels. */
     char *label;		/* Variable label. */
+    enum measure measure;       /* Nominal, ordinal, or continuous. */
+    int display_width;          /* Width of data editor column. */
+    enum alignment alignment;   /* Alignment of data in GUI. */
+
+    /* Case information. */
+    int fv, nv;			/* Index into `value's, number of values. */
+    bool init;                  /* True if needs init and possibly reinit. */
+    bool reinit;                /* True: reinitialize; false: leave. */
 
-    /* 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 */
+    /* Data for use by containing dictionary. */
+    int index;			/* Dictionary index. */
 
     /* Short name, used only for system and portable file input
        and output.  Upper case only.  There is no index for short
@@ -77,7 +71,7 @@ struct variable
        string. */
     char short_name[SHORT_NAME_LEN + 1];
 
-    /* Per-command info. */
+    /* Each command may use these fields as needed. */
     void *aux;
     void (*aux_dtor) (struct variable *);
   };