X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=62798272d1da4904a264c28533428bca726c1f84;hb=a124375065d0768546f6e7670d9c6d6a0b2b5379;hp=2cfa0177c77950f26495aa9a5bd421ab8df73488;hpb=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp-builds.git diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index 2cfa0177..62798272 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, 2009 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 @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include "xalloc.h" @@ -150,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) @@ -162,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; @@ -200,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) @@ -239,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, @@ -260,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) @@ -280,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); @@ -323,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)) @@ -334,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; @@ -396,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); @@ -405,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, NULL); row = 1; ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) { @@ -414,7 +412,7 @@ dump_table (struct print_trns *trns, const struct file_handle *fh) switch (spec->type) { case PRT_LITERAL: - tab_text_format (t, 0, row, TAB_LEFT | TAB_FIX, "\"%.*s\"", + 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); @@ -456,12 +454,12 @@ print_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED) { struct print_trns *trns = trns_; bool eject = trns->eject; - char encoded_space = legacy_from_native (trns->encoding, ' '); + char encoded_space = recode_byte (trns->encoding, C_ENCODING, ' '); int record = 1; 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); @@ -470,22 +468,22 @@ print_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED) if (spec->type == PRT_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); + data_out_recode (input, var_get_encoding (spec->var), + &spec->format, &trns->line, trns->encoding); else - memset (output, encoded_space, spec->format.w); + ds_put_byte_multiple (&trns->line, 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 (0 != strcmp (trns->encoding, LEGACY_NATIVE)) + if (0 != strcmp (trns->encoding, C_ENCODING)) { size_t length = ds_length (&spec->string); char *data = ss_data (ds_tail (&trns->line, length)); - char *s = recode_string (trns->encoding, LEGACY_NATIVE, data, length); + char *s = recode_string (trns->encoding, C_ENCODING, data, length); memcpy (data, s, length); free (s); } @@ -516,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); + line[0] = recode_byte (trns->encoding, C_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)