continue;
nest->areas[at][nest->n_areas[at]++] = k;
}
- else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a)
- {
- for (size_t k = nest->n - 1; k < nest->n; k--)
- {
- if (k == nest->scale_idx)
- continue;
- nest->areas[at][nest->n_areas[at]++] = k;
- break;
- }
- continue;
- }
- else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
- {
- for (size_t k = nest->n - 1; k < nest->n; k--)
- {
- if (k == nest->scale_idx)
- continue;
- nest->areas[at][nest->n_areas[at]++] = k;
- break;
- }
- continue;
- }
- else if (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER)
+ else if ((at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a)
+ || (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
+ || (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER))
{
for (size_t k = nest->n - 1; k < nest->n; k--)
{
nest->n_areas[at]--;
}
}
- continue;
+ n_drop = 0;
}
}
else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
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)
- 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];
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;
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)
{
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)
{
nest->areas[at][n - 2] = nest->areas[at][n - 1];
nest->n_areas[at]--;
}
- continue;
+ n_drop = 0;
}
else
{