Thanks to Jason for reporting this bug and John for insight.
+Wed Jul 12 21:02:26 2006 Ben Pfaff <blp@gnu.org>
+
+ * procedure.c (internal_procedure): Create sink_case with only as
+ many values as the compacted dictionary.
+
+Wed Jul 12 21:01:00 2006 Ben Pfaff <blp@gnu.org>
+
+ Remove "debugging" code that caused plenty of false positives and
+ no true positives.
+
+ * case.h (struct ccase): [DEBUGGING] Remove `this' member.
+
+ * case.c: Remove all references to `this' member.
+
Thu Jul 6 19:09:53 2006 Ben Pfaff <blp@gnu.org>
Fix link error noted by Jason Stover.
Thu Jul 6 19:09:53 2006 Ben Pfaff <blp@gnu.org>
Fix link error noted by Jason Stover.
- assert (c != NULL);
- assert (c->this == c);
- assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 1);
cd = c->case_data;
assert (c->case_data->ref_cnt > 1);
cd = c->case_data;
case_nullify (struct ccase *c)
{
c->case_data = NULL;
case_nullify (struct ccase *c)
{
c->case_data = NULL;
void
case_clone (struct ccase *clone, const struct ccase *orig)
{
void
case_clone (struct ccase *clone, const struct ccase *orig)
{
- assert (orig != NULL);
- assert (orig->this == orig);
- assert (orig->case_data != NULL);
assert (orig->case_data->ref_cnt > 0);
assert (orig->case_data->ref_cnt > 0);
- assert (clone != NULL);
- {
- *clone = *orig;
- clone->this = clone;
- }
orig->case_data->ref_cnt++;
}
#endif /* DEBUGGING */
orig->case_data->ref_cnt++;
}
#endif /* DEBUGGING */
void
case_move (struct ccase *dst, struct ccase *src)
{
void
case_move (struct ccase *dst, struct ccase *src)
{
- assert (src != NULL);
- assert (src->this == src);
- assert (src->case_data != NULL);
assert (src->case_data->ref_cnt > 0);
assert (src->case_data->ref_cnt > 0);
if (dst != src)
{
*dst = *src;
if (dst != src)
{
*dst = *src;
struct case_data *cd;
assert (c != NULL);
struct case_data *cd;
assert (c != NULL);
cd = c->case_data;
if (cd != NULL && --cd->ref_cnt == 0)
cd = c->case_data;
if (cd != NULL && --cd->ref_cnt == 0)
int
case_try_create (struct ccase *c, size_t value_cnt)
{
int
case_try_create (struct ccase *c, size_t value_cnt)
{
-#ifdef DEBUGGING
- c->this = c;
-#endif
c->case_data = malloc (case_size (value_cnt));
if (c->case_data != NULL)
{
c->case_data = malloc (case_size (value_cnt));
if (c->case_data != NULL)
{
const struct ccase *src, size_t src_idx,
size_t value_cnt)
{
const struct ccase *src, size_t src_idx,
size_t value_cnt)
{
- assert (dst != NULL);
- assert (dst->this == dst);
- assert (dst->case_data != NULL);
assert (dst->case_data->ref_cnt > 0);
assert (dst_idx + value_cnt <= dst->case_data->value_cnt);
assert (dst->case_data->ref_cnt > 0);
assert (dst_idx + value_cnt <= dst->case_data->value_cnt);
- assert (src != NULL);
- assert (src->this == src);
- assert (src->case_data != NULL);
assert (src->case_data->ref_cnt > 0);
assert (src->case_data->ref_cnt > 0);
- assert (src_idx + value_cnt <= dst->case_data->value_cnt);
+ assert (src_idx + value_cnt <= src->case_data->value_cnt);
if (dst->case_data != src->case_data || dst_idx != src_idx)
{
if (dst->case_data != src->case_data || dst_idx != src_idx)
{
case_to_values (const struct ccase *c, union value *output,
size_t output_size UNUSED)
{
case_to_values (const struct ccase *c, union value *output,
size_t output_size UNUSED)
{
- assert (c != NULL);
- assert (c->this == c);
- assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (output_size == c->case_data->value_cnt);
assert (output != NULL || output_size == 0);
assert (c->case_data->ref_cnt > 0);
assert (output_size == c->case_data->value_cnt);
assert (output != NULL || output_size == 0);
size_t input_size UNUSED)
{
assert (c != NULL);
size_t input_size UNUSED)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (input_size == c->case_data->value_cnt);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (input_size == c->case_data->value_cnt);
case_data (const struct ccase *c, size_t idx)
{
assert (c != NULL);
case_data (const struct ccase *c, size_t idx)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
case_num (const struct ccase *c, size_t idx)
{
assert (c != NULL);
case_num (const struct ccase *c, size_t idx)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
case_str (const struct ccase *c, size_t idx)
{
assert (c != NULL);
case_str (const struct ccase *c, size_t idx)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
case_data_rw (struct ccase *c, size_t idx)
{
assert (c != NULL);
case_data_rw (struct ccase *c, size_t idx)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (idx < c->case_data->value_cnt);
case_data_all (const struct ccase *c)
{
assert (c != NULL);
case_data_all (const struct ccase *c)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
case_data_all_rw (struct ccase *c)
{
assert (c != NULL);
case_data_all_rw (struct ccase *c)
{
assert (c != NULL);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
assert (c->case_data != NULL);
assert (c->case_data->ref_cnt > 0);
struct ccase
{
struct case_data *case_data; /* Actual data. */
struct ccase
{
struct case_data *case_data; /* Actual data. */
-#if DEBUGGING
- struct ccase *this; /* Detects unauthorized move/copy. */
-#endif
};
/* Invisible to user code. */
};
/* Invisible to user code. */
wc_data.case_func = case_func;
wc_data.aux = aux;
create_trns_case (&wc_data.trns_case, default_dict);
wc_data.case_func = case_func;
wc_data.aux = aux;
create_trns_case (&wc_data.trns_case, default_dict);
- case_create (&wc_data.sink_case, dict_get_next_value_idx (default_dict));
+ case_create (&wc_data.sink_case,
+ dict_get_compacted_value_cnt (default_dict));
wc_data.cases_written = 0;
ok = proc_source->class->read (proc_source,
wc_data.cases_written = 0;
ok = proc_source->class->read (proc_source,
+Wed Jul 12 21:03:17 2006 Ben Pfaff <blp@gnu.org>
+
+ * evaluate.c (cmd_debug_evaluate): Don't try to resize a null
+ case.
+
Fri Jun 9 13:59:15 2006 Ben Pfaff <blp@gnu.org>
Reform string library.
Fri Jun 9 13:59:15 2006 Ben Pfaff <blp@gnu.org>
Reform string library.
if (c == NULL)
{
c = xmalloc (sizeof *c);
if (c == NULL)
{
c = xmalloc (sizeof *c);
+ case_create (c, dict_get_next_value_idx (d));
- case_resize (c, old_value_cnt, dict_get_next_value_idx (d));
+ else
+ case_resize (c, old_value_cnt, dict_get_next_value_idx (d));
if (lex_is_number ())
case_data_rw (c, v->fv)->f = tokval;
if (lex_is_number ())
case_data_rw (c, v->fv)->f = tokval;
+Wed Jul 12 21:03:37 2006 Ben Pfaff <blp@gnu.org>
+
+ * table.c (tab_natural_width): Get rid of warning on empty column,
+ which tended to just trigger false positives because we handle
+ joined cells so badly. We need a real fix, and the warning is not
+ helpful.
+
+ * table.c (tab_offset): [DEBUGGING] Let row, col arguments be as
+ big as row or column count.
+
Wed Jul 12 20:58:19 2006 Ben Pfaff <blp@gnu.org>
* output.c (outp_drivers): [DEBUGGING] Delete unused declaration.
Wed Jul 12 20:58:19 2006 Ben Pfaff <blp@gnu.org>
* output.c (outp_drivers): [DEBUGGING] Delete unused declaration.
- width = d->prop_em_width * 8;
-#if DEBUGGING
- printf ("warning: table column %d contains no data.\n", c);
-#endif
+ /* FIXME: This is an ugly kluge to compensate for the fact
+ that we don't let joined cells contribute to column
+ widths. */
+ width = d->prop_em_width * 8;
assert (t != NULL);
#if DEBUGGING
assert (t != NULL);
#if DEBUGGING
- if (row < -1 || row >= t->nr)
+ if (row < -1 || row > t->nr)
{
printf ("tab_offset(): row=%d in %d-row table\n", row, t->nr);
NOT_REACHED ();
}
{
printf ("tab_offset(): row=%d in %d-row table\n", row, t->nr);
NOT_REACHED ();
}
- if (col < -1 || col >= t->nc)
+ if (col < -1 || col > t->nc)
{
printf ("tab_offset(): col=%d in %d-column table\n", col, t->nc);
NOT_REACHED ();
{
printf ("tab_offset(): col=%d in %d-column table\n", col, t->nc);
NOT_REACHED ();