projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a dict parameter to data_in and dealt with the consequences.
[pspp-builds.git]
/
src
/
language
/
data-io
/
data-parser.c
diff --git
a/src/language/data-io/data-parser.c
b/src/language/data-io/data-parser.c
index 1b9eb8991d302dbea7f8afdfd75d95c29ba7db6f..8f189b1b212c6bccf497e28b68900612e6989149 100644
(file)
--- a/
src/language/data-io/data-parser.c
+++ b/
src/language/data-io/data-parser.c
@@
-41,6
+41,7
@@
/* Data parser for textual data like that read by DATA LIST. */
struct data_parser
{
/* Data parser for textual data like that read by DATA LIST. */
struct data_parser
{
+ const struct dictionary *dict; /*Dictionary of destination */
enum data_parser_type type; /* Type of data to parse. */
int skip_records; /* Records to skip before first real data. */
casenumber max_cases; /* Max number of cases to read. */
enum data_parser_type type; /* Type of data to parse. */
int skip_records; /* Records to skip before first real data. */
casenumber max_cases; /* Max number of cases to read. */
@@
-79,7
+80,7
@@
static void set_any_sep (struct data_parser *parser);
/* Creates and returns a new data parser. */
struct data_parser *
/* Creates and returns a new data parser. */
struct data_parser *
-data_parser_create (
void
)
+data_parser_create (
const struct dictionary *dict
)
{
struct data_parser *parser = xmalloc (sizeof *parser);
{
struct data_parser *parser = xmalloc (sizeof *parser);
@@
-91,6
+92,7
@@
data_parser_create (void)
parser->fields = NULL;
parser->field_cnt = 0;
parser->field_allocated = 0;
parser->fields = NULL;
parser->field_cnt = 0;
parser->field_allocated = 0;
+ parser->dict = dict;
parser->span = true;
parser->empty_line_has_field = false;
parser->span = true;
parser->empty_line_has_field = false;
@@
-505,7
+507,7
@@
static bool
parse_fixed (const struct data_parser *parser, struct dfm_reader *reader,
struct ccase *c)
{
parse_fixed (const struct data_parser *parser, struct dfm_reader *reader,
struct ccase *c)
{
-
enum legacy_encoding
encoding = dfm_reader_get_legacy_encoding (reader);
+
const char *
encoding = dfm_reader_get_legacy_encoding (reader);
struct field *f;
int row;
struct field *f;
int row;
@@
-531,6
+533,7
@@
parse_fixed (const struct data_parser *parser, struct dfm_reader *reader,
f->format.w),
encoding, f->format.type, f->format.d,
f->first_column, f->first_column + f->format.w,
f->format.w),
encoding, f->format.type, f->format.d,
f->first_column, f->first_column + f->format.w,
+ parser->dict,
case_data_rw_idx (c, f->case_idx),
fmt_var_width (&f->format));
case_data_rw_idx (c, f->case_idx),
fmt_var_width (&f->format));
@@
-547,7
+550,7
@@
static bool
parse_delimited_span (const struct data_parser *parser,
struct dfm_reader *reader, struct ccase *c)
{
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);
+
const char *
encoding = dfm_reader_get_legacy_encoding (reader);
struct string tmp = DS_EMPTY_INITIALIZER;
struct field *f;
struct string tmp = DS_EMPTY_INITIALIZER;
struct field *f;
@@
-574,6
+577,7
@@
parse_delimited_span (const struct data_parser *parser,
data_in (s, encoding, f->format.type, 0,
first_column, last_column,
data_in (s, encoding, f->format.type, 0,
first_column, last_column,
+ parser->dict,
case_data_rw_idx (c, f->case_idx),
fmt_var_width (&f->format));
}
case_data_rw_idx (c, f->case_idx),
fmt_var_width (&f->format));
}
@@
-588,7
+592,7
@@
static bool
parse_delimited_no_span (const struct data_parser *parser,
struct dfm_reader *reader, struct ccase *c)
{
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);
+
const char *
encoding = dfm_reader_get_legacy_encoding (reader);
struct string tmp = DS_EMPTY_INITIALIZER;
struct substring s;
struct field *f;
struct string tmp = DS_EMPTY_INITIALIZER;
struct substring s;
struct field *f;
@@
-614,6
+618,7
@@
parse_delimited_no_span (const struct data_parser *parser,
data_in (s, encoding, f->format.type, 0,
first_column, last_column,
data_in (s, encoding, f->format.type, 0,
first_column, last_column,
+ parser->dict,
case_data_rw_idx (c, f->case_idx),
fmt_var_width (&f->format));
}
case_data_rw_idx (c, f->case_idx),
fmt_var_width (&f->format));
}
@@
-721,7
+726,7
@@
struct data_parser_casereader
{
struct data_parser *parser; /* Parser. */
struct dfm_reader *reader; /* Data file reader. */
{
struct data_parser *parser; /* Parser. */
struct dfm_reader *reader; /* Data file reader. */
- s
ize_t value_cnt; /* Number of `union value's in case
. */
+ s
truct caseproto *proto; /* Format of cases
. */
};
static const struct casereader_class data_parser_casereader_class;
};
static const struct casereader_class data_parser_casereader_class;
@@
-742,8
+747,8
@@
data_parser_make_active_file (struct data_parser *parser, struct dataset *ds,
r = xmalloc (sizeof *r);
r->parser = parser;
r->reader = reader;
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);
CASENUMBER_MAX,
&data_parser_casereader_class, r);
proc_set_active_file (ds, casereader, dict);
@@
-753,7
+758,7
@@
static struct ccase *
data_parser_casereader_read (struct casereader *reader UNUSED, void *r_)
{
struct data_parser_casereader *r = r_;
data_parser_casereader_read (struct casereader *reader UNUSED, void *r_)
{
struct data_parser_casereader *r = r_;
- struct ccase *c = case_create (r->
value_cnt
);
+ struct ccase *c = case_create (r->
proto
);
if (data_parser_parse (r->parser, r->reader, c))
return c;
else
if (data_parser_parse (r->parser, r->reader, c))
return c;
else
@@
-771,6
+776,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);
casereader_force_error (reader);
data_parser_destroy (r->parser);
dfm_close_reader (r->reader);
+ caseproto_unref (r->proto);
free (r);
}
free (r);
}