X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdata-io%2Fdata-list.c;h=af24b373cbab61b8202eaf8302c83f7d5e4f1ef3;hb=00d5ccd2b3072493b84dbf85b40467ef0a2c1df8;hp=90d060eaab66721a8462fcb81baa351494177441;hpb=3eabe1e0eed831505e878deb41a283f489a33f2d;p=pspp diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c index 90d060eaab..af24b373cb 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/data-io/data-list.c @@ -58,6 +58,7 @@ struct data_list_trns { struct data_parser *parser; /* Parser. */ + struct dictionary *dict; /* Dictionary. */ struct dfm_reader *reader; /* Data file reader. */ struct variable *end; /* Variable specified on END subcommand. */ }; @@ -67,8 +68,7 @@ static bool parse_fixed (struct lexer *, struct dictionary *, static bool parse_free (struct lexer *, struct dictionary *, struct pool *, struct data_parser *); -static trns_free_func data_list_trns_free; -static trns_proc_func data_list_trns_proc; +static const struct trns_class data_list_trns_class; int cmd_data_list (struct lexer *lexer, struct dataset *ds) @@ -89,7 +89,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) dict = (in_input_program () ? dataset_dict (ds) : dict_create (get_default_encoding ())); - parser = data_parser_create (dict); + parser = data_parser_create (); reader = NULL; table = -1; /* Print table if nonzero, -1=undecided. */ @@ -118,9 +118,14 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "RECORDS")) { + if (data_parser_get_records (parser) > 0) + { + lex_sbc_only_once (lexer, "RECORDS"); + goto error; + } lex_match (lexer, T_EQUALS); lex_match (lexer, T_LPAREN); - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, "RECORDS", 0, INT_MAX)) goto error; data_parser_set_records (parser, lex_integer (lexer)); lex_get (lexer); @@ -129,7 +134,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "SKIP")) { lex_match (lexer, T_EQUALS); - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, "SKIP", 0, INT_MAX)) goto error; data_parser_set_skip (parser, lex_integer (lexer)); lex_get (lexer); @@ -138,12 +143,14 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) { if (!in_input_program ()) { - msg (SE, _("The %s subcommand may only be used within %s."), "END", "INPUT PROGRAM"); + lex_next_error (lexer, -1, -1, + _("The %s subcommand may only be used within %s."), + "END", "INPUT PROGRAM"); goto error; } if (end) { - msg (SE, _("The %s subcommand may only be specified once."), "END"); + lex_sbc_only_once (lexer, "END"); goto error; } @@ -181,8 +188,9 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) if (has_type) { - msg (SE, _("Only one of FIXED, FREE, or LIST may " - "be specified.")); + lex_next_error (lexer, -1, -1, + _("Only one of FIXED, FREE, or LIST may " + "be specified.")); goto error; } has_type = true; @@ -229,7 +237,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) data_parser_set_quotes (parser, ss_cstr ("'\"")); data_parser_set_soft_delimiters (parser, ss_cstr (CC_SPACES)); - const char decimal = settings_get_decimal_char (FMT_F); + const char decimal = settings_get_fmt_settings ()->decimal; data_parser_set_hard_delimiters (parser, ss_buffer (",", (decimal == '.') ? 1 : 0)); } @@ -288,22 +296,25 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds) { struct data_list_trns *trns = xmalloc (sizeof *trns); trns->parser = parser; + trns->dict = dict_ref (dict); trns->reader = reader; trns->end = end; - add_transformation (ds, data_list_trns_proc, data_list_trns_free, trns); + add_transformation (ds, &data_list_trns_class, trns); } else - data_parser_make_active_file (parser, ds, reader, dict); + data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL); fh_unref (fh); free (encoding); - return CMD_DATA_LIST; + data_list_seen (); + + return CMD_SUCCESS; error: data_parser_destroy (parser); if (!in_input_program ()) - dict_destroy (dict); + dict_unref (dict); fh_unref (fh); free (encoding); return CMD_CASCADING_FAILURE; @@ -326,21 +337,21 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict, while (lex_token (lexer) != T_ENDCMD) { char **names; - size_t name_cnt, name_idx; + size_t n_names, name_idx; struct fmt_spec *formats, *f; - size_t format_cnt; + size_t n_formats; /* Parse everything. */ if (!parse_record_placement (lexer, &record, &column) || !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool, - &names, &name_cnt, PV_NONE) - || !parse_var_placements (lexer, tmp_pool, name_cnt, FMT_FOR_INPUT, - &formats, &format_cnt)) + &names, &n_names, PV_NONE) + || !parse_var_placements (lexer, tmp_pool, n_names, FMT_FOR_INPUT, + &formats, &n_formats)) return false; /* Create variables and var specs. */ name_idx = 0; - for (f = formats; f < &formats[format_cnt]; f++) + for (f = formats; f < &formats[n_formats]; f++) if (!execute_placement_format (f, &record, &column)) { char *name; @@ -355,7 +366,8 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict, if (v != NULL) { /* Success. */ - struct fmt_spec output = fmt_for_output_from_input (f); + struct fmt_spec output = fmt_for_output_from_input ( + f, settings_get_fmt_settings ()); var_set_both_formats (v, &output); } else @@ -401,7 +413,7 @@ parse_fixed (struct lexer *lexer, struct dictionary *dict, column += f->w; } - assert (name_idx == name_cnt); + assert (name_idx == n_names); } return true; @@ -421,11 +433,11 @@ parse_free (struct lexer *lexer, struct dictionary *dict, { struct fmt_spec input, output; char **name; - size_t name_cnt; + size_t n_names; size_t i; if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool, - &name, &name_cnt, PV_NONE)) + &name, &n_names, PV_NONE)) return false; if (lex_match (lexer, T_LPAREN)) @@ -437,7 +449,8 @@ parse_free (struct lexer *lexer, struct dictionary *dict, return NULL; if (!fmt_from_name (type, &input.type)) { - msg (SE, _("Unknown format type `%s'."), type); + lex_next_error (lexer, -1, -1, + _("Unknown format type `%s'."), type); return NULL; } @@ -451,7 +464,14 @@ parse_free (struct lexer *lexer, struct dictionary *dict, input.d = 0; } - if (!fmt_check_input (&input) || !lex_force_match (lexer, T_RPAREN)) + char *error = fmt_check_input__ (&input); + if (error) + { + lex_next_error (lexer, -1, -1, "%s", error); + free (error); + return NULL; + } + if (!lex_force_match (lexer, T_RPAREN)) return NULL; /* As a special case, N format is treated as F format @@ -459,7 +479,8 @@ parse_free (struct lexer *lexer, struct dictionary *dict, if (input.type == FMT_N) input.type = FMT_F; - output = fmt_for_output_from_input (&input); + output = fmt_for_output_from_input (&input, + settings_get_fmt_settings ()); } else { @@ -468,7 +489,7 @@ parse_free (struct lexer *lexer, struct dictionary *dict, output = *settings_get_format (); } - for (i = 0; i < name_cnt; i++) + for (i = 0; i < n_names; i++) { struct variable *v; @@ -499,19 +520,20 @@ data_list_trns_free (void *trns_) struct data_list_trns *trns = trns_; data_parser_destroy (trns->parser); dfm_close_reader (trns->reader); + dict_unref (trns->dict); free (trns); return true; } /* Handle DATA LIST transformation TRNS, parsing data into *C. */ -static int +static enum trns_result data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED) { struct data_list_trns *trns = trns_; - int retval; + enum trns_result retval; *c = case_unshare (*c); - if (data_parser_parse (trns->parser, trns->reader, *c)) + if (data_parser_parse (trns->parser, trns->reader, trns->dict, *c)) retval = TRNS_CONTINUE; else if (dfm_reader_error (trns->reader) || dfm_eof (trns->reader) > 1) { @@ -525,7 +547,7 @@ data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED) /* If there was an END subcommand handle it. */ if (trns->end != NULL) { - double *end = &case_data_rw (*c, trns->end)->f; + double *end = case_num_rw (*c, trns->end); if (retval == TRNS_END_FILE) { *end = 1.0; @@ -537,4 +559,9 @@ data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED) return retval; } - + +static const struct trns_class data_list_trns_class = { + .name = "DATA LIST", + .execute = data_list_trns_proc, + .destroy = data_list_trns_free, +};