projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0a1222
)
refactoring
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 04:49:56 +0000
(21:49 -0700)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 14 Aug 2022 04:49:56 +0000
(21:49 -0700)
src/language/stats/ctables.c
patch
|
blob
|
history
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index 2b9e010bbe4a749d8a3b47aa9cd4ded1b3d4a1f4..fac05a9bc262038f2dbf7a16165772709c03c8f8 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-4740,7
+4740,7
@@
ctables_prepare_table (struct ctables_table *t)
nest->n_areas[at]--;
}
}
nest->n_areas[at]--;
}
}
-
continue
;
+
n_drop = 0
;
}
}
else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
}
}
else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
@@
-4758,11
+4758,11
@@
ctables_prepare_table (struct ctables_table *t)
nest->n_areas[at]--;
}
}
nest->n_areas[at]--;
}
}
-
continue
;
+
n_drop = 0
;
}
}
else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
}
}
else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-
continue
;
+
n_drop = 0
;
else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
{
size_t n = nest->n_areas[at];
else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
{
size_t n = nest->n_areas[at];
@@
-4771,7
+4771,7
@@
ctables_prepare_table (struct ctables_table *t)
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
-
continue
;
+
n_drop = 0
;
}
else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
continue;
}
else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
continue;
@@
-4783,7
+4783,7
@@
ctables_prepare_table (struct ctables_table *t)
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
-
continue
;
+
n_drop = 0
;
}
else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
{
}
else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
{
@@
-4793,7
+4793,7
@@
ctables_prepare_table (struct ctables_table *t)
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
-
continue
;
+
n_drop = 0
;
}
else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
{
}
else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
{
@@
-4803,7
+4803,7
@@
ctables_prepare_table (struct ctables_table *t)
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
-
continue
;
+
n_drop = 0
;
}
else
{
}
else
{