X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=1bcd047763f25cdba3d6f6509216b0ec0adc5ffa;hb=f9d0b49f59af300be5600141a0096b26c96abce9;hp=8454c1b885e8e656afacbfdedadc57176eef9f14;hpb=9ce038d9719d4383a57a0416dc36a905b46d14ec;p=pspp-builds.git diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index 8454c1b8..1bcd0477 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 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 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -31,13 +32,14 @@ #include #include #include +#include #include #include #include #include #include -#include -#include +#include +#include #include "xalloc.h" @@ -82,7 +84,7 @@ struct print_trns struct pool *pool; /* Stores related data. */ bool eject; /* Eject page before printing? */ bool include_prefix; /* Prefix lines with space? */ - enum legacy_encoding encoding; /* Encoding to use for output. */ + const char *encoding; /* Encoding to use for output. */ 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. */ @@ -148,11 +150,11 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds, tmp_pool = pool_create_subpool (trns->pool); /* Parse the command options. */ - while (lex_token (lexer) != '/' && lex_token (lexer) != '.') + while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD) { if (lex_match_id (lexer, "OUTFILE")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); fh = fh_parse (lexer, FH_REF_FILE); if (fh == NULL) @@ -160,13 +162,13 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds, } else if (lex_match_id (lexer, "RECORDS")) { - lex_match (lexer, '='); - lex_match (lexer, '('); + lex_match (lexer, T_EQUALS); + lex_match (lexer, T_LPAREN); if (!lex_force_int (lexer)) goto error; trns->record_cnt = lex_integer (lexer); lex_get (lexer); - lex_match (lexer, ')'); + lex_match (lexer, T_RPAREN); } else if (lex_match_id (lexer, "TABLE")) print_table = true; @@ -198,7 +200,7 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds, trns->encoding = dfm_writer_get_legacy_encoding (trns->writer); } else - trns->encoding = LEGACY_NATIVE; + trns->encoding = UTF8; /* Output the variable table if requested. */ if (print_table) @@ -237,20 +239,20 @@ parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns int record = 0; int column = 1; - if (lex_token (lexer) == '.') + if (lex_token (lexer) == T_ENDCMD) { trns->record_cnt = 1; return true; } - while (lex_token (lexer) != '.') + while (lex_token (lexer) != T_ENDCMD) { bool ok; if (!parse_record_placement (lexer, &record, &column)) return false; - if (lex_token (lexer) == T_STRING) + if (lex_is_string (lexer)) ok = parse_string_argument (lexer, trns, record, &column); else ok = parse_variable_argument (lexer, dict, trns, tmp_pool, &record, &column, @@ -258,7 +260,7 @@ parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns if (!ok) return 0; - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } if (trns->record_cnt != 0 && trns->record_cnt != record) @@ -278,7 +280,7 @@ parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record, spec->type = PRT_LITERAL; spec->record = record; spec->first_column = *column; - ds_init_string (&spec->string, lex_tokstr (lexer)); + ds_init_substring (&spec->string, lex_tokss (lexer)); ds_register_pool (&spec->string, trns->pool); lex_get (lexer); @@ -321,7 +323,7 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict, &vars, &var_cnt, PV_DUPLICATE)) return false; - if (lex_is_number (lexer) || lex_token (lexer) == '(') + if (lex_is_number (lexer) || lex_token (lexer) == T_LPAREN) { if (!parse_var_placements (lexer, tmp_pool, var_cnt, false, &formats, &format_cnt)) @@ -332,7 +334,7 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict, { size_t i; - lex_match (lexer, '*'); + lex_match (lexer, T_ASTERISK); formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats); format_cnt = var_cnt; @@ -394,8 +396,7 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) int row; spec_cnt = ll_count (&trns->specs); - t = tab_create (4, spec_cnt + 1, 0); - tab_columns (t, TAB_COL_DOWN, 1); + t = tab_create (4, spec_cnt + 1); tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt); tab_hline (t, TAL_2, 0, 3, 1); tab_headers (t, 0, 0, 1, 0); @@ -403,7 +404,6 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record")); tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns")); tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format")); - tab_dim (t, tab_natural_dimensions); row = 1; ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) { @@ -412,8 +412,9 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) switch (spec->type) { case PRT_LITERAL: - tab_text (t, 0, row, TAB_LEFT | TAB_FIX | TAT_PRINTF, "\"%.*s\"", - (int) ds_length (&spec->string), ds_data (&spec->string)); + tab_text_format (t, 0, row, TAB_LEFT | TAB_FIX, "`%.*s'", + (int) ds_length (&spec->string), + ds_data (&spec->string)); width = ds_length (&spec->string); break; case PRT_VAR: @@ -425,19 +426,19 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) default: NOT_REACHED (); } - tab_text (t, 1, row, TAT_PRINTF, "%d", spec->record); - tab_text (t, 2, row, TAT_PRINTF, "%3d-%3d", - spec->first_column, spec->first_column + width - 1); + tab_text_format (t, 1, row, 0, "%d", spec->record); + tab_text_format (t, 2, row, 0, "%3d-%3d", + spec->first_column, spec->first_column + width - 1); row++; } if (fh != NULL) - tab_title (t, ngettext ("Writing %d record to %s.", - "Writing %d records to %s.", trns->record_cnt), + tab_title (t, ngettext ("Writing %zu record to %s.", + "Writing %zu records to %s.", trns->record_cnt), trns->record_cnt, fh_get_name (fh)); else - tab_title (t, ngettext ("Writing %d record.", - "Writing %d records.", trns->record_cnt), + tab_title (t, ngettext ("Writing %zu record.", + "Writing %zu records.", trns->record_cnt), trns->record_cnt); tab_submit (t); } @@ -449,7 +450,7 @@ static void flush_records (struct print_trns *, int target_record, /* Performs the transformation inside print_trns T on case C. */ static int -print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED) +print_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED) { struct print_trns *trns = trns_; bool eject = trns->eject; @@ -458,7 +459,7 @@ print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED) struct prt_out_spec *spec; ds_clear (&trns->line); - ds_put_char (&trns->line, ' '); + ds_put_byte (&trns->line, ' '); ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) { flush_records (trns, spec->record, &eject, &record); @@ -466,24 +467,25 @@ print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED) ds_set_length (&trns->line, spec->first_column, encoded_space); if (spec->type == PRT_VAR) { - const union value *input = case_data (c, spec->var); + const union value *input = case_data (*c, spec->var); char *output = ds_put_uninit (&trns->line, spec->format.w); if (!spec->sysmis_as_spaces || input->f != SYSMIS) data_out_legacy (input, trns->encoding, &spec->format, output); else memset (output, encoded_space, spec->format.w); if (spec->add_space) - ds_put_char (&trns->line, encoded_space); + ds_put_byte (&trns->line, encoded_space); } else { ds_put_substring (&trns->line, ds_ss (&spec->string)); - if (trns->encoding != LEGACY_NATIVE) + if (0 != strcmp (trns->encoding, LEGACY_NATIVE)) { size_t length = ds_length (&spec->string); char *data = ss_data (ds_tail (&trns->line, length)); - legacy_recode (LEGACY_NATIVE, data, - trns->encoding, data, length); + char *s = recode_string (trns->encoding, LEGACY_NATIVE, data, length); + memcpy (data, s, length); + free (s); } } } @@ -512,14 +514,14 @@ flush_records (struct print_trns *trns, int target_record, { *eject = false; if (trns->writer == NULL) - som_eject_page (); + text_item_submit (text_item_create (TEXT_ITEM_EJECT_PAGE, "")); else leader = '1'; } line[0] = legacy_from_native (trns->encoding, leader); if (trns->writer == NULL) - tab_output_text (TAB_FIX | TAT_NOWRAP, &line[1]); + tab_output_text (TAB_FIX, &line[1]); else { if (!trns->include_prefix)