[Pspp-cvs] pspp src/language/stats/ChangeLog src/language/...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/12/22 10:24:18

Modified files:
        src/language/stats: ChangeLog frequencies.q 
        tests          : automake.mk 

Log message:
        Fixed bug #17420 (table columns exceeded with /FORMAT=nolabels )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/frequencies.q?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.22&r2=1.23

Patches:
Index: src/language/stats/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/language/stats/ChangeLog        20 Dec 2006 10:10:51 -0000      1.38
+++ src/language/stats/ChangeLog        22 Dec 2006 10:24:18 -0000      1.39
@@ -1,3 +1,8 @@
+Fri Dec 22 19:22:18 WST 2006 John Darrington <address@hidden>
+
+       * frequencies.q : Fixed bug #17420, where the table bounds were overun
+       when /FORMAT=nolabels was given.
+
 Wed Dec 20 18:45:31 WST 2006 John Darrington <address@hidden>
 
        * binomial.c binomial.h : New files.  Thanks to Jason Stover 

Index: src/language/stats/frequencies.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/frequencies.q,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/language/stats/frequencies.q    20 Dec 2006 10:10:51 -0000      1.27
+++ src/language/stats/frequencies.q    22 Dec 2006 10:24:18 -0000      1.28
@@ -1100,13 +1100,19 @@
 static void
 full_dim (struct tab_table *t, struct outp_driver *d)
 {
-  int lab = cmd.labels == FRQ_LABELS;
-  int i;
+  int i = 0;
+  int columns = 5;
 
-  if (lab)
+  if (cmd.labels == FRQ_LABELS)
+    {
     t->w[0] = MIN (tab_natural_width (t, d, 0), d->prop_em_width * 15);
-  for (i = lab; i < lab + 5; i++)
+      i = 1;
+      columns ++;
+    }
+
+  for (;i < columns; i++)
     t->w[i] = MAX (tab_natural_width (t, d, i), d->prop_em_width * 8);
+
   for (i = 0; i < t->nr; i++)
     t->h[i] = d->font_height;
 }
@@ -1148,7 +1154,7 @@
     {-1, -1, NULL},
   };
 
-  int lab = cmd.labels == FRQ_LABELS;
+  const bool lab = (cmd.labels == FRQ_LABELS);
 
   vf = get_var_freqs (v);
   ft = &vf->tab;
@@ -1159,8 +1165,9 @@
 
   if (lab)
     tab_text (t, 0, 1, TAB_CENTER | TAT_TITLE, _("Value Label"));
+
   for (p = vec; p->s; p++)
-    tab_text (t, p->c - (p->r ? !lab : 0), p->r,
+    tab_text (t, lab ? p->c : p->c - 1, p->r,
                  TAB_CENTER | TAT_TITLE, gettext (p->s));
 
   r = 2;
@@ -1176,11 +1183,6 @@
 
       if (lab)
        {
-#if 0
-<<<<<<< frequencies.q
-         const char *label = val_labs_find (v->val_labs, f->value[0]);
-=======
-#endif
          const char *label = var_lookup_value_label (v, &f->value[0]);
          if (label != NULL)
            tab_text (t, 0, r, TAB_LEFT, label);

Index: tests/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/tests/automake.mk,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- tests/automake.mk   20 Dec 2006 10:10:51 -0000      1.22
+++ tests/automake.mk   22 Dec 2006 10:24:18 -0000      1.23
@@ -91,6 +91,7 @@
        tests/bugs/get.sh \
        tests/bugs/examine-1sample.sh \
        tests/bugs/examine-missing.sh \
+       tests/bugs/freq-nolabels.sh \
        tests/bugs/get-no-file.sh \
        tests/bugs/html-frequency.sh \
        tests/bugs/if_crash.sh \