X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpivot-table.c;h=6ba4c16f2e0811545b4b5673678900f5b37a1cf3;hb=be2e179cbe7cce24b8f2524f5d8557f2efbc3534;hp=3698b78559037a955e949a2c56ce7201b03897da;hpb=cb08510bbbab7646bc1031427243489024d22a3b;p=pspp diff --git a/src/output/pivot-table.c b/src/output/pivot-table.c index 3698b78559..6ba4c16f2e 100644 --- a/src/output/pivot-table.c +++ b/src/output/pivot-table.c @@ -748,11 +748,11 @@ struct result_class /* Formats for most of the result classes. */ static struct result_class result_classes[] = { - { PIVOT_RC_INTEGER, { FMT_F, 40, 0 } }, - { PIVOT_RC_PERCENT, { FMT_PCT, 40, 1 } }, - { PIVOT_RC_CORRELATION, { FMT_F, 40, 3 } }, - { PIVOT_RC_SIGNIFICANCE, { FMT_F, 40, 3 } }, - { PIVOT_RC_RESIDUAL, { FMT_F, 40, 2 } }, + { PIVOT_RC_INTEGER, { .type = FMT_F, .w = 40, .d = 0 } }, + { PIVOT_RC_PERCENT, { .type = FMT_PCT, .w = 40, .d = 1 } }, + { PIVOT_RC_CORRELATION, { .type = FMT_F, .w = 40, .d = 3 } }, + { PIVOT_RC_SIGNIFICANCE, { .type = FMT_F, .w = 40, .d = 3 } }, + { PIVOT_RC_RESIDUAL, { .type = FMT_F, .w = 40, .d = 2 } }, { PIVOT_RC_COUNT, { 0, 0, 0 } }, { PIVOT_RC_OTHER, { 0, 0, 0 } }, }; @@ -865,14 +865,14 @@ pivot_table_create (const char *title) struct pivot_table * pivot_table_create__ (struct pivot_value *title, const char *subtype) { - struct pivot_table *table = xzalloc (sizeof *table); + struct pivot_table *table = XZALLOC (struct pivot_table); table->ref_cnt = 1; table->show_title = true; table->show_caption = true; - table->weight_format = (struct fmt_spec) { FMT_F, 40, 0 }; + table->weight_format = (struct fmt_spec) { .type = FMT_F, .w = 40 }; table->title = title; table->subtype = subtype ? pivot_value_new_text (subtype) : NULL; - table->command_c = output_get_command_name (); + table->command_c = xstrdup_if_nonempty (output_get_command_name ()); table->look = pivot_table_look_ref (pivot_table_look_get_default ()); table->settings = fmt_settings_copy (settings_get_fmt_settings ()); table->small = settings_get_small (); @@ -968,7 +968,7 @@ clone_category (struct pivot_category *old, .extra_depth = old->extra_depth, .subs = (old->n_subs - ? xzalloc (old->n_subs * sizeof *new->subs) + ? xcalloc (old->n_subs, sizeof *new->subs) : NULL), .n_subs = old->n_subs, .allocated_subs = old->n_subs, @@ -1006,9 +1006,9 @@ clone_dimension (struct pivot_dimension *old, struct pivot_table *new_pt) .axis_type = old->axis_type, .level = old->level, .top_index = old->top_index, - .data_leaves = xzalloc (old->n_leaves * sizeof *new->data_leaves), - .presentation_leaves = xzalloc (old->n_leaves - * sizeof *new->presentation_leaves), + .data_leaves = xcalloc (old->n_leaves , sizeof *new->data_leaves), + .presentation_leaves = xcalloc (old->n_leaves + , sizeof *new->presentation_leaves), .n_leaves = old->n_leaves, .allocated_leaves = old->n_leaves, .hide_all_labels = old->hide_all_labels, @@ -2411,7 +2411,7 @@ pivot_value_format_body (const struct pivot_value *value, break; case PIVOT_VALUE_TEXT: - if (value->font_style && value->font_style->markup) + if (value->ex && value->ex->font_style && value->ex->font_style->markup) get_text_from_markup (value->text.local, out); else ds_put_cstr (out, value->text.local); @@ -2440,21 +2440,25 @@ pivot_value_format (const struct pivot_value *value, { bool numeric = pivot_value_format_body (value, pt, out); - if (value->n_subscripts) + const struct pivot_value_ex *ex = value->ex; + if (ex) { - for (size_t i = 0; i < value->n_subscripts; i++) - ds_put_format (out, "%c%s", i ? ',' : '_', value->subscripts[i]); - } + if (ex->n_subscripts) + { + for (size_t i = 0; i < ex->n_subscripts; i++) + ds_put_format (out, "%c%s", i ? ',' : '_', ex->subscripts[i]); + } - for (size_t i = 0; i < value->n_footnotes; i++) - { - ds_put_byte (out, '['); + for (size_t i = 0; i < ex->n_footnotes; i++) + { + ds_put_byte (out, '['); - size_t idx = value->footnote_indexes[i]; - const struct pivot_footnote *f = pt->footnotes[idx]; - pivot_footnote_format_marker (f, pt, out); + size_t idx = ex->footnote_indexes[i]; + const struct pivot_footnote *f = pt->footnotes[idx]; + pivot_footnote_format_marker (f, pt, out); - ds_put_byte (out, ']'); + ds_put_byte (out, ']'); + } } return numeric; @@ -2489,22 +2493,8 @@ pivot_value_clone (const struct pivot_value *old) return NULL; struct pivot_value *new = xmemdup (old, sizeof *new); - if (old->font_style) - { - new->font_style = xmalloc (sizeof *new->font_style); - font_style_copy (NULL, new->font_style, old->font_style); - } - if (old->cell_style) - new->cell_style = xmemdup (old->cell_style, sizeof *new->cell_style); - if (old->n_subscripts) - { - new->subscripts = xnmalloc (old->n_subscripts, sizeof *new->subscripts); - for (size_t i = 0; i < old->n_subscripts; i++) - new->subscripts[i] = xstrdup (old->subscripts[i]); - } - if (old->n_footnotes) - new->footnote_indexes = xmemdup ( - old->footnote_indexes, old->n_footnotes * sizeof *new->footnote_indexes); + if (old->ex) + new->ex = pivot_value_ex_clone (old->ex); switch (new->type) { @@ -2557,15 +2547,7 @@ pivot_value_destroy (struct pivot_value *value) { if (value) { - font_style_uninit (value->font_style); - free (value->font_style); - free (value->cell_style); - free (value->footnote_indexes); - - for (size_t i = 0; i < value->n_subscripts; i++) - free (value->subscripts[i]); - free (value->subscripts); - + pivot_value_ex_destroy (value->ex); switch (value->type) { case PIVOT_VALUE_NUMERIC: @@ -2617,12 +2599,10 @@ pivot_value_get_style (struct pivot_value *value, const struct cell_style *base_cell_style, struct table_area_style *area) { - font_style_copy (NULL, &area->font_style, (value->font_style - ? value->font_style - : base_font_style)); - area->cell_style = *(value->cell_style - ? value->cell_style - : base_cell_style); + const struct pivot_value_ex *ex = pivot_value_ex (value); + font_style_copy (NULL, &area->font_style, + ex->font_style ? ex->font_style : base_font_style); + area->cell_style = *(ex->cell_style ? ex->cell_style : base_cell_style); } /* Copies AREA into VALUE's style. */ @@ -2638,20 +2618,22 @@ void pivot_value_set_font_style (struct pivot_value *value, const struct font_style *font_style) { - if (value->font_style) - font_style_uninit (value->font_style); + struct pivot_value_ex *ex = pivot_value_ex_rw (value); + if (ex->font_style) + font_style_uninit (ex->font_style); else - value->font_style = xmalloc (sizeof *value->font_style); - font_style_copy (NULL, value->font_style, font_style); + ex->font_style = xmalloc (sizeof *ex->font_style); + font_style_copy (NULL, ex->font_style, font_style); } void pivot_value_set_cell_style (struct pivot_value *value, const struct cell_style *cell_style) { - if (!value->cell_style) - value->cell_style = xmalloc (sizeof *value->cell_style); - *value->cell_style = *cell_style; + struct pivot_value_ex *ex = pivot_value_ex_rw (value); + if (!ex->cell_style) + ex->cell_style = xmalloc (sizeof *ex->cell_style); + *ex->cell_style = *cell_style; } void @@ -2692,8 +2674,8 @@ pivot_value_new_user_text_nocopy (char *text) { struct pivot_value *value = xmalloc (sizeof *value); *value = (struct pivot_value) { - .type = PIVOT_VALUE_TEXT, .text = { + .type = PIVOT_VALUE_TEXT, .local = text, .c = text, .id = text, @@ -2735,8 +2717,8 @@ pivot_value_new_text (const char *text) struct pivot_value *value = xmalloc (sizeof *value); *value = (struct pivot_value) { - .type = PIVOT_VALUE_TEXT, .text = { + .type = PIVOT_VALUE_TEXT, .local = local, .c = c, .id = c, @@ -2762,8 +2744,8 @@ pivot_value_new_text_format (const char *format, ...) struct pivot_value *value = xmalloc (sizeof *value); *value = (struct pivot_value) { - .type = PIVOT_VALUE_TEXT, .text = { + .type = PIVOT_VALUE_TEXT, .local = local, .c = c, .id = xstrdup (c), @@ -2784,8 +2766,10 @@ pivot_value_new_number (double x) { struct pivot_value *value = xmalloc (sizeof *value); *value = (struct pivot_value) { - .type = PIVOT_VALUE_NUMERIC, - .numeric = { .x = x, }, + .numeric = { + .type = PIVOT_VALUE_NUMERIC, + .x = x + }, }; return value; } @@ -2795,7 +2779,7 @@ struct pivot_value * pivot_value_new_integer (double x) { struct pivot_value *value = pivot_value_new_number (x); - value->numeric.format = (struct fmt_spec) { FMT_F, 40, 0 }; + value->numeric.format = (struct fmt_spec) { .type = FMT_F, .w = 40 }; return value; } @@ -2834,7 +2818,7 @@ struct pivot_value * pivot_value_new_value (const union value *value, int width, const struct fmt_spec *format, const char *encoding) { - struct pivot_value *pv = xzalloc (sizeof *pv); + struct pivot_value *pv = XZALLOC (struct pivot_value); if (width > 0) { char *s = recode_string (UTF8, encoding, CHAR_CAST (char *, value->s), @@ -2860,13 +2844,22 @@ pivot_value_new_value (const union value *value, int width, /* Returns a new pivot_value for VARIABLE. */ struct pivot_value * pivot_value_new_variable (const struct variable *variable) +{ + return pivot_value_new_variable__ (var_get_name (variable), + var_get_label (variable)); +} + +/* Returns a new pivot_value for a variable with the given NAME and optional + LABEL. */ +struct pivot_value * +pivot_value_new_variable__ (const char *name, const char *label) { struct pivot_value *value = xmalloc (sizeof *value); *value = (struct pivot_value) { - .type = PIVOT_VALUE_VARIABLE, .variable = { - .var_name = xstrdup (var_get_name (variable)), - .var_label = xstrdup_if_nonempty (var_get_label (variable)), + .type = PIVOT_VALUE_VARIABLE, + .var_name = xstrdup (name), + .var_label = xstrdup_if_nonempty (label), }, }; return value; @@ -2877,15 +2870,18 @@ void pivot_value_add_footnote (struct pivot_value *v, const struct pivot_footnote *footnote) { + struct pivot_value_ex *ex = pivot_value_ex_rw (v); + /* Some legacy tables include numerous duplicate footnotes. Suppress them. */ - for (size_t i = 0; i < v->n_footnotes; i++) - if (v->footnote_indexes[i] == footnote->idx) + for (size_t i = 0; i < ex->n_footnotes; i++) + if (ex->footnote_indexes[i] == footnote->idx) return; - v->footnote_indexes = xrealloc ( - v->footnote_indexes, (v->n_footnotes + 1) * sizeof *v->footnote_indexes); - v->footnote_indexes[v->n_footnotes++] = footnote->idx; + ex->footnote_indexes = xrealloc ( + ex->footnote_indexes, + (ex->n_footnotes + 1) * sizeof *ex->footnote_indexes); + ex->footnote_indexes[ex->n_footnotes++] = footnote->idx; pivot_value_sort_footnotes (v); } @@ -2906,9 +2902,9 @@ compare_footnote_indexes (const void *a_, const void *b_) void pivot_value_sort_footnotes (struct pivot_value *v) { - if (v->n_footnotes > 1) - qsort (v->footnote_indexes, v->n_footnotes, sizeof *v->footnote_indexes, - compare_footnote_indexes); + if (v->ex && v->ex->n_footnotes > 1) + qsort (v->ex->footnote_indexes, v->ex->n_footnotes, + sizeof *v->ex->footnote_indexes, compare_footnote_indexes); } /* If VALUE is a numeric value, and RC is a result class such as @@ -2921,4 +2917,66 @@ pivot_value_set_rc (const struct pivot_table *table, struct pivot_value *value, pivot_table_use_rc (table, rc, &value->numeric.format, &value->numeric.honor_small); } + +/* pivot_value_ex. */ +struct pivot_value_ex * +pivot_value_ex_rw (struct pivot_value *value) +{ + if (!value->ex) + value->ex = xzalloc (sizeof *value->ex); + return value->ex; +} + +struct pivot_value_ex * +pivot_value_ex_clone (const struct pivot_value_ex *old) +{ + struct font_style *font_style = NULL; + if (old->font_style) + { + font_style = xmalloc (sizeof *font_style); + font_style_copy (NULL, font_style, old->font_style); + } + + char **subscripts = NULL; + if (old->n_subscripts) + { + subscripts = xnmalloc (old->n_subscripts, sizeof *subscripts); + for (size_t i = 0; i < old->n_subscripts; i++) + subscripts[i] = xstrdup (old->subscripts[i]); + } + + struct pivot_value_ex *new = xmalloc (sizeof *new); + *new = (struct pivot_value_ex) { + .font_style = font_style, + .cell_style = (old->cell_style + ? xmemdup (old->cell_style, sizeof *new->cell_style) + : NULL), + .subscripts = subscripts, + .n_subscripts = old->n_subscripts, + .footnote_indexes = ( + old->n_footnotes + ? xmemdup (old->footnote_indexes, + old->n_footnotes * sizeof *new->footnote_indexes) + : NULL), + .n_footnotes = old->n_footnotes + }; + return new; +} + +void +pivot_value_ex_destroy (struct pivot_value_ex *ex) +{ + if (ex) + { + font_style_uninit (ex->font_style); + free (ex->font_style); + free (ex->cell_style); + free (ex->footnote_indexes); + + for (size_t i = 0; i < ex->n_subscripts; i++) + free (ex->subscripts[i]); + free (ex->subscripts); + free (ex); + } +}