X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-list.c;h=9594ead0759b888427a184e5c75322e55cac1eb7;hb=9f472ebb86d3a1b4903bdde1c1371add0b70669a;hp=1d55d8b2ae06e8b7e7bd3fde851c997a81e064db;hpb=0fa141762183890ebd139ccd9264f08db9011539;p=pspp-builds.git diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c index 1d55d8b2..9594ead0 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/data-io/data-list.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -336,8 +335,7 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict, { /* Success. */ struct fmt_spec output = fmt_for_output_from_input (f); - v->print = output; - v->write = output; + var_set_both_formats (v, &output); } else { @@ -353,14 +351,14 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict, } v = dict_lookup_var_assert (dict, name); - if ((width != 0) != (v->width != 0)) + if ((width != 0) != (var_get_width (v) != 0)) { msg (SE, _("There is already a variable %s of a " "different type."), name); return false; } - if (width != 0 && width != v->width) + if (width != 0 && width != var_get_width (v)) { msg (SE, _("There is already a string variable %s of a " "different width."), name); @@ -371,10 +369,10 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict, /* Create specifier for parsing the variable. */ spec = pool_alloc (dls->pool, sizeof *spec); spec->input = *f; - spec->fv = v->fv; + spec->fv = var_get_case_index (v); spec->record = record; spec->first_column = column; - strcpy (spec->name, v->name); + strcpy (spec->name, var_get_name (v)); ll_push_tail (&dls->specs, &spec->ll); column += f->w; @@ -495,12 +493,12 @@ parse_free (struct lexer *lexer, struct dictionary *dict, struct pool *tmp_pool, msg (SE, _("%s is a duplicate variable name."), name[i]); return 0; } - v->print = v->write = output; + var_set_both_formats (v, &output); spec = pool_alloc (dls->pool, sizeof *spec); spec->input = input; - spec->fv = v->fv; - strcpy (spec->name, v->name); + spec->fv = var_get_case_index (v); + strcpy (spec->name, var_get_name (v)); ll_push_tail (&dls->specs, &spec->ll); } } @@ -680,7 +678,7 @@ read_from_data_list_fixed (const struct data_list_pgm *dls, struct ccase *c) ll_for_each_continue (spec, struct dls_var_spec, ll, &dls->specs) data_in (ss_substr (line, spec->first_column - 1, spec->input.w), spec->input.type, spec->input.d, spec->first_column, - case_data_rw (c, spec->fv), fmt_var_width (&spec->input)); + case_data_rw_idx (c, spec->fv), fmt_var_width (&spec->input)); dfm_forward_record (dls->reader); } @@ -716,7 +714,7 @@ read_from_data_list_free (const struct data_list_pgm *dls, struct ccase *c) data_in (field, spec->input.type, 0, dfm_get_column (dls->reader, ss_data (field)), - case_data_rw (c, spec->fv), fmt_var_width (&spec->input)); + case_data_rw_idx (c, spec->fv), fmt_var_width (&spec->input)); } return true; } @@ -747,16 +745,16 @@ read_from_data_list_list (const struct data_list_pgm *dls, struct ccase *c) { int width = fmt_var_width (&spec->input); if (width == 0) - case_data_rw (c, spec->fv)->f = SYSMIS; + case_data_rw_idx (c, spec->fv)->f = SYSMIS; else - memset (case_data_rw (c, spec->fv)->s, ' ', width); + memset (case_data_rw_idx (c, spec->fv)->s, ' ', width); } break; } data_in (field, spec->input.type, 0, dfm_get_column (dls->reader, ss_data (field)), - case_data_rw (c, spec->fv), fmt_var_width (&spec->input)); + case_data_rw_idx (c, spec->fv), fmt_var_width (&spec->input)); } dfm_forward_record (dls->reader); @@ -795,7 +793,7 @@ data_list_trns_proc (void *dls_, struct ccase *c, casenumber case_num UNUSED) /* If there was an END subcommand handle it. */ if (dls->end != NULL) { - double *end = &case_data_rw (c, dls->end->fv)->f; + double *end = &case_data_rw (c, dls->end)->f; if (retval == TRNS_DROP_CASE) { *end = 1.0; @@ -808,13 +806,11 @@ data_list_trns_proc (void *dls_, struct ccase *c, casenumber case_num UNUSED) return retval; } -/* Reads all the records from the data file and passes them to - write_case(). - Returns true if successful, false if an I/O error occurred. */ +/* Reads one case into OUTPUT_CASE. + Returns true if successful, false at end of file or if an + I/O error occurred. */ static bool -data_list_source_read (struct case_source *source, - struct ccase *c, - write_case_func *write_case, write_case_data wc_data) +data_list_source_read (struct case_source *source, struct ccase *c) { struct data_list_pgm *dls = source->aux; @@ -828,26 +824,19 @@ data_list_source_read (struct case_source *source, dls->skip_records--; } - for (;;) - { - bool ok; - - if (!read_from_data_list (dls, c)) - return !dfm_reader_error (dls->reader); - - dfm_push (dls->reader); - ok = write_case (wc_data); - dfm_pop (dls->reader); - if (!ok) - return false; - } + return read_from_data_list (dls, c); } -/* Destroys the source's internal data. */ -static void +/* Destroys the source. + Returns true if successful read, false if an I/O occurred + during destruction or previously. */ +static bool data_list_source_destroy (struct case_source *source) { - data_list_trns_free (source->aux); + struct data_list_pgm *dls = source->aux; + bool ok = !dfm_reader_error (dls->reader); + data_list_trns_free (dls); + return ok; } static const struct case_source_class data_list_source_class =