X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=262d5397f460114859ea6f9a48ae3ef7cb165fd8;hb=fd0958dc7caa5806b82b9757e2b937c5b7def369;hp=f6ba6e9096afd2373508877d73af314d8e09cd3f;hpb=8e018d25310cb53e5339b46e95f0abe02db83782;p=pspp diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index f6ba6e9096..262d5397f4 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.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 @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -65,6 +66,7 @@ struct prt_out_spec struct variable *var; /* Associated variable. */ struct fmt_spec format; /* Output spec. */ bool add_space; /* Add trailing space? */ + bool sysmis_as_spaces; /* Output SYSMIS as spaces? */ /* PRT_LITERAL only. */ struct string string; /* String to output. */ @@ -81,7 +83,7 @@ struct print_trns { struct pool *pool; /* Stores related data. */ bool eject; /* Eject page before printing? */ - bool omit_new_lines; /* Omit new-line characters? */ + bool include_prefix; /* Prefix lines with space? */ struct dfm_writer *writer; /* Output file, NULL=listing file. */ struct ll_list specs; /* List of struct prt_out_specs. */ size_t record_cnt; /* Number of records to write. */ @@ -94,39 +96,41 @@ enum which_formats WRITE }; -static int internal_cmd_print (enum which_formats, bool eject); +static int internal_cmd_print (struct dataset *ds, + enum which_formats, bool eject); static trns_proc_func print_trns_proc; static trns_free_func print_trns_free; static bool parse_specs (struct pool *tmp_pool, struct print_trns *, - enum which_formats); + struct dictionary *dict, enum which_formats); static void dump_table (struct print_trns *, const struct file_handle *); /* Basic parsing. */ /* Parses PRINT command. */ int -cmd_print (void) +cmd_print (struct dataset *ds) { - return internal_cmd_print (PRINT, false); + return internal_cmd_print (ds, PRINT, false); } /* Parses PRINT EJECT command. */ int -cmd_print_eject (void) +cmd_print_eject (struct dataset *ds) { - return internal_cmd_print (PRINT, true); + return internal_cmd_print (ds, PRINT, true); } /* Parses WRITE command. */ int -cmd_write (void) +cmd_write (struct dataset *ds) { - return internal_cmd_print (WRITE, false); + return internal_cmd_print (ds, WRITE, false); } /* Parses the output commands. */ static int -internal_cmd_print (enum which_formats which_formats, bool eject) +internal_cmd_print (struct dataset *ds, + enum which_formats which_formats, bool eject) { bool print_table = 0; struct print_trns *trns; @@ -145,7 +149,7 @@ internal_cmd_print (enum which_formats which_formats, bool eject) tmp_pool = pool_create_subpool (trns->pool); /* Parse the command options. */ - while (token != '/') + while (token != '/' && token != '.') { if (lex_match_id ("OUTFILE")) { @@ -176,8 +180,12 @@ internal_cmd_print (enum which_formats which_formats, bool eject) } } + /* When PRINT or PRINT EJECT writes to an external file, we + prefix each line with a space for compatibility. */ + trns->include_prefix = which_formats == PRINT && fh != NULL; + /* Parse variables and strings. */ - if (!parse_specs (tmp_pool, trns, which_formats)) + if (!parse_specs (tmp_pool, trns, dataset_dict (ds), which_formats)) goto error; if (lex_end_of_command () != CMD_SUCCESS) @@ -188,9 +196,6 @@ internal_cmd_print (enum which_formats which_formats, bool eject) trns->writer = dfm_open_writer (fh); if (trns->writer == NULL) goto error; - - trns->omit_new_lines = (which_formats == WRITE - && fh_get_mode (fh) == FH_MODE_BINARY); } /* Output the variable table if requested. */ @@ -198,7 +203,7 @@ internal_cmd_print (enum which_formats which_formats, bool eject) dump_table (trns, fh); /* Put the transformation in the queue. */ - add_transformation (print_trns_proc, print_trns_free, trns); + add_transformation (ds, print_trns_proc, print_trns_free, trns); pool_destroy (tmp_pool); @@ -211,7 +216,8 @@ internal_cmd_print (enum which_formats which_formats, bool eject) static bool parse_string_argument (struct print_trns *, int record, int *column); -static bool parse_variable_argument (struct print_trns *, +static bool parse_variable_argument (const struct dictionary *, + struct print_trns *, struct pool *tmp_pool, int *record, int *column, enum which_formats); @@ -221,11 +227,18 @@ static bool parse_variable_argument (struct print_trns *, Returns success. */ static bool parse_specs (struct pool *tmp_pool, struct print_trns *trns, + struct dictionary *dict, enum which_formats which_formats) { int record = 0; int column = 1; + if (token == '.') + { + trns->record_cnt = 1; + return true; + } + while (token != '.') { bool ok; @@ -236,10 +249,12 @@ parse_specs (struct pool *tmp_pool, struct print_trns *trns, if (token == T_STRING) ok = parse_string_argument (trns, record, &column); else - ok = parse_variable_argument (trns, tmp_pool, &record, &column, + ok = parse_variable_argument (dict, trns, tmp_pool, &record, &column, which_formats); if (!ok) return 0; + + lex_match (','); } if (trns->record_cnt != 0 && trns->record_cnt != record) @@ -286,7 +301,8 @@ parse_string_argument (struct print_trns *trns, int record, int *column) to fixed_parse_compatible() or fixed_parse_fortran() as appropriate. Returns success. */ static bool -parse_variable_argument (struct print_trns *trns, struct pool *tmp_pool, +parse_variable_argument (const struct dictionary *dict, + struct print_trns *trns, struct pool *tmp_pool, int *record, int *column, enum which_formats which_formats) { @@ -296,13 +312,13 @@ parse_variable_argument (struct print_trns *trns, struct pool *tmp_pool, size_t format_cnt; bool add_space; - if (!parse_variables_pool (tmp_pool, - default_dict, &vars, &var_cnt, PV_DUPLICATE)) + if (!parse_variables_pool (tmp_pool, dict, &vars, &var_cnt, PV_DUPLICATE)) return false; if (lex_is_number () || token == '(') { - if (!parse_var_placements (tmp_pool, var_cnt, &formats, &format_cnt)) + if (!parse_var_placements (tmp_pool, var_cnt, false, + &formats, &format_cnt)) return false; add_space = false; } @@ -319,7 +335,7 @@ parse_variable_argument (struct print_trns *trns, struct pool *tmp_pool, struct variable *v = vars[i]; formats[i] = which_formats == PRINT ? v->print : v->write; } - add_space = true; + add_space = which_formats == PRINT; } var_idx = 0; @@ -330,7 +346,7 @@ parse_variable_argument (struct print_trns *trns, struct pool *tmp_pool, struct prt_out_spec *spec; var = vars[var_idx++]; - if (!check_specifier_width (f, var->width, true)) + if (!fmt_check_width_compat (f, var->width)) return false; spec = pool_alloc (trns->pool, sizeof *spec); @@ -340,6 +356,16 @@ parse_variable_argument (struct print_trns *trns, struct pool *tmp_pool, spec->var = var; spec->format = *f; spec->add_space = add_space; + + /* This is a completely bizarre twist for compatibility: + WRITE outputs the system-missing value as a field + filled with spaces, instead of using the normal format + that usually contains a period. */ + spec->sysmis_as_spaces = (which_formats == WRITE + && var->type == NUMERIC + && (fmt_get_category (spec->format.type) + != FMT_CAT_BINARY)); + ll_push_tail (&trns->specs, &spec->ll); *column += f->w + add_space; @@ -373,6 +399,7 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) row = 1; ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) { + char fmt_string[FMT_STRING_LEN_MAX + 1]; int width; switch (spec->type) { @@ -384,7 +411,7 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) case PRT_VAR: tab_text (t, 0, row, TAB_LEFT, spec->var->name); tab_text (t, 3, row, TAB_LEFT | TAB_FIX, - fmt_to_string (&spec->format)); + fmt_to_string (&spec->format, fmt_string)); width = spec->format.w; break; default: @@ -409,62 +436,83 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) /* Transformation. */ -static void flush_records (struct print_trns *, - int target_record, int *record); +static void flush_records (struct print_trns *, int target_record, + bool *eject, int *record); /* Performs the transformation inside print_trns T on case C. */ static int -print_trns_proc (void *trns_, struct ccase *c, int case_num UNUSED) +print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED) { struct print_trns *trns = trns_; + bool eject = trns->eject; + int record = 1; struct prt_out_spec *spec; - int record; - if (trns->eject) - som_eject_page (); - - record = 1; ds_clear (&trns->line); + ds_put_char (&trns->line, ' '); ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) { - flush_records (trns, spec->record, &record); + flush_records (trns, spec->record, &eject, &record); - ds_set_length (&trns->line, spec->first_column - 1, ' '); + ds_set_length (&trns->line, spec->first_column, ' '); if (spec->type == PRT_VAR) { - data_out (ds_put_uninit (&trns->line, spec->format.w), - &spec->format, case_data (c, spec->var->fv)); + const union value *input = case_data (c, spec->var->fv); + char *output = ds_put_uninit (&trns->line, spec->format.w); + if (!spec->sysmis_as_spaces || input->f != SYSMIS) + data_out (input, &spec->format, output); + else + memset (output, ' ', spec->format.w); if (spec->add_space) ds_put_char (&trns->line, ' '); } else ds_put_substring (&trns->line, ds_ss (&spec->string)); } - flush_records (trns, trns->record_cnt + 1, &record); + flush_records (trns, trns->record_cnt + 1, &eject, &record); if (trns->writer != NULL && dfm_write_error (trns->writer)) return TRNS_ERROR; return TRNS_CONTINUE; } +/* Advance from *RECORD to TARGET_RECORD, outputting records + along the way. If *EJECT is true, then the first record + output is preceded by ejecting the page (and *EJECT is set + false). */ static void -flush_records (struct print_trns *trns, int target_record, int *record) +flush_records (struct print_trns *trns, int target_record, + bool *eject, int *record) { - while (target_record > *record) + for (; target_record > *record; (*record)++) { + char *line = ds_cstr (&trns->line); + size_t length = ds_length (&trns->line); + char leader = ' '; + + if (*eject) + { + *eject = false; + if (trns->writer == NULL) + som_eject_page (); + else + leader = '1'; + } + line[0] = leader; + if (trns->writer == NULL) - tab_output_text (TAB_FIX | TAT_NOWRAP, ds_cstr (&trns->line)); + tab_output_text (TAB_FIX | TAT_NOWRAP, &line[1]); else { - if (!trns->omit_new_lines) - ds_put_char (&trns->line, '\n'); - - dfm_put_record (trns->writer, - ds_data (&trns->line), ds_length (&trns->line)); + if (!trns->include_prefix) + { + line++; + length--; + } + dfm_put_record (trns->writer, line, length); } - ds_clear (&trns->line); - - (*record)++; + + ds_truncate (&trns->line, 1); } }