X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fmatrix-data.c;h=88cae91f450c7abfa77f463d5276026db1bdc547;hb=19d0debdc5b72e1bb6c79956403a4d3bc054f300;hp=8dc3f00a929ccab93b62b55d980cd1dff19dc4de;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c index 8dc3f00a..88cae91f 100644 --- a/src/language/data-io/matrix-data.c +++ b/src/language/data-io/matrix-data.c @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + 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 @@ -18,32 +18,38 @@ 02110-1301, USA. */ #include -#include + #include #include #include -#include -#include + +#include #include -#include -#include #include -#include #include -#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include + +#include "minmax.h" +#include "size_max.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include - /* FIXME: /N subcommand not implemented. It should be pretty simple, too. */ @@ -110,7 +116,7 @@ static const int content_type[PROX + 1] = }; /* Name of each content type. */ -static const char *content_names[PROX + 1] = +static const char *const content_names[PROX + 1] = { "N", "N", "N_MATRIX", "MEAN", "STDDEV", "COUNT", "MSE", "DFE", "MAT", "COV", "CORR", "PROX", @@ -147,7 +153,7 @@ struct matrix_data_pgm /* Continuous variables. */ int n_continuous; /* Number of continuous variables. */ - int first_continuous; /* Index into default_dict.var of + int first_continuous; /* Index into dictionary of first continuous variable. */ }; @@ -163,13 +169,13 @@ static const struct case_source_class matrix_data_without_rowtype_source_class; static int compare_variables_by_mxd_var_type (const void *pa, const void *pb); -static bool read_matrices_without_rowtype (struct matrix_data_pgm *); -static bool read_matrices_with_rowtype (struct matrix_data_pgm *); -static int string_to_content_type (char *, int *); +static bool read_matrices_without_rowtype (struct dataset *ds, struct matrix_data_pgm *); +static bool read_matrices_with_rowtype (struct dataset *ds, struct matrix_data_pgm *); +static int string_to_content_type (const char *, int *); static void attach_mxd_aux (struct variable *, int var_type, int sub_type); int -cmd_matrix_data (void) +cmd_matrix_data (struct lexer *lexer, struct dataset *ds) { struct pool *pool; struct matrix_data_pgm *mx; @@ -178,7 +184,7 @@ cmd_matrix_data (void) unsigned seen = 0; - discard_variables (); + discard_variables (ds); pool = pool_create (); mx = pool_alloc (pool, sizeof *mx); @@ -199,11 +205,11 @@ cmd_matrix_data (void) mx->n_contents = 0; mx->n_continuous = 0; mx->first_continuous = 0; - while (token != '.') + while (lex_token (lexer) != '.') { - lex_match ('/'); + lex_match (lexer, '/'); - if (lex_match_id ("VARIABLES")) + if (lex_match_id (lexer, "VARIABLES")) { char **v; size_t nv; @@ -215,8 +221,8 @@ cmd_matrix_data (void) } seen |= 1; - lex_match ('='); - if (!parse_DATA_LIST_vars (&v, &nv, PV_NO_DUPLICATE)) + lex_match (lexer, '='); + if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE)) goto lossage; { @@ -243,7 +249,7 @@ cmd_matrix_data (void) if (strcasecmp (v[i], "ROWTYPE_")) { - new_var = dict_create_var_assert (default_dict, v[i], 0); + new_var = dict_create_var_assert (dataset_dict (ds), v[i], 0); attach_mxd_aux (new_var, MXD_CONTINUOUS, i); } else @@ -253,47 +259,47 @@ cmd_matrix_data (void) free (v); } - mx->rowtype_ = dict_create_var_assert (default_dict, + mx->rowtype_ = dict_create_var_assert (dataset_dict (ds), "ROWTYPE_", 8); attach_mxd_aux (mx->rowtype_, MXD_ROWTYPE, 0); } - else if (lex_match_id ("FILE")) + else if (lex_match_id (lexer, "FILE")) { - lex_match ('='); - fh = fh_parse (FH_REF_FILE | FH_REF_INLINE); + lex_match (lexer, '='); + fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE); if (fh == NULL) goto lossage; } - else if (lex_match_id ("FORMAT")) + else if (lex_match_id (lexer, "FORMAT")) { - lex_match ('='); + lex_match (lexer, '='); - while (token == T_ID) + while (lex_token (lexer) == T_ID) { - if (lex_match_id ("LIST")) + if (lex_match_id (lexer, "LIST")) mx->fmt = LIST; - else if (lex_match_id ("FREE")) + else if (lex_match_id (lexer, "FREE")) mx->fmt = FREE; - else if (lex_match_id ("LOWER")) + else if (lex_match_id (lexer, "LOWER")) mx->section = LOWER; - else if (lex_match_id ("UPPER")) + else if (lex_match_id (lexer, "UPPER")) mx->section = UPPER; - else if (lex_match_id ("FULL")) + else if (lex_match_id (lexer, "FULL")) mx->section = FULL; - else if (lex_match_id ("DIAGONAL")) + else if (lex_match_id (lexer, "DIAGONAL")) mx->diag = DIAGONAL; - else if (lex_match_id ("NODIAGONAL")) + else if (lex_match_id (lexer, "NODIAGONAL")) mx->diag = NODIAGONAL; else { - lex_error (_("in FORMAT subcommand")); + lex_error (lexer, _("in FORMAT subcommand")); goto lossage; } } } - else if (lex_match_id ("SPLIT")) + else if (lex_match_id (lexer, "SPLIT")) { - lex_match ('='); + lex_match (lexer, '='); if (seen & 2) { @@ -302,44 +308,45 @@ cmd_matrix_data (void) } seen |= 2; - if (token != T_ID) + if (lex_token (lexer) != T_ID) { - lex_error (_("in SPLIT subcommand")); + lex_error (lexer, _("in SPLIT subcommand")); goto lossage; } - if (dict_lookup_var (default_dict, tokid) == NULL - && (lex_look_ahead () == '.' || lex_look_ahead () == '/')) + if (dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL + && (lex_look_ahead (lexer) == '.' || lex_look_ahead (lexer) == '/')) { - if (!strcasecmp (tokid, "ROWTYPE_") - || !strcasecmp (tokid, "VARNAME_")) + if (!strcasecmp (lex_tokid (lexer), "ROWTYPE_") + || !strcasecmp (lex_tokid (lexer), "VARNAME_")) { msg (SE, _("Split variable may not be named ROWTYPE_ " "or VARNAME_.")); goto lossage; } - mx->single_split = dict_create_var_assert (default_dict, - tokid, 0); + mx->single_split = dict_create_var_assert (dataset_dict (ds), + lex_tokid (lexer), 0); attach_mxd_aux (mx->single_split, MXD_CONTINUOUS, 0); - lex_get (); + lex_get (lexer); - dict_set_split_vars (default_dict, &mx->single_split, 1); + dict_set_split_vars (dataset_dict (ds), &mx->single_split, 1); } else { struct variable **split; size_t n; - if (!parse_variables (default_dict, &split, &n, PV_NO_DUPLICATE)) + if (!parse_variables (lexer, dataset_dict (ds), + &split, &n, PV_NO_DUPLICATE)) goto lossage; - dict_set_split_vars (default_dict, split, n); + dict_set_split_vars (dataset_dict (ds), split, n); } { - struct variable *const *split = dict_get_split_vars (default_dict); - size_t split_cnt = dict_get_split_cnt (default_dict); + struct variable *const *split = dict_get_split_vars (dataset_dict (ds)); + size_t split_cnt = dict_get_split_cnt (dataset_dict (ds)); int i; for (i = 0; i < split_cnt; i++) @@ -349,7 +356,7 @@ cmd_matrix_data (void) if (mv->var_type != MXD_CONTINUOUS) { msg (SE, _("Split variable %s is already another type."), - tokid); + lex_tokid (lexer)); goto lossage; } var_clear_aux (split[i]); @@ -357,9 +364,9 @@ cmd_matrix_data (void) } } } - else if (lex_match_id ("FACTORS")) + else if (lex_match_id (lexer, "FACTORS")) { - lex_match ('='); + lex_match (lexer, '='); if (seen & 4) { @@ -368,7 +375,7 @@ cmd_matrix_data (void) } seen |= 4; - if (!parse_variables (default_dict, &mx->factors, &mx->n_factors, + if (!parse_variables (lexer, dataset_dict (ds), &mx->factors, &mx->n_factors, PV_NONE)) goto lossage; @@ -383,7 +390,7 @@ cmd_matrix_data (void) if (mv->var_type != MXD_CONTINUOUS) { msg (SE, _("Factor variable %s is already another type."), - tokid); + lex_tokid (lexer)); goto lossage; } var_clear_aux (v); @@ -391,9 +398,9 @@ cmd_matrix_data (void) } } } - else if (lex_match_id ("CELLS")) + else if (lex_match_id (lexer, "CELLS")) { - lex_match ('='); + lex_match (lexer, '='); if (mx->cells != -1) { @@ -401,18 +408,18 @@ cmd_matrix_data (void) goto lossage; } - if (!lex_is_integer () || lex_integer () < 1) + if (!lex_is_integer (lexer) || lex_integer (lexer) < 1) { - lex_error (_("expecting positive integer")); + lex_error (lexer, _("expecting positive integer")); goto lossage; } - mx->cells = lex_integer (); - lex_get (); + mx->cells = lex_integer (lexer); + lex_get (lexer); } - else if (lex_match_id ("N")) + else if (lex_match_id (lexer, "N")) { - lex_match ('='); + lex_match (lexer, '='); if (mx->pop_n != -1) { @@ -420,16 +427,16 @@ cmd_matrix_data (void) goto lossage; } - if (!lex_is_integer () || lex_integer () < 1) + if (!lex_is_integer (lexer) || lex_integer (lexer) < 1) { - lex_error (_("expecting positive integer")); + lex_error (lexer, _("expecting positive integer")); goto lossage; } - mx->pop_n = lex_integer (); - lex_get (); + mx->pop_n = lex_integer (lexer); + lex_get (lexer); } - else if (lex_match_id ("CONTENTS")) + else if (lex_match_id (lexer, "CONTENTS")) { int inside_parens = 0; unsigned collide = 0; @@ -442,7 +449,7 @@ cmd_matrix_data (void) } seen |= 8; - lex_match ('='); + lex_match (lexer, '='); { int i; @@ -453,7 +460,7 @@ cmd_matrix_data (void) for (;;) { - if (lex_match ('(')) + if (lex_match (lexer, '(')) { if (inside_parens) { @@ -463,7 +470,7 @@ cmd_matrix_data (void) inside_parens = 1; item = LPAREN; } - else if (lex_match (')')) + else if (lex_match (lexer, ')')) { if (!inside_parens) { @@ -483,20 +490,20 @@ cmd_matrix_data (void) int content_type; int collide_index; - if (token != T_ID) + if (lex_token (lexer) != T_ID) { - lex_error (_("in CONTENTS subcommand")); + lex_error (lexer, _("in CONTENTS subcommand")); goto lossage; } - content_type = string_to_content_type (tokid, + content_type = string_to_content_type (lex_tokid (lexer), &collide_index); if (content_type == -1) { - lex_error (_("in CONTENTS subcommand")); + lex_error (lexer, _("in CONTENTS subcommand")); goto lossage; } - lex_get (); + lex_get (lexer); if (collide & (1 << collide_index)) { @@ -511,7 +518,7 @@ cmd_matrix_data (void) } mx->contents[mx->n_contents++] = item; - if (token == '/' || token == '.') + if (lex_token (lexer) == '/' || lex_token (lexer) == '.') break; } @@ -524,14 +531,14 @@ cmd_matrix_data (void) } else { - lex_error (NULL); + lex_error (lexer, NULL); goto lossage; } } - if (token != '.') + if (lex_token (lexer) != '.') { - lex_error (_("expecting end of command")); + lex_error (lexer, _("expecting end of command")); goto lossage; } @@ -567,7 +574,7 @@ cmd_matrix_data (void) } /* Create VARNAME_. */ - mx->varname_ = dict_create_var_assert (default_dict, "VARNAME_", 8); + mx->varname_ = dict_create_var_assert (dataset_dict (ds), "VARNAME_", 8); attach_mxd_aux (mx->varname_, MXD_VARNAME, 0); /* Sort the dictionary variables into the desired order for the @@ -576,9 +583,9 @@ cmd_matrix_data (void) struct variable **v; size_t nv; - dict_get_vars (default_dict, &v, &nv, 0); + dict_get_vars (dataset_dict (ds), &v, &nv, 0); qsort (v, nv, sizeof *v, compare_variables_by_mxd_var_type); - dict_reorder_vars (default_dict, v, nv); + dict_reorder_vars (dataset_dict (ds), v, nv); free (v); } @@ -596,9 +603,9 @@ cmd_matrix_data (void) int i; mx->first_continuous = -1; - for (i = 0; i < dict_get_var_cnt (default_dict); i++) + for (i = 0; i < dict_get_var_cnt (dataset_dict (ds)); i++) { - struct variable *v = dict_get_var (default_dict, i); + struct variable *v = dict_get_var (dataset_dict (ds), i); struct mxd_var *mv = v->aux; int type = mv->var_type; @@ -618,14 +625,14 @@ cmd_matrix_data (void) goto lossage; } - mx->reader = dfm_open_reader (fh); + mx->reader = dfm_open_reader (fh, lexer); if (mx->reader == NULL) goto lossage; if (mx->explicit_rowtype) - ok = read_matrices_with_rowtype (mx); + ok = read_matrices_with_rowtype (ds, mx); else - ok = read_matrices_without_rowtype (mx); + ok = read_matrices_without_rowtype (ds, mx); dfm_close_reader (mx->reader); @@ -634,7 +641,7 @@ cmd_matrix_data (void) return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; lossage: - discard_variables (); + discard_variables (ds); free (mx->factors); pool_destroy (mx->container); return CMD_CASCADING_FAILURE; @@ -646,7 +653,7 @@ lossage: as a bit-index) which can be used for determining whether a related statistic has already been used. */ static int -string_to_content_type (char *s, int *collide) +string_to_content_type (const char *s, int *collide) { static const struct { @@ -750,7 +757,7 @@ mdump_token (const struct matrix_token *token) printf (" '%.*s'", token->length, token->string); break; default: - assert (0); + NOT_REACHED (); } fflush (stdout); } @@ -768,138 +775,107 @@ mget_token_dump (struct matrix_token *token, struct dfm_reader *reader) static const char * context (struct dfm_reader *reader) { - static char buf[32]; + static struct string buf = DS_EMPTY_INITIALIZER; + ds_clear (&buf); if (dfm_eof (reader)) - strcpy (buf, "at end of file"); + ds_assign_cstr (&buf, "at end of file"); else { - struct fixed_string line; - const char *sp; + struct substring p; - dfm_get_record (reader, &line); - sp = ls_c_str (&line); - while (sp < ls_end (&line) && isspace ((unsigned char) *sp)) - sp++; - if (sp >= ls_end (&line)) - strcpy (buf, "at end of line"); + p = dfm_get_record (reader); + ss_ltrim (&p, ss_cstr (CC_SPACES)); + if (ss_is_empty (p)) + ds_assign_cstr (&buf, "at end of line"); else - { - char *dp; - size_t copy_cnt = 0; - - dp = stpcpy (buf, "before `"); - while (sp < ls_end (&line) && !isspace ((unsigned char) *sp) - && copy_cnt < 10) - { - *dp++ = *sp++; - copy_cnt++; - } - strcpy (dp, "'"); - } + ds_put_format (&buf, "before `%.*s'", + (int) ss_cspan (p, ss_cstr (CC_SPACES)), ss_data (p)); } - return buf; + return ds_cstr (&buf); } /* Is there at least one token left in the data file? */ -static int +static bool another_token (struct dfm_reader *reader) { for (;;) { - struct fixed_string line; - const char *cp; + struct substring p; + size_t space_cnt; if (dfm_eof (reader)) - return 0; - dfm_get_record (reader, &line); - - cp = ls_c_str (&line); - while (isspace ((unsigned char) *cp) && cp < ls_end (&line)) - cp++; + return false; - if (cp < ls_end (&line)) + p = dfm_get_record (reader); + space_cnt = ss_span (p, ss_cstr (CC_SPACES)); + if (space_cnt < ss_length (p)) { - dfm_forward_columns (reader, cp - ls_c_str (&line)); - return 1; + dfm_forward_columns (reader, space_cnt); + return true; } dfm_forward_record (reader); } + NOT_REACHED(); } /* Parse a MATRIX DATA token from READER into TOKEN. */ static int (mget_token) (struct matrix_token *token, struct dfm_reader *reader) { - struct fixed_string line; - int first_column; - char *cp; + struct substring line, p; + struct substring s; + int c; if (!another_token (reader)) return 0; - dfm_get_record (reader, &line); - first_column = dfm_column_start (reader); + line = p = dfm_get_record (reader); /* Three types of fields: quoted with ', quoted with ", unquoted. */ - cp = ls_c_str (&line); - if (*cp == '\'' || *cp == '"') + c = ss_first (p); + if (c == '\'' || c == '"') { - int quote = *cp; - - token->type = MSTR; - token->string = ++cp; - while (cp < ls_end (&line) && *cp != quote) - cp++; - token->length = cp - token->string; - if (cp < ls_end (&line)) - cp++; - else - msg (SW, _("Scope of string exceeds line.")); + ss_get_char (&p); + if (!ss_get_until (&p, c, &s)) + msg (SW, _("Scope of string exceeds line.")); } else { - int is_num = isdigit ((unsigned char) *cp) || *cp == '.'; - - token->string = cp++; - while (cp < ls_end (&line) - && !isspace ((unsigned char) *cp) && *cp != ',' - && *cp != '-' && *cp != '+') - { - if (isdigit ((unsigned char) *cp)) - is_num = 1; - - if ((tolower ((unsigned char) *cp) == 'd' - || tolower ((unsigned char) *cp) == 'e') - && (cp[1] == '+' || cp[1] == '-')) - cp += 2; - else - cp++; - } + bool is_num = isdigit (c) || c == '.'; + const char *start = ss_data (p); - token->length = cp - token->string; - assert (token->length); - - if (is_num) - { - struct data_in di; + for (;;) + { + c = ss_first (p); + if (strchr (CC_SPACES ",-+", c) != NULL) + break; - di.s = token->string; - di.e = token->string + token->length; - di.v = (union value *) &token->number; - di.f1 = first_column; - di.format = make_output_format (FMT_F, token->length, 0); + if (isdigit (c)) + is_num = true; + if (strchr ("deDE", c) && strchr ("+-", ss_at (p, 1))) + { + is_num = true; + ss_advance (&p, 2); + } + else + ss_advance (&p, 1); + } + s = ss_buffer (start, ss_data (p) - start); - if (!data_in (&di)) - return 0; - } + if (is_num) + data_in (s, FMT_F, 0, + dfm_get_column (reader, ss_data (s)), + (union value *) &token->number, 0); else token->type = MSTR; } - - dfm_forward_columns (reader, cp - ls_c_str (&line)); + token->string = ss_data (s); + token->length = ss_length (s); + + dfm_reread_record (reader, dfm_get_column (reader, ss_end (s))); return 1; } @@ -909,18 +885,13 @@ static int static int force_eol (struct dfm_reader *reader, const char *content) { - struct fixed_string line; - const char *cp; + struct substring p; if (dfm_eof (reader)) return 0; - dfm_get_record (reader, &line); - cp = ls_c_str (&line); - while (isspace ((unsigned char) *cp) && cp < ls_end (&line)) - cp++; - - if (cp < ls_end (&line)) + p = dfm_get_record (reader); + if (ss_span (p, ss_cstr (CC_SPACES)) != ss_length (p)) { msg (SE, _("End of line expected %s while reading %s."), context (reader), content); @@ -935,6 +906,7 @@ force_eol (struct dfm_reader *reader, const char *content) struct nr_aux_data { + const struct dictionary *dict; /* The dictionary */ struct matrix_data_pgm *mx; /* MATRIX DATA program. */ double ***data; /* MATRIX DATA data. */ double *factor_values; /* Factor values. */ @@ -943,8 +915,8 @@ struct nr_aux_data double *split_values; /* SPLIT FILE variable values. */ }; -static int nr_read_splits (struct nr_aux_data *, int compare); -static int nr_read_factors (struct nr_aux_data *, int cell); +static bool nr_read_splits (struct nr_aux_data *, int compare); +static bool nr_read_factors (struct nr_aux_data *, int cell); static bool nr_output_data (struct nr_aux_data *, struct ccase *, write_case_func *, write_case_data); static bool matrix_data_read_without_rowtype (struct case_source *source, @@ -955,7 +927,7 @@ static bool matrix_data_read_without_rowtype (struct case_source *source, /* Read from the data file and write it to the active file. Returns true if successful, false if an I/O error occurred. */ static bool -read_matrices_without_rowtype (struct matrix_data_pgm *mx) +read_matrices_without_rowtype (struct dataset *ds, struct matrix_data_pgm *mx) { struct nr_aux_data nr; bool ok; @@ -964,16 +936,18 @@ read_matrices_without_rowtype (struct matrix_data_pgm *mx) mx->cells = 1; nr.mx = mx; + nr.dict = dataset_dict (ds); nr.data = NULL; nr.factor_values = xnmalloc (mx->n_factors * mx->cells, sizeof *nr.factor_values); nr.max_cell_idx = 0; - nr.split_values = xnmalloc (dict_get_split_cnt (default_dict), + nr.split_values = xnmalloc (dict_get_split_cnt (dataset_dict (ds)), sizeof *nr.split_values); - vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr); + proc_set_source (ds, create_case_source ( + &matrix_data_without_rowtype_source_class, &nr)); - ok = procedure (NULL, NULL); + ok = procedure (ds, NULL, NULL); free (nr.split_values); free (nr.factor_values); @@ -1090,16 +1064,14 @@ nr_read_data_lines (struct nr_aux_data *nr, n_cols = mx->n_continuous; break; default: - assert (0); - abort (); + NOT_REACHED (); } break; case 2: n_cols = 1; break; default: - assert (0); - abort (); + NOT_REACHED (); } { @@ -1113,7 +1085,7 @@ nr_read_data_lines (struct nr_aux_data *nr, if (token.type != MNUM) { msg (SE, _("expecting value for %s %s"), - dict_get_var (default_dict, j)->name, + dict_get_var (nr->dict, j)->name, context (mx->reader)); return 0; } @@ -1123,7 +1095,6 @@ nr_read_data_lines (struct nr_aux_data *nr, if (mx->fmt != FREE && !force_eol (mx->reader, content_names[content])) return 0; - debug_printf (("\n")); } if (mx->section == LOWER) @@ -1231,16 +1202,16 @@ matrix_data_read_without_rowtype (struct case_source *source, if (!nr_output_data (nr, c, write_case, wc_data)) return false; - if (dict_get_split_cnt (default_dict) == 0 + if (dict_get_split_cnt (nr->dict) == 0 || !another_token (mx->reader)) return true; } } /* Read the split file variables. If COMPARE is 1, compares the - values read to the last values read and returns 1 if they're equal, - 0 otherwise. */ -static int + values read to the last values read and returns true if they're equal, + false otherwise. */ +static bool nr_read_splits (struct nr_aux_data *nr, int compare) { struct matrix_data_pgm *mx = nr->mx; @@ -1251,36 +1222,36 @@ nr_read_splits (struct nr_aux_data *nr, int compare) if (compare && just_read) { just_read = 0; - return 1; + return true; } - if (dict_get_split_vars (default_dict) == NULL) - return 1; + if (dict_get_split_vars (nr->dict) == NULL) + return true; if (mx->single_split) { if (!compare) { - struct mxd_var *mv = dict_get_split_vars (default_dict)[0]->aux; + struct mxd_var *mv = dict_get_split_vars (nr->dict)[0]->aux; nr->split_values[0] = ++mv->sub_type; } - return 1; + return true; } if (!compare) just_read = 1; - split_cnt = dict_get_split_cnt (default_dict); + split_cnt = dict_get_split_cnt (nr->dict); for (i = 0; i < split_cnt; i++) { struct matrix_token token; if (!mget_token (&token, mx->reader)) - return 0; + return false; if (token.type != MNUM) { msg (SE, _("Syntax error expecting SPLIT FILE value %s."), context (mx->reader)); - return 0; + return false; } if (!compare) @@ -1289,32 +1260,32 @@ nr_read_splits (struct nr_aux_data *nr, int compare) { msg (SE, _("Expecting value %g for %s."), nr->split_values[i], - dict_get_split_vars (default_dict)[i]->name); - return 0; + dict_get_split_vars (nr->dict)[i]->name); + return false; } } - return 1; + return true; } /* Read the factors for cell CELL. If COMPARE is 1, compares the - values read to the last values read and returns 1 if they're equal, - 0 otherwise. */ -static int + values read to the last values read and returns true if they're equal, + false otherwise. */ +static bool nr_read_factors (struct nr_aux_data *nr, int cell) { struct matrix_data_pgm *mx = nr->mx; - int compare; + bool compare; if (mx->n_factors == 0) - return 1; + return true; assert (nr->max_cell_idx >= cell); if (cell != nr->max_cell_idx) - compare = 1; + compare = true; else { - compare = 0; + compare = false; nr->max_cell_idx++; } @@ -1325,12 +1296,12 @@ nr_read_factors (struct nr_aux_data *nr, int cell) { struct matrix_token token; if (!mget_token (&token, mx->reader)) - return 0; + return false; if (token.type != MNUM) { msg (SE, _("Syntax error expecting factor value %s."), context (mx->reader)); - return 0; + return false; } if (!compare) @@ -1340,19 +1311,20 @@ nr_read_factors (struct nr_aux_data *nr, int cell) msg (SE, _("Syntax error expecting value %g for %s %s."), nr->factor_values[i + mx->n_factors * cell], mx->factors[i]->name, context (mx->reader)); - return 0; + return false; } } } - return 1; + return true; } /* Write the contents of a cell having content type CONTENT and data CP to the active file. Returns true if successful, false if an I/O error occurred. */ static bool -dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp, +dump_cell_content (const struct dictionary *dict, + struct matrix_data_pgm *mx, int content, double *cp, struct ccase *c, write_case_func *write_case, write_case_data wc_data) { @@ -1376,13 +1348,13 @@ dump_cell_content (struct matrix_data_pgm *mx, int content, double *cp, for (j = 0; j < mx->n_continuous; j++) { - int fv = dict_get_var (default_dict, mx->first_continuous + j)->fv; + int fv = dict_get_var (dict, mx->first_continuous + j)->fv; case_data_rw (c, fv)->f = *cp; cp++; } if (type == 1) buf_copy_str_rpad (case_data_rw (c, mx->varname_->fv)->s, 8, - dict_get_var (default_dict, + dict_get_var (dict, mx->first_continuous + i)->name); if (!write_case (wc_data)) return false; @@ -1403,8 +1375,8 @@ nr_output_data (struct nr_aux_data *nr, struct ccase *c, size_t split_cnt; size_t i; - split_cnt = dict_get_split_cnt (default_dict); - split = dict_get_split_vars (default_dict); + split_cnt = dict_get_split_cnt (nr->dict); + split = dict_get_split_vars (nr->dict); for (i = 0; i < split_cnt; i++) case_data_rw (c, split[i]->fv)->f = nr->split_values[i]; } @@ -1419,11 +1391,8 @@ nr_output_data (struct nr_aux_data *nr, struct ccase *c, size_t factor; for (factor = 0; factor < mx->n_factors; factor++) - { - case_data_rw (c, mx->factors[factor]->fv)->f - = nr->factor_values[factor + cell * mx->n_factors]; - debug_printf (("f:%s ", mx->factors[factor]->name)); - } + case_data_rw (c, mx->factors[factor]->fv)->f + = nr->factor_values[factor + cell * mx->n_factors]; } { @@ -1435,7 +1404,8 @@ nr_output_data (struct nr_aux_data *nr, struct ccase *c, assert (nr->data[content] != NULL && nr->data[content][cell] != NULL); - if (!dump_cell_content (mx, content, nr->data[content][cell], + if (!dump_cell_content (nr->dict, mx, + content, nr->data[content][cell], c, write_case, wc_data)) return false; } @@ -1456,7 +1426,7 @@ nr_output_data (struct nr_aux_data *nr, struct ccase *c, for (content = 0; content <= PROX; content++) if (!mx->is_per_factor[content] && nr->data[content] != NULL) { - if (!dump_cell_content (mx, content, nr->data[content][0], + if (!dump_cell_content (nr->dict, mx, content, nr->data[content][0], c, write_case, wc_data)) return false; } @@ -1479,6 +1449,7 @@ struct factor_data /* With ROWTYPE_ auxiliary data. */ struct wr_aux_data { + const struct dictionary *dict; /* The dictionary */ struct matrix_data_pgm *mx; /* MATRIX DATA program. */ int content; /* Type of current row. */ double *split_values; /* SPLIT FILE variable values. */ @@ -1486,14 +1457,14 @@ struct wr_aux_data struct factor_data *current; /* Current factor. */ }; -static int wr_read_splits (struct wr_aux_data *, struct ccase *, +static bool wr_read_splits (struct wr_aux_data *, struct ccase *, write_case_func *, write_case_data); static bool wr_output_data (struct wr_aux_data *, struct ccase *, write_case_func *, write_case_data); -static int wr_read_rowtype (struct wr_aux_data *, +static bool wr_read_rowtype (struct wr_aux_data *, const struct matrix_token *, struct dfm_reader *); -static int wr_read_factors (struct wr_aux_data *); -static int wr_read_indeps (struct wr_aux_data *); +static bool wr_read_factors (struct wr_aux_data *); +static bool wr_read_indeps (struct wr_aux_data *); static bool matrix_data_read_with_rowtype (struct case_source *, struct ccase *, write_case_func *, @@ -1503,7 +1474,7 @@ static bool matrix_data_read_with_rowtype (struct case_source *, them to the output file. Returns true if successful, false if an I/O error occurred. */ static bool -read_matrices_with_rowtype (struct matrix_data_pgm *mx) +read_matrices_with_rowtype (struct dataset *ds, struct matrix_data_pgm *mx) { struct wr_aux_data wr; bool ok; @@ -1513,11 +1484,13 @@ read_matrices_with_rowtype (struct matrix_data_pgm *mx) wr.split_values = NULL; wr.data = NULL; wr.current = NULL; + wr.dict = dataset_dict (ds); mx->cells = 0; - vfm_source = create_case_source (&matrix_data_with_rowtype_source_class, - &wr); - ok = procedure (NULL, NULL); + proc_set_source (ds, + create_case_source (&matrix_data_with_rowtype_source_class, + &wr)); + ok = procedure (ds, NULL, NULL); free (wr.split_values); return ok; @@ -1552,60 +1525,60 @@ matrix_data_read_with_rowtype (struct case_source *source, /* Read the split file variables. If they differ from the previous set of split variables then output the data. Returns success. */ -static int +static bool wr_read_splits (struct wr_aux_data *wr, struct ccase *c, write_case_func *write_case, write_case_data wc_data) { struct matrix_data_pgm *mx = wr->mx; - int compare; + bool compare; size_t split_cnt; - split_cnt = dict_get_split_cnt (default_dict); + split_cnt = dict_get_split_cnt (wr->dict); if (split_cnt == 0) - return 1; + return true; if (wr->split_values) - compare = 1; + compare = true; else { - compare = 0; + compare = false; wr->split_values = xnmalloc (split_cnt, sizeof *wr->split_values); } { - int different = 0; + bool different = false; int i; for (i = 0; i < split_cnt; i++) { struct matrix_token token; if (!mget_token (&token, mx->reader)) - return 0; + return false; if (token.type != MNUM) { msg (SE, _("Syntax error %s expecting SPLIT FILE value."), context (mx->reader)); - return 0; + return false; } if (compare && wr->split_values[i] != token.number && !different) { if (!wr_output_data (wr, c, write_case, wc_data)) return 0; - different = 1; + different = true; mx->cells = 0; } wr->split_values[i] = token.number; } } - return 1; + return true; } /* Compares doubles A and B, treating SYSMIS as greatest. */ static int -compare_doubles (const void *a_, const void *b_, void *aux UNUSED) +compare_doubles (const void *a_, const void *b_, const void *aux UNUSED) { const double *a = a_; const double *b = b_; @@ -1625,9 +1598,9 @@ compare_doubles (const void *a_, const void *b_, void *aux UNUSED) /* Return strcmp()-type comparison of the MX->n_factors factors at _A and _B. Sort missing values toward the end. */ static int -compare_factors (const void *a_, const void *b_, void *mx_) +compare_factors (const void *a_, const void *b_, const void *mx_) { - struct matrix_data_pgm *mx = mx_; + const struct matrix_data_pgm *mx = mx_; struct factor_data *const *pa = a_; struct factor_data *const *pb = b_; const double *a = (*pa)->factors; @@ -1655,8 +1628,8 @@ wr_output_data (struct wr_aux_data *wr, size_t split_cnt; size_t i; - split_cnt = dict_get_split_cnt (default_dict); - split = dict_get_split_vars (default_dict); + split_cnt = dict_get_split_cnt (wr->dict); + split = dict_get_split_vars (wr->dict); for (i = 0; i < split_cnt; i++) case_data_rw (c, split[i]->fv)->f = wr->split_values[i]; } @@ -1724,7 +1697,8 @@ wr_output_data (struct wr_aux_data *wr, fill_matrix (mx, content, iter->data[content]); - ok = dump_cell_content (mx, content, iter->data[content], + ok = dump_cell_content (wr->dict, mx, content, + iter->data[content], c, write_case, wc_data); if (!ok) break; @@ -1743,7 +1717,7 @@ wr_output_data (struct wr_aux_data *wr, /* Sets ROWTYPE_ based on the given TOKEN read from READER. Return success. */ -static int +static bool wr_read_rowtype (struct wr_aux_data *wr, const struct matrix_token *token, struct dfm_reader *reader) @@ -1751,21 +1725,21 @@ wr_read_rowtype (struct wr_aux_data *wr, if (wr->content != -1) { msg (SE, _("Multiply specified ROWTYPE_ %s."), context (reader)); - return 0; + return false; } if (token->type != MSTR) { msg (SE, _("Syntax error %s expecting ROWTYPE_ string."), context (reader)); - return 0; + return false; } { char s[16]; char *cp; - memcpy (s, token->string, min (15, token->length)); - s[min (15, token->length)] = 0; + memcpy (s, token->string, MIN (15, token->length)); + s[MIN (15, token->length)] = 0; for (cp = s; *cp; cp++) *cp = toupper ((unsigned char) *cp); @@ -1779,12 +1753,12 @@ wr_read_rowtype (struct wr_aux_data *wr, return 0; } - return 1; + return true; } /* Read the factors for the current row. Select a set of factors and point wr_current to it. */ -static int +static bool wr_read_factors (struct wr_aux_data *wr) { struct matrix_data_pgm *mx = wr->mx; @@ -1888,15 +1862,15 @@ cache_miss: winnage: local_free (factor_values); - return 1; + return true; lossage: local_free (factor_values); - return 0; + return false; } /* Read the independent variables into wr->current. */ -static int +static bool wr_read_indeps (struct wr_aux_data *wr) { struct matrix_data_pgm *mx = wr->mx; @@ -1928,7 +1902,7 @@ wr_read_indeps (struct wr_aux_data *wr) { msg (SE, _("Duplicate specification for %s."), content_names[wr->content]); - return 0; + return false; } if (type == 0) n_cols = mx->n_continuous; @@ -1940,7 +1914,7 @@ wr_read_indeps (struct wr_aux_data *wr) { msg (SE, _("Too many rows of matrix data for %s."), content_names[wr->content]); - return 0; + return false; } switch (mx->section) @@ -1963,18 +1937,14 @@ wr_read_indeps (struct wr_aux_data *wr) n_cols = mx->n_continuous; break; default: - assert (0); - abort (); + NOT_REACHED (); } break; default: - assert (0); - abort (); + NOT_REACHED (); } c->n_rows[wr->content]++; - debug_printf ((" (c=%p,r=%d,n=%d)", c, n_rows + 1, n_cols)); - /* Read N_COLS items at CP. */ { int j; @@ -1983,24 +1953,23 @@ wr_read_indeps (struct wr_aux_data *wr) { struct matrix_token token; if (!mget_token (&token, mx->reader)) - return 0; + return false; if (token.type != MNUM) { msg (SE, _("Syntax error expecting value for %s %s."), - dict_get_var (default_dict, mx->first_continuous + j)->name, + dict_get_var (wr->dict, mx->first_continuous + j)->name, context (mx->reader)); - return 0; + return false; } *cp++ = token.number; } if (mx->fmt != FREE && !force_eol (mx->reader, content_names[wr->content])) - return 0; - debug_printf (("\n")); + return false; } - return 1; + return true; } /* Matrix source. */