#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/mrset.h"
+#include "data/value-labels.h"
#include "language/command.h"
#include "language/lexer/format-parser.h"
#include "language/lexer/lexer.h"
};
};
-enum ctables_label_position
- {
- CTLP_NORMAL,
- CTLP_OPPOSITE,
- CTLP_LAYER,
- };
-
struct ctables_summary_spec_set
{
struct ctables_summary_spec *specs;
size_t n;
};
+struct ctables_value
+ {
+ struct hmap_node node;
+ union value value;
+ };
+
struct ctables_table
{
struct ctables_axis *axes[PIVOT_N_AXES];
struct hmap cells;
struct hmap domains[N_CTDTS];
- enum pivot_axis_type slabels_position;
+ const struct variable *clabels_example;
+ struct hmap clabels_values_map;
+ union value *clabels_values;
+
+ enum pivot_axis_type slabels_axis;
bool slabels_visible;
- enum ctables_label_position row_labels;
- enum ctables_label_position col_labels;
+ /* The innermost category labels for axis 'a' appear on axis label_axis[a].
+
+ Most commonly, label_axis[a] == a, and in particular we always have
+ label_axis{PIVOT_AXIS_LAYER] == PIVOT_AXIS_LAYER.
+
+ If ROWLABELS or COLLABELS is specified, then one of
+ label_axis[PIVOT_AXIS_ROW] or label_axis[PIVOT_AXIS_COLUMN] can be the
+ opposite axis or PIVOT_AXIS_LAYER. Only one of them will differ.
+ */
+ enum pivot_axis_type label_axis[PIVOT_N_AXES];
/* Indexed by variable dictionary index. */
struct ctables_categories **categories;
}
}
+static bool
+ctables_category_equal (const struct ctables_category *a,
+ const struct ctables_category *b)
+{
+ if (a->type != b->type)
+ return false;
+
+ switch (a->type)
+ {
+ case CCT_NUMBER:
+ return a->number == b->number;
+
+ case CCT_STRING:
+ return strcmp (a->string, b->string);
+
+ case CCT_RANGE:
+ return a->range[0] == b->range[0] && a->range[1] == b->range[1];
+
+ case CCT_MISSING:
+ case CCT_OTHERNM:
+ return true;
+
+ case CCT_SUBTOTAL:
+ case CCT_HSUBTOTAL:
+ case CCT_TOTAL:
+ return !strcmp (a->total_label, b->total_label);
+
+ case CCT_VALUE:
+ case CCT_LABEL:
+ case CCT_FUNCTION:
+ return (a->include_missing == b->include_missing
+ && a->sort_ascending == b->sort_ascending
+ && a->sort_function == b->sort_function
+ && a->sort_var == b->sort_var
+ && a->percentile == b->percentile);
+ }
+
+ NOT_REACHED ();
+}
+
static void
ctables_categories_unref (struct ctables_categories *c)
{
free (c);
}
+static bool
+ctables_categories_equal (const struct ctables_categories *a,
+ const struct ctables_categories *b)
+{
+ if (a->n_cats != b->n_cats || a->show_empty != b->show_empty)
+ return false;
+
+ for (size_t i = 0; i < a->n_cats; i++)
+ if (!ctables_category_equal (&a->cats[i], &b->cats[i]))
+ return false;
+
+ return true;
+}
+
/* Chi-square test (SIGTEST). */
struct ctables_chisq
{
struct msg_location *loc = lex_ofs_location (ctx->lexer, start_ofs,
lex_ofs (ctx->lexer) - 1);
- printf ("add %s\n", ctables_summary_function_name (function));
add_summary_spec (sub, function, percentile, label, formatp, loc, sv);
free (label);
msg_location_destroy (loc);
struct merge_item
{
- size_t tiebreaker;
const struct ctables_summary_spec_set *set;
size_t ofs;
};
pivot_table_submit (pt);
}
-
static void
ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t)
{
struct ctables_cell *cell = sorted[j];
const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].stack_idx];
+ /* Pivot categories:
+
+ - variable label for nest->vars[0], if vlabel != CTVL_NONE
+ - category for nest->vars[0]
+ - variable label for nest->vars[1], if vlabel != CTVL_NONE
+ - category for nest->vars[1]
+ ...
+ - variable label for nest->vars[nest->n - 1], if vlabel != CTVL_NONE
+ - category for nest->vars[nest->n - 1], unless axis A's
+ labels are moved to another axis
+ - summary function, if 'a == t->summary_axis && t->slabels_axis ==
+ t->summary_axis'
+
+ Additional dimensions:
+
+ - If 't->slabels_axis != t->summary_axis', add a summary dimension
+ to t->slabels_axis.
+ - If 't->row_labels ==
+
+ */
+
size_t n_common = 0;
bool new_subtable = false;
if (j > 0)
&cell->axes[a].cvs[k].value));
if (k == nest->n - 1)
{
- if (a == t->summary_axis)
+ if (a == t->slabels_axis)
{
if (label)
parent = pivot_category_create_group__ (parent, label);
- const struct ctables_summary_spec_set *specs = &nest->specs[cell->sv];
+ const struct ctables_summary_spec_set *specs = &t->summary_specs;
for (size_t m = 0; m < specs->n; m++)
{
int leaf = pivot_category_create_leaf (
}
else
{
- /* This assertion is true as long as the summary axis
- is the axis where the summaries are displayed. */
- assert (label);
-
- prev_leaf = pivot_category_create_leaf (parent, label);
+ prev_leaf = pivot_category_create_leaf (parent, label ? label : pivot_value_new_user_text ("text", SIZE_MAX));
}
break;
}
free (sorted);
free (groups);
}
- struct ctables_cell *cell;
- HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
- {
- if (cell->hide)
- continue;
-
- const struct ctables_nest *nest = &t->stacks[t->summary_axis].nests[cell->axes[t->summary_axis].stack_idx];
- const struct ctables_summary_spec_set *specs = &nest->specs[cell->sv];
- for (size_t j = 0; j < specs->n; j++)
- {
- size_t dindexes[3];
- size_t n_dindexes = 0;
-
- for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
- if (d[a])
- {
- int leaf = cell->axes[a].leaf;
- if (a == t->summary_axis)
- leaf += j;
- dindexes[n_dindexes++] = leaf;
- }
-
- double d = ctables_summary_value (cell, &cell->summaries[j], &specs->specs[j]);
- struct pivot_value *value = pivot_value_new_number (d);
- value->numeric.format = specs->specs[j].format;
- pivot_table_put (pt, dindexes, n_dindexes, value);
- }
- }
-
pivot_table_submit (pt);
}
-static bool
-ctables_execute (struct dataset *ds, struct ctables *ct)
+static void
+ctables_prepare_table (struct ctables_table *t)
{
- for (size_t i = 0; i < ct->n_tables; i++)
- {
- struct ctables_table *t = ct->tables[i];
- for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
- if (t->axes[a])
- {
- t->stacks[a] = enumerate_fts (a, t->axes[a]);
+ for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
+ if (t->axes[a])
+ {
+ t->stacks[a] = enumerate_fts (a, t->axes[a]);
- for (size_t j = 0; j < t->stacks[a].n; j++)
+ for (size_t j = 0; j < t->stacks[a].n; j++)
+ {
+ struct ctables_nest *nest = &t->stacks[a].nests[j];
+ for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
{
- struct ctables_nest *nest = &t->stacks[a].nests[j];
- for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
+ nest->domains[dt] = xmalloc (nest->n * sizeof *nest->domains[dt]);
+ nest->n_domains[dt] = 0;
+
+ for (size_t k = 0; k < nest->n; k++)
{
- nest->domains[dt] = xmalloc (nest->n * sizeof *nest->domains[dt]);
- nest->n_domains[dt] = 0;
+ if (k == nest->scale_idx)
+ continue;
- for (size_t k = 0; k < nest->n; k++)
+ switch (dt)
{
- if (k == nest->scale_idx)
- continue;
+ case CTDT_TABLE:
+ continue;
- switch (dt)
+ case CTDT_LAYER:
+ if (a != PIVOT_AXIS_LAYER)
+ continue;
+ break;
+
+ case CTDT_SUBTABLE:
+ case CTDT_ROW:
+ case CTDT_COL:
+ if (dt == CTDT_SUBTABLE ? a != PIVOT_AXIS_LAYER
+ : dt == CTDT_ROW ? a == PIVOT_AXIS_COLUMN
+ : a == PIVOT_AXIS_ROW)
{
- case CTDT_TABLE:
- continue;
-
- case CTDT_LAYER:
- if (a != PIVOT_AXIS_LAYER)
- continue;
- break;
-
- case CTDT_SUBTABLE:
- case CTDT_ROW:
- case CTDT_COL:
- if (dt == CTDT_SUBTABLE ? a != PIVOT_AXIS_LAYER
- : dt == CTDT_ROW ? a == PIVOT_AXIS_COLUMN
- : a == PIVOT_AXIS_ROW)
- {
- if (k == nest->n - 1
- || (nest->scale_idx == nest->n - 1
- && k == nest->n - 2))
- continue;
- }
- break;
-
- case CTDT_LAYERROW:
- if (a == PIVOT_AXIS_COLUMN)
+ if (k == nest->n - 1
+ || (nest->scale_idx == nest->n - 1
+ && k == nest->n - 2))
continue;
- break;
-
- case CTDT_LAYERCOL:
- if (a == PIVOT_AXIS_ROW)
- continue;
- break;
}
+ break;
+
+ case CTDT_LAYERROW:
+ if (a == PIVOT_AXIS_COLUMN)
+ continue;
+ break;
- nest->domains[dt][nest->n_domains[dt]++] = k;
+ case CTDT_LAYERCOL:
+ if (a == PIVOT_AXIS_ROW)
+ continue;
+ break;
}
+
+ nest->domains[dt][nest->n_domains[dt]++] = k;
}
}
}
- else
- {
- struct ctables_nest *nest = xmalloc (sizeof *nest);
- *nest = (struct ctables_nest) { .n = 0 };
- t->stacks[a] = (struct ctables_stack) { .nests = nest, .n = 1 };
- }
+ }
+ else
+ {
+ struct ctables_nest *nest = xmalloc (sizeof *nest);
+ *nest = (struct ctables_nest) { .n = 0 };
+ t->stacks[a] = (struct ctables_stack) { .nests = nest, .n = 1 };
+ }
- struct ctables_stack *stack = &t->stacks[t->summary_axis];
- for (size_t i = 0; i < stack->n; i++)
+ struct ctables_stack *stack = &t->stacks[t->summary_axis];
+ for (size_t i = 0; i < stack->n; i++)
+ {
+ struct ctables_nest *nest = &stack->nests[i];
+ if (!nest->specs[CSV_CELL].n)
{
- struct ctables_nest *nest = &stack->nests[i];
- if (!nest->specs[CSV_CELL].n)
- {
- struct ctables_summary_spec_set *specs = &nest->specs[CSV_CELL];
- specs->specs = xmalloc (sizeof *specs->specs);
- specs->n = 1;
-
- enum ctables_summary_function function
- = specs->var ? CTSF_MEAN : CTSF_COUNT;
- struct ctables_var var = { .is_mrset = false, .var = specs->var };
-
- *specs->specs = (struct ctables_summary_spec) {
- .function = function,
- .format = ctables_summary_default_format (function, &var),
- .label = ctables_summary_default_label (function, 0),
- };
- if (!specs->var)
- specs->var = nest->vars[0];
+ struct ctables_summary_spec_set *specs = &nest->specs[CSV_CELL];
+ specs->specs = xmalloc (sizeof *specs->specs);
+ specs->n = 1;
+
+ enum ctables_summary_function function
+ = specs->var ? CTSF_MEAN : CTSF_COUNT;
+ struct ctables_var var = { .is_mrset = false, .var = specs->var };
+
+ *specs->specs = (struct ctables_summary_spec) {
+ .function = function,
+ .format = ctables_summary_default_format (function, &var),
+ .label = ctables_summary_default_label (function, 0),
+ };
+ if (!specs->var)
+ specs->var = nest->vars[0];
- ctables_summary_spec_set_clone (&nest->specs[CSV_TOTAL],
- &nest->specs[CSV_CELL]);
- }
- else if (!nest->specs[CSV_TOTAL].n)
- ctables_summary_spec_set_clone (&nest->specs[CSV_TOTAL],
- &nest->specs[CSV_CELL]);
+ ctables_summary_spec_set_clone (&nest->specs[CSV_TOTAL],
+ &nest->specs[CSV_CELL]);
}
+ else if (!nest->specs[CSV_TOTAL].n)
+ ctables_summary_spec_set_clone (&nest->specs[CSV_TOTAL],
+ &nest->specs[CSV_CELL]);
+ }
- struct ctables_summary_spec_set *merged = &t->summary_specs;
- struct merge_item *items = xnmalloc (2 * stack->n, sizeof *items);
- size_t n_left = 0;
- for (size_t j = 0; j < stack->n; j++)
- {
- const struct ctables_nest *nest = &stack->nests[j];
- if (!nest->n)
- continue;
+ struct ctables_summary_spec_set *merged = &t->summary_specs;
+ struct merge_item *items = xnmalloc (2 * stack->n, sizeof *items);
+ size_t n_left = 0;
+ for (size_t j = 0; j < stack->n; j++)
+ {
+ const struct ctables_nest *nest = &stack->nests[j];
+ if (nest->n)
+ for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
+ items[n_left++] = (struct merge_item) { .set = &nest->specs[sv] };
+ }
- for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
- {
- items[n_left] = (struct merge_item) {
- .tiebreaker = n_left,
- .set = &nest->specs[sv]
- };
- n_left++;
- }
- }
+ while (n_left > 0)
+ {
+ struct merge_item min = items[0];
+ for (size_t j = 1; j < n_left; j++)
+ if (merge_item_compare_3way (&items[j], &min) < 0)
+ min = items[j];
+
+ if (merged->n >= merged->allocated)
+ merged->specs = x2nrealloc (merged->specs, &merged->allocated,
+ sizeof *merged->specs);
+ merged->specs[merged->n++] = min.set->specs[min.ofs];
- while (n_left > 0)
+ for (size_t j = 0; j < n_left; )
{
- struct merge_item min = items[0];
- for (size_t j = 1; j < n_left; j++)
- if (merge_item_compare_3way (&items[j], &min) < 0)
- min = items[j];
-
- /* XXX Add to 'merged' */
- if (merged->n >= merged->allocated)
- merged->specs = x2nrealloc (merged->specs, &merged->allocated,
- sizeof *merged->specs);
- merged->specs[merged->n++] = min.set->specs[min.ofs];
-
- for (size_t j = 0; j < n_left; )
+ if (merge_item_compare_3way (&items[j], &min) == 0)
{
- if (merge_item_compare_3way (&items[j], &min) == 0)
+ struct merge_item *item = &items[j];
+ item->set->specs[item->ofs].axis_idx = merged->n - 1;
+ if (++item->ofs >= item->set->n)
{
- struct merge_item *item = &items[j];
- item->set->specs[item->ofs].axis_idx = merged->n - 1;
- if (++item->ofs >= item->set->n)
- {
- items[j] = items[--n_left];
- continue;
- }
+ items[j] = items[--n_left];
+ continue;
}
- j++;
}
+ j++;
}
+ }
- for (size_t j = 0; j < merged->n; j++)
- printf ("%s\n", ctables_summary_function_name (merged->specs[j].function));
+#if 0
+ for (size_t j = 0; j < merged->n; j++)
+ printf ("%s\n", ctables_summary_function_name (merged->specs[j].function));
- for (size_t j = 0; j < stack->n; j++)
+ for (size_t j = 0; j < stack->n; j++)
+ {
+ const struct ctables_nest *nest = &stack->nests[j];
+ for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
{
- const struct ctables_nest *nest = &stack->nests[j];
- for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
- {
- const struct ctables_summary_spec_set *specs = &nest->specs[sv];
- for (size_t k = 0; k < specs->n; k++)
- printf ("(%s, %zu) ", ctables_summary_function_name (specs->specs[k].function),
- specs->specs[k].axis_idx);
- printf ("\n");
- }
+ const struct ctables_summary_spec_set *specs = &nest->specs[sv];
+ for (size_t k = 0; k < specs->n; k++)
+ printf ("(%s, %zu) ", ctables_summary_function_name (specs->specs[k].function),
+ specs->specs[k].axis_idx);
+ printf ("\n");
}
}
+#endif
+}
+
+static void
+ctables_insert_clabels_values (struct ctables_table *t, const struct ccase *c,
+ enum pivot_axis_type a)
+{
+ struct ctables_stack *stack = &t->stacks[a];
+ for (size_t i = 0; i < stack->n; i++)
+ {
+ const struct ctables_nest *nest = &stack->nests[i];
+ const struct variable *v = nest->vars[nest->n - 1];
+ int width = var_get_width (v);
+ const union value *value = case_data (c, v);
+ unsigned int hash = value_hash (value, width, 0);
+
+ struct ctables_value *clv;
+ HMAP_FOR_EACH_WITH_HASH (clv, struct ctables_value, node, hash,
+ &t->clabels_values_map)
+ if (value_equal (value, &clv->value, width))
+ goto next_stack;
+
+ clv = xmalloc (sizeof *clv);
+ value_clone (&clv->value, value, width);
+ hmap_insert (&t->clabels_values_map, &clv->node, hash);
+
+ next_stack: ;
+ }
+}
+static int
+compare_clabels_values_3way (const void *a_, const void *b_, const void *width_)
+{
+ const union value *a = a_;
+ const union value *b = b_;
+ const int *width = width_;
+ return value_compare_3way (a, b, *width);
+}
+
+static void
+ctables_sort_clabels_values (struct ctables_table *t)
+{
+ int width = var_get_width (t->clabels_example);
+
+ size_t n = hmap_count (&t->clabels_values_map);
+ t->clabels_values = xnmalloc (n, sizeof *t->clabels_values);
+
+ const struct ctables_value *clv;
+ size_t i = 0;
+ HMAP_FOR_EACH (clv, struct ctables_value, node, &t->clabels_values_map)
+ t->clabels_values[i++] = clv->value;
+ assert (i == n);
+
+ sort (t->clabels_values, n, sizeof *t->clabels_values,
+ compare_clabels_values_3way, &width);
+}
+
+static bool
+ctables_execute (struct dataset *ds, struct ctables *ct)
+{
struct casereader *input = casereader_create_filter_weight (proc_open (ds),
dataset_dict (ds),
NULL, NULL);
for (size_t ic = 0; ic < t->stacks[PIVOT_AXIS_COLUMN].n; ic++)
for (size_t il = 0; il < t->stacks[PIVOT_AXIS_LAYER].n; il++)
ctables_cell_insert (t, c, ir, ic, il, weight);
+
+ for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
+ if (t->label_axis[a] != a)
+ ctables_insert_clabels_values (t, c, a);
}
}
casereader_destroy (input);
for (size_t i = 0; i < ct->n_tables; i++)
{
struct ctables_table *t = ct->tables[i];
- if (t->summary_axis == t->slabels_position)
+
+ if (t->clabels_example)
+ ctables_sort_clabels_values (t);
+
+ if (t->summary_axis == t->slabels_axis)
ctables_table_output_same_axis (ct, ct->tables[i]);
else
ctables_table_output_different_axis (ct, ct->tables[i]);
return proc_commit (ds);
}
+static bool
+ctables_check_label_position (struct ctables_table *t, enum pivot_axis_type a)
+{
+ enum pivot_axis_type label_pos = t->label_axis[a];
+ if (label_pos == a)
+ return true;
+
+ const char *subcommand_name = a == PIVOT_AXIS_ROW ? "ROWLABELS" : "COLLABELS";
+ const char *pos_name = label_pos == PIVOT_AXIS_LAYER ? "LAYER" : "OPPOSITE";
+
+ const struct ctables_stack *stack = &t->stacks[a];
+ if (!stack->n)
+ return true;
+
+ const struct ctables_nest *n0 = &stack->nests[0];
+ assert (n0->n > 0);
+ const struct variable *v0 = n0->vars[n0->n - 1];
+ struct ctables_categories *c0 = t->categories[var_get_dict_index (v0)];
+ t->clabels_example = v0;
+
+ for (size_t i = 0; i < c0->n_cats; i++)
+ if (c0->cats[i].type == CCT_FUNCTION)
+ {
+ msg (SE, _("%s=%s is not allowed with sorting based "
+ "on a summary function."),
+ subcommand_name, pos_name);
+ return false;
+ }
+
+ for (size_t i = 1; i < stack->n; i++)
+ {
+ const struct ctables_nest *ni = &stack->nests[i];
+ assert (ni->n > 0);
+ const struct variable *vi = ni->vars[ni->n - 1];
+ struct ctables_categories *ci = t->categories[var_get_dict_index (vi)];
+
+ if (var_get_width (v0) != var_get_width (vi))
+ {
+ msg (SE, _("%s=%s requires the variables to be "
+ "moved to have the same width, but %s has "
+ "width %d and %s has width %d."),
+ subcommand_name, pos_name,
+ var_get_name (v0), var_get_width (v0),
+ var_get_name (vi), var_get_width (vi));
+ return false;
+ }
+ if (!val_labs_equal (var_get_value_labels (v0),
+ var_get_value_labels (vi)))
+ {
+ msg (SE, _("%s=%s requires the variables to be "
+ "moved to have the same value labels, but %s "
+ "and %s have different value labels."),
+ subcommand_name, pos_name,
+ var_get_name (v0), var_get_name (vi));
+ return false;
+ }
+ if (!ctables_categories_equal (c0, ci))
+ {
+ msg (SE, _("%s=%s requires the variables to be "
+ "moved to have the same category "
+ "specifications, but %s and %s have different "
+ "category specifications."),
+ subcommand_name, pos_name,
+ var_get_name (v0), var_get_name (vi));
+ return false;
+ }
+ }
+
+ return true;
+}
+
int
cmd_ctables (struct lexer *lexer, struct dataset *ds)
{
struct ctables_table *t = xmalloc (sizeof *t);
*t = (struct ctables_table) {
.cells = HMAP_INITIALIZER (t->cells),
- .slabels_position = PIVOT_AXIS_COLUMN,
+ .slabels_axis = PIVOT_AXIS_COLUMN,
.slabels_visible = true,
- .row_labels = CTLP_NORMAL,
- .col_labels = CTLP_NORMAL,
+ .clabels_values_map = HMAP_INITIALIZER (t->clabels_values_map),
+ .label_axis = {
+ [PIVOT_AXIS_ROW] = PIVOT_AXIS_ROW,
+ [PIVOT_AXIS_COLUMN] = PIVOT_AXIS_COLUMN,
+ [PIVOT_AXIS_LAYER] = PIVOT_AXIS_LAYER,
+ },
.categories = categories,
.n_categories = n_vars,
.cilevel = 95,
{
if (lex_match_id (lexer, "SLABELS"))
{
- while (lex_token (lexer) != T_SLASH)
+ while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
{
if (lex_match_id (lexer, "POSITION"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "COLUMN"))
- t->slabels_position = PIVOT_AXIS_COLUMN;
+ t->slabels_axis = PIVOT_AXIS_COLUMN;
else if (lex_match_id (lexer, "ROW"))
- t->slabels_position = PIVOT_AXIS_ROW;
+ t->slabels_axis = PIVOT_AXIS_ROW;
else if (lex_match_id (lexer, "LAYER"))
- t->slabels_position = PIVOT_AXIS_LAYER;
+ t->slabels_axis = PIVOT_AXIS_LAYER;
else
{
lex_error_expecting (lexer, "COLUMN", "ROW", "LAYER");
}
else if (lex_match_id (lexer, "CLABELS"))
{
- while (lex_token (lexer) != T_SLASH)
+ while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
{
if (lex_match_id (lexer, "AUTO"))
- t->row_labels = t->col_labels = CTLP_NORMAL;
+ {
+ t->label_axis[PIVOT_AXIS_ROW] = PIVOT_AXIS_ROW;
+ t->label_axis[PIVOT_AXIS_COLUMN] = PIVOT_AXIS_COLUMN;
+ }
else if (lex_match_id (lexer, "ROWLABELS"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "OPPOSITE"))
- t->row_labels = CTLP_OPPOSITE;
+ t->label_axis[PIVOT_AXIS_ROW] = PIVOT_AXIS_COLUMN;
else if (lex_match_id (lexer, "LAYER"))
- t->row_labels = CTLP_LAYER;
+ t->label_axis[PIVOT_AXIS_ROW] = PIVOT_AXIS_LAYER;
else
{
lex_error_expecting (lexer, "OPPOSITE", "LAYER");
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "OPPOSITE"))
- t->col_labels = CTLP_OPPOSITE;
+ t->label_axis[PIVOT_AXIS_COLUMN] = PIVOT_AXIS_ROW;
else if (lex_match_id (lexer, "LAYER"))
- t->col_labels = CTLP_LAYER;
+ t->label_axis[PIVOT_AXIS_COLUMN] = PIVOT_AXIS_LAYER;
else
{
lex_error_expecting (lexer, "OPPOSITE", "LAYER");
break;
}
- if (t->row_labels != CTLP_NORMAL && t->col_labels != CTLP_NORMAL)
+ if (t->label_axis[PIVOT_AXIS_ROW] != PIVOT_AXIS_ROW
+ && t->label_axis[PIVOT_AXIS_COLUMN] != PIVOT_AXIS_COLUMN)
{
msg (SE, _("ROWLABELS and COLLABELS may not both be specified."));
goto error;
}
+ ctables_prepare_table (t);
+
+ ctables_check_label_position (t, PIVOT_AXIS_ROW);
+ ctables_check_label_position (t, PIVOT_AXIS_COLUMN);
}
while (lex_token (lexer) != T_ENDCMD);