X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-parser.c;h=e7e92bf6d37395f239f2906912e7f835524898d7;hb=2cf38ce51a9f34961d68a75e0b312a591b5c9abf;hp=9a2ea769b26b76cb95fad86852276354ea2f86ce;hpb=9b94efd7513afdb12a6023024e00e50801532fee;p=pspp-builds.git diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c index 9a2ea769..e7e92bf6 100644 --- a/src/language/data-io/data-parser.c +++ b/src/language/data-io/data-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,6 +54,7 @@ struct data_parser bool span; /* May cases span multiple records? */ bool empty_line_has_field; /* Does an empty line have an (empty) field? */ struct substring quotes; /* Characters that can quote separators. */ + bool quote_escape; /* Doubled quote acts as escape? */ struct substring soft_seps; /* Two soft separators act like just one. */ struct substring hard_seps; /* Two hard separators yield empty fields. */ struct string any_sep; /* Concatenation of soft_seps and hard_seps. */ @@ -94,6 +95,7 @@ data_parser_create (void) parser->span = true; parser->empty_line_has_field = false; ss_alloc_substring (&parser->quotes, ss_cstr ("\"'")); + parser->quote_escape = false; ss_alloc_substring (&parser->soft_seps, ss_cstr (CC_SPACES)); ss_alloc_substring (&parser->hard_seps, ss_cstr (",")); ds_init_empty (&parser->any_sep); @@ -218,6 +220,20 @@ data_parser_set_quotes (struct data_parser *parser, struct substring quotes) ss_alloc_substring (&parser->quotes, quotes); } +/* If ESCAPE is false (the default setting), a character used for + quoting cannot itself be embedded within a quoted field. If + ESCAPE is true, then a quote character can be embedded within + a quoted field by doubling it. + + This setting affects parsing of DP_DELIMITED files only, and + only when at least one quote character has been set (with + data_parser_set_quotes). */ +void +data_parser_set_quote_escape (struct data_parser *parser, bool escape) +{ + parser->quote_escape = escape; +} + /* Sets PARSER's soft delimiters to DELIMITERS. Soft delimiters separate fields, but consecutive soft delimiters do not yield empty fields. (Ordinarily, only white space characters are @@ -348,14 +364,17 @@ static bool parse_delimited_no_span (const struct data_parser *, static bool parse_fixed (const struct data_parser *, struct dfm_reader *, struct ccase *); -/* Reads a case from DFM into C, parsing it with PARSER. - Returns true if successful, false at end of file or on I/O error. */ +/* Reads a case from DFM into C, parsing it with PARSER. Returns + true if successful, false at end of file or on I/O error. + + Case C must not be shared. */ bool data_parser_parse (struct data_parser *parser, struct dfm_reader *reader, struct ccase *c) { bool retval; + assert (!case_is_shared (c)); assert (data_parser_any_fields (parser)); /* Skip the requested number of records before reading the @@ -401,6 +420,7 @@ data_parser_parse (struct data_parser *parser, struct dfm_reader *reader, beginning of the field on success. */ static bool cut_field (const struct data_parser *parser, struct dfm_reader *reader, + int *first_column, int *last_column, struct string *tmp, struct substring *field) { struct substring line, p; @@ -422,16 +442,34 @@ cut_field (const struct data_parser *parser, struct dfm_reader *reader, else { *field = p; + *first_column = dfm_column_start (reader); + *last_column = *first_column + 1; dfm_forward_columns (reader, 1); return true; } } + *first_column = dfm_column_start (reader); if (ss_find_char (parser->quotes, ss_first (p)) != SIZE_MAX) { /* Quoted field. */ - if (!ss_get_until (&p, ss_get_char (&p), field)) + int quote = ss_get_char (&p); + if (!ss_get_until (&p, quote, field)) msg (SW, _("Quoted string extends beyond end of line.")); + if (parser->quote_escape && ss_first (p) == quote) + { + ds_assign_substring (tmp, *field); + while (ss_match_char (&p, quote)) + { + struct substring ss; + ds_put_char (tmp, quote); + if (!ss_get_until (&p, quote, &ss)) + msg (SW, _("Quoted string extends beyond end of line.")); + ds_put_substring (tmp, ss); + } + *field = ds_ss (tmp); + } + *last_column = dfm_column_start (reader); /* Skip trailing soft separator and a single hard separator if present. */ @@ -444,6 +482,7 @@ cut_field (const struct data_parser *parser, struct dfm_reader *reader, { /* Regular field. */ ss_get_chars (&p, ss_cspan (p, ds_ss (&parser->any_sep)), field); + *last_column = dfm_column_start (reader); if (!ss_ltrim (&p, parser->soft_seps) || ss_is_empty (p)) { /* Advance past a trailing hard separator, @@ -491,7 +530,8 @@ parse_fixed (const struct data_parser *parser, struct dfm_reader *reader, data_in (ss_substr (line, f->first_column - 1, f->format.w), encoding, f->format.type, f->format.d, - f->first_column, case_data_rw_idx (c, f->case_idx), + f->first_column, f->first_column + f->format.w, + case_data_rw_idx (c, f->case_idx), fmt_var_width (&f->format)); dfm_forward_record (reader); @@ -508,14 +548,17 @@ parse_delimited_span (const struct data_parser *parser, struct dfm_reader *reader, struct ccase *c) { enum legacy_encoding encoding = dfm_reader_get_legacy_encoding (reader); + struct string tmp = DS_EMPTY_INITIALIZER; struct field *f; for (f = parser->fields; f < &parser->fields[parser->field_cnt]; f++) { struct substring s; + int first_column, last_column; /* Cut out a field and read in a new record if necessary. */ - while (!cut_field (parser, reader, &s)) + while (!cut_field (parser, reader, + &first_column, &last_column, &tmp, &s)) { if (!dfm_eof (reader)) dfm_forward_record (reader); @@ -524,15 +567,17 @@ parse_delimited_span (const struct data_parser *parser, if (f > parser->fields) msg (SW, _("Partial case discarded. The first variable " "missing was %s."), f->name); + ds_destroy (&tmp); return false; } } data_in (s, encoding, f->format.type, 0, - dfm_get_column (reader, ss_data (s)), + first_column, last_column, case_data_rw_idx (c, f->case_idx), fmt_var_width (&f->format)); } + ds_destroy (&tmp); return true; } @@ -544,6 +589,7 @@ parse_delimited_no_span (const struct data_parser *parser, struct dfm_reader *reader, struct ccase *c) { enum legacy_encoding encoding = dfm_reader_get_legacy_encoding (reader); + struct string tmp = DS_EMPTY_INITIALIZER; struct substring s; struct field *f; @@ -552,7 +598,8 @@ parse_delimited_no_span (const struct data_parser *parser, for (f = parser->fields; f < &parser->fields[parser->field_cnt]; f++) { - if (!cut_field (parser, reader, &s)) + int first_column, last_column; + if (!cut_field (parser, reader, &first_column, &last_column, &tmp, &s)) { if (settings_get_undefined ()) msg (SW, _("Missing value(s) for all variables from %s onward. " @@ -560,18 +607,13 @@ parse_delimited_no_span (const struct data_parser *parser, "or blanks, as appropriate."), f->name); for (; f < &parser->fields[parser->field_cnt]; f++) - { - int width = fmt_var_width (&f->format); - if (width == 0) - case_data_rw_idx (c, f->case_idx)->f = SYSMIS; - else - memset (case_data_rw_idx (c, f->case_idx)->s, ' ', width); - } + value_set_missing (case_data_rw_idx (c, f->case_idx), + fmt_var_width (&f->format)); goto exit; } data_in (s, encoding, f->format.type, 0, - dfm_get_column (reader, ss_data (s)), + first_column, last_column, case_data_rw_idx (c, f->case_idx), fmt_var_width (&f->format)); } @@ -583,6 +625,7 @@ parse_delimited_no_span (const struct data_parser *parser, exit: dfm_forward_record (reader); + ds_destroy (&tmp); return true; } @@ -604,7 +647,7 @@ dump_fixed_table (const struct data_parser *parser, tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format")); tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, parser->field_cnt); tab_hline (t, TAL_2, 0, 3, 1); - tab_dim (t, tab_natural_dimensions); + tab_dim (t, tab_natural_dimensions, NULL); for (i = 0; i < parser->field_cnt; i++) { @@ -613,9 +656,9 @@ dump_fixed_table (const struct data_parser *parser, int row = i + 1; tab_text (t, 0, row, TAB_LEFT, f->name); - tab_text (t, 1, row, TAT_PRINTF, "%d", f->record); - tab_text (t, 2, row, TAT_PRINTF, "%3d-%3d", - f->first_column, f->first_column + f->format.w - 1); + tab_text_format (t, 1, row, 0, "%d", f->record); + tab_text_format (t, 2, row, 0, "%3d-%3d", + f->first_column, f->first_column + f->format.w - 1); tab_text (t, 3, row, TAB_LEFT | TAB_FIX, fmt_to_string (&f->format, fmt_string)); } @@ -643,7 +686,7 @@ dump_delimited_table (const struct data_parser *parser, tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Format")); tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 1, parser->field_cnt); tab_hline (t, TAL_2, 0, 1, 1); - tab_dim (t, tab_natural_dimensions); + tab_dim (t, tab_natural_dimensions, NULL); for (i = 0; i < parser->field_cnt; i++) { @@ -678,7 +721,7 @@ struct data_parser_casereader { struct data_parser *parser; /* Parser. */ struct dfm_reader *reader; /* Data file reader. */ - size_t value_cnt; /* Number of `union value's in case. */ + struct caseproto *proto; /* Format of cases. */ }; static const struct casereader_class data_parser_casereader_class; @@ -699,25 +742,25 @@ data_parser_make_active_file (struct data_parser *parser, struct dataset *ds, r = xmalloc (sizeof *r); r->parser = parser; r->reader = reader; - r->value_cnt = dict_get_next_value_idx (dict); - casereader = casereader_create_sequential (NULL, r->value_cnt, + r->proto = caseproto_ref (dict_get_proto (dict)); + casereader = casereader_create_sequential (NULL, r->proto, CASENUMBER_MAX, &data_parser_casereader_class, r); proc_set_active_file (ds, casereader, dict); } -static bool -data_parser_casereader_read (struct casereader *reader UNUSED, void *r_, - struct ccase *c) +static struct ccase * +data_parser_casereader_read (struct casereader *reader UNUSED, void *r_) { struct data_parser_casereader *r = r_; - bool ok; - - case_create (c, r->value_cnt); - ok = data_parser_parse (r->parser, r->reader, c); - if (!ok) - case_destroy (c); - return ok; + struct ccase *c = case_create (r->proto); + if (data_parser_parse (r->parser, r->reader, c)) + return c; + else + { + case_unref (c); + return NULL; + } } static void @@ -728,6 +771,7 @@ data_parser_casereader_destroy (struct casereader *reader UNUSED, void *r_) casereader_force_error (reader); data_parser_destroy (r->parser); dfm_close_reader (r->reader); + caseproto_unref (r->proto); free (r); }