X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=fd4e1a93839e27b453abdc9298a559f3b1b8ce6d;hp=66ababdd790eeb91f06c92d35fe285327e32ab68;hb=df9d073532fce1d2ffc26394a3b759ca1003e916;hpb=1b47c4afe993f715c03e7392427b0b8919a26d4e diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 66ababdd..fd4e1a93 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -1,44 +1,47 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2009 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #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 -#include -#include - +#include +#include #if HAVE_LIBTERMCAP #if HAVE_TERMCAP_H @@ -49,6 +52,8 @@ int tgetnum (const char *); #endif /* !HAVE_TERMCAP_H */ #endif /* !HAVE_LIBTERMCAP */ +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -73,19 +78,21 @@ int tgetnum (const char *); endcmd=string "x==1" "one character long"; epoch=custom; errorbreak=errbrk:on/off; - errors=errors:on/off/terminal/listing/both/none; + errors=errors:terminal/listing/both/on/none/off; format=custom; headers=headers:no/yes/blank; highres=hires:on/off; histogram=string "x==1" "one character long"; include=inc:on/off; journal=custom; + log=custom; length=custom; + locale=custom; listing=custom; lowres=lores:auto/on/off; lpi=integer "x>0" "%s must be greater than 0"; menus=menus:standard/extended; - messages=messages:on/off/terminal/listing/both/none; + messages=messages:on/off/terminal/listing/both/on/none/off; mexpand=mexp:on/off; miterate=integer "x>0" "%s must be greater than 0"; mnest=integer "x>0" "%s must be greater than 0"; @@ -97,7 +104,9 @@ int tgetnum (const char *); nulline=null:on/off; printback=prtbck:on/off; prompt=string; - results=res:on/off/terminal/listing/both/none; + results=res:on/off/terminal/listing/both/on/none/off; + rib=rib:msbfirst/lsbfirst/vax/native; + rrb=rrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl; safer=safe:on; scompression=scompress:on/off; scripttab=string "x==1" "one character long"; @@ -105,201 +114,194 @@ int tgetnum (const char *); tb1=string "x==3 || x==11" "3 or 11 characters long"; tbfonts=string; undefined=undef:warn/nowarn; + wib=wib:msbfirst/lsbfirst/vax/native; + wrb=wrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl; width=custom; - workspace=integer "x>=1024" "%s must be at least 1 MB"; + workspace=integer "x>0" "%s must be positive"; xsort=xsort:yes/no. */ +/* (headers) */ + /* (declarations) */ -/* (_functions) */ +/* (functions) */ -static bool do_cc (const char *cc_string, int idx); +static enum integer_format stc_to_integer_format (int stc); +static enum float_format stc_to_float_format (int stc); int -cmd_set (void) +cmd_set (struct lexer *lexer, struct dataset *ds) { struct cmd_set cmd; - bool ok = true; - if (!parse_set (&cmd)) - return CMD_FAILURE; + if (!parse_set (lexer, ds, &cmd, NULL)) + { + free_set (&cmd); + return CMD_FAILURE; + } if (cmd.sbc_cca) - ok = ok && do_cc (cmd.s_cca, 0); + settings_set_cc ( cmd.s_cca, FMT_CCA); if (cmd.sbc_ccb) - ok = ok && do_cc (cmd.s_ccb, 1); + settings_set_cc ( cmd.s_ccb, FMT_CCB); if (cmd.sbc_ccc) - ok = ok && do_cc (cmd.s_ccc, 2); + settings_set_cc ( cmd.s_ccc, FMT_CCC); if (cmd.sbc_ccd) - ok = ok && do_cc (cmd.s_ccd, 3); + settings_set_cc ( cmd.s_ccd, FMT_CCD); if (cmd.sbc_cce) - ok = ok && do_cc (cmd.s_cce, 4); + settings_set_cc ( cmd.s_cce, FMT_CCE); if (cmd.sbc_prompt) - getl_set_prompt (GETL_PROMPT_FIRST, cmd.s_prompt); + prompt_set (PROMPT_FIRST, cmd.s_prompt); if (cmd.sbc_cprompt) - getl_set_prompt (GETL_PROMPT_LATER, cmd.s_cprompt); + prompt_set (PROMPT_LATER, cmd.s_cprompt); if (cmd.sbc_dprompt) - getl_set_prompt (GETL_PROMPT_DATA, cmd.s_dprompt); + prompt_set (PROMPT_DATA, cmd.s_dprompt); if (cmd.sbc_decimal) - set_decimal (cmd.dec == STC_DOT ? '.' : ','); + settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ','); + if (cmd.sbc_echo) - set_echo (cmd.echo == STC_ON); + settings_set_echo (cmd.echo == STC_ON); if (cmd.sbc_endcmd) - set_endcmd (cmd.s_endcmd[0]); + settings_set_endcmd (cmd.s_endcmd[0]); if (cmd.sbc_errorbreak) - set_errorbreak (cmd.errbrk == STC_ON); + settings_set_errorbreak (cmd.errbrk == STC_ON); + if (cmd.sbc_errors) + { + bool both = cmd.errors == STC_BOTH || cmd.errors == STC_ON; + settings_set_error_routing_to_terminal (cmd.errors == STC_TERMINAL || both); + settings_set_error_routing_to_listing (cmd.errors == STC_LISTING || both); + } if (cmd.sbc_include) - set_include (cmd.inc == STC_ON); + settings_set_include (cmd.inc == STC_ON); if (cmd.sbc_mxerrs) - set_mxerrs (cmd.n_mxerrs[0]); + settings_set_mxerrs (cmd.n_mxerrs[0]); if (cmd.sbc_mxwarns) - set_mxwarns (cmd.n_mxwarns[0]); + settings_set_mxwarns (cmd.n_mxwarns[0]); if (cmd.sbc_nulline) - set_nulline (cmd.null == STC_ON); + settings_set_nulline (cmd.null == STC_ON); + if (cmd.sbc_rib) + settings_set_input_integer_format (stc_to_integer_format (cmd.rib)); + if (cmd.sbc_rrb) + settings_set_input_float_format (stc_to_float_format (cmd.rrb)); if (cmd.sbc_safer) - set_safer_mode (); + settings_set_safer_mode (); if (cmd.sbc_scompression) - set_scompression (cmd.scompress == STC_ON); + settings_set_scompression (cmd.scompress == STC_ON); if (cmd.sbc_undefined) - set_undefined (cmd.undef == STC_WARN); + settings_set_undefined (cmd.undef == STC_WARN); + if (cmd.sbc_wib) + settings_set_output_integer_format (stc_to_integer_format (cmd.wib)); + if (cmd.sbc_wrb) + settings_set_output_float_format (stc_to_float_format (cmd.wrb)); if (cmd.sbc_workspace) - set_workspace (cmd.n_workspace[0] * 1024L); + { + if ( cmd.n_workspace[0] < 1024 && ! settings_get_testing_mode ()) + msg (SE, _("WORKSPACE must be at least 1MB")); + else + settings_set_workspace (cmd.n_workspace[0] * 1024L); + } if (cmd.sbc_block) - msg (SW, _("%s is obsolete."),"BLOCK"); + msg (SW, _("%s is obsolete."), "BLOCK"); if (cmd.sbc_boxstring) - msg (SW, _("%s is obsolete."),"BOXSTRING"); + msg (SW, _("%s is obsolete."), "BOXSTRING"); if (cmd.sbc_histogram) - msg (MW, _("%s is obsolete."),"HISTOGRAM"); - if (cmd.sbc_menus ) - msg (MW, _("%s is obsolete."),"MENUS"); - if (cmd.sbc_xsort ) - msg (SW, _("%s is obsolete."),"XSORT"); - if (cmd.sbc_mxmemory ) - msg (SE, _("%s is obsolete."),"MXMEMORY"); + msg (SW, _("%s is obsolete."), "HISTOGRAM"); + if (cmd.sbc_menus) + msg (SW, _("%s is obsolete."), "MENUS"); + if (cmd.sbc_xsort) + msg (SW, _("%s is obsolete."), "XSORT"); + if (cmd.sbc_mxmemory) + msg (SE, _("%s is obsolete."), "MXMEMORY"); if (cmd.sbc_scripttab) - msg (SE, _("%s is obsolete."),"SCRIPTTAB"); + msg (SE, _("%s is obsolete."), "SCRIPTTAB"); if (cmd.sbc_tbfonts) - msg (SW, _("%s is obsolete."),"TBFONTS"); + msg (SW, _("%s is obsolete."), "TBFONTS"); if (cmd.sbc_tb1 && cmd.s_tb1) - msg (SW, _("%s is obsolete."),"TB1"); + msg (SW, _("%s is obsolete."), "TB1"); if (cmd.sbc_case) msg (SW, _("%s is not implemented."), "CASE"); if (cmd.sbc_compression) - msg (MW, _("Active file compression is not implemented.")); + msg (SW, _("Active file compression is not implemented.")); + + free_set (&cmd); return CMD_SUCCESS; } -/* Find the grouping characters in CC_STRING and set CC's - grouping and decimal members appropriately. Returns true if - successful, false otherwise. */ -static bool -find_cc_separators (const char *cc_string, struct custom_currency *cc) -{ - const char *sp; - int comma_cnt, dot_cnt; - - /* Count commas and periods. There must be exactly three of - one or the other, except that an apostrophe acts escapes a - following comma or period. */ - comma_cnt = dot_cnt = 0; - for (sp = cc_string; *sp; sp++) - if (*sp == ',') - comma_cnt++; - else if (*sp == '.') - dot_cnt++; - else if (*sp == '\'' && (sp[1] == '.' || sp[1] == ',' || sp[1] == '\'')) - sp++; - - if ((comma_cnt == 3) == (dot_cnt == 3)) - return false; - - if (comma_cnt == 3) - { - cc->decimal = '.'; - cc->grouping = ','; - } - else - { - cc->decimal = ','; - cc->grouping = '.'; - } - return true; +/* Returns the integer_format value corresponding to STC, + which should be the value of cmd.rib or cmd.wib. */ +static enum integer_format +stc_to_integer_format (int stc) +{ + return (stc == STC_MSBFIRST ? INTEGER_MSB_FIRST + : stc == STC_LSBFIRST ? INTEGER_LSB_FIRST + : stc == STC_VAX ? INTEGER_VAX + : INTEGER_NATIVE); } -/* Extracts a token from IN into TOKEn. Tokens are delimited by - GROUPING. The token is truncated to at most CC_WIDTH - characters (including null terminator). Returns the first - character following the token. */ -static const char * -extract_cc_token (const char *in, int grouping, char token[CC_WIDTH]) +/* Returns the float_format value corresponding to STC, + which should be the value of cmd.rrb or cmd.wrb. */ +static enum float_format +stc_to_float_format (int stc) { - char *out = token; - - for (; *in != '\0' && *in != grouping; in++) + switch (stc) { - if (*in == '\'' && in[1] == grouping) - in++; - if (out < &token[CC_WIDTH - 1]) - *out++ = *in; + case STC_NATIVE: + return FLOAT_NATIVE_DOUBLE; + + case STC_ISL: + return FLOAT_IEEE_SINGLE_LE; + case STC_ISB: + return FLOAT_IEEE_SINGLE_BE; + case STC_IDL: + return FLOAT_IEEE_DOUBLE_LE; + case STC_IDB: + return FLOAT_IEEE_DOUBLE_BE; + + case STC_VF: + return FLOAT_VAX_F; + case STC_VD: + return FLOAT_VAX_D; + case STC_VG: + return FLOAT_VAX_G; + + case STC_ZS: + return FLOAT_Z_SHORT; + case STC_ZL: + return FLOAT_Z_LONG; } - *out = '\0'; - if (*in == grouping) - in++; - return in; + NOT_REACHED (); } -/* Sets custom currency specifier CC having name CC_NAME ('A' through - 'E') to correspond to the settings in CC_STRING. */ -static bool -do_cc (const char *cc_string, int idx) -{ - struct custom_currency cc; - - /* Determine separators. */ - if (!find_cc_separators (cc_string, &cc)) - { - msg (SE, _("CC%c: Custom currency string `%s' does not contain " - "exactly three periods or commas (not both)."), - "ABCDE"[idx], cc_string); - return false; - } - - cc_string = extract_cc_token (cc_string, cc.grouping, cc.neg_prefix); - cc_string = extract_cc_token (cc_string, cc.grouping, cc.prefix); - cc_string = extract_cc_token (cc_string, cc.grouping, cc.suffix); - cc_string = extract_cc_token (cc_string, cc.grouping, cc.neg_suffix); - set_cc (idx, &cc); - - return true; -} /* Parses the BLANKS subcommand, which controls the value that completely blank fields in numeric data imply. X, Wnd: Syntax is SYSMIS or a numeric value. */ static int -stc_custom_blanks (struct cmd_set *cmd UNUSED) +stc_custom_blanks (struct lexer *lexer, + struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match ('='); - if ((token == T_ID && lex_id_match ("SYSMIS", tokid))) + lex_match (lexer, '='); + if (lex_match_id (lexer, "SYSMIS")) { - lex_get (); - set_blanks (SYSMIS); + lex_get (lexer); + settings_set_blanks (SYSMIS); } else { - if (!lex_force_num ()) + if (!lex_force_num (lexer)) return 0; - set_blanks (lex_number ()); - lex_get (); + settings_set_blanks (lex_number (lexer)); + lex_get (lexer); } return 1; } @@ -307,25 +309,27 @@ stc_custom_blanks (struct cmd_set *cmd UNUSED) /* Parses the EPOCH subcommand, which controls the epoch used for parsing 2-digit years. */ static int -stc_custom_epoch (struct cmd_set *cmd UNUSED) -{ - lex_match ('='); - if (lex_match_id ("AUTOMATIC")) - set_epoch (-1); - else if (lex_is_integer ()) +stc_custom_epoch (struct lexer *lexer, + struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + lex_match (lexer, '='); + if (lex_match_id (lexer, "AUTOMATIC")) + settings_set_epoch (-1); + else if (lex_is_integer (lexer)) { - int new_epoch = lex_integer (); - lex_get (); - if (new_epoch < 1500) + int new_epoch = lex_integer (lexer); + lex_get (lexer); + if (new_epoch < 1500) { msg (SE, _("EPOCH must be 1500 or later.")); return 0; } - set_epoch (new_epoch); + settings_set_epoch (new_epoch); } - else + else { - lex_error (_("expecting AUTOMATIC or year")); + lex_error (lexer, _("expecting AUTOMATIC or year")); return 0; } @@ -333,68 +337,103 @@ stc_custom_epoch (struct cmd_set *cmd UNUSED) } static int -stc_custom_length (struct cmd_set *cmd UNUSED) +stc_custom_length (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { int page_length; - lex_match ('='); - if (lex_match_id ("NONE")) + lex_match (lexer, '='); + if (lex_match_id (lexer, "NONE")) page_length = -1; else { - if (!lex_force_int ()) + if (!lex_force_int (lexer)) return 0; - if (lex_integer () < 1) + if (lex_integer (lexer) < 1) { msg (SE, _("LENGTH must be at least 1.")); return 0; } - page_length = lex_integer (); - lex_get (); + page_length = lex_integer (lexer); + lex_get (lexer); + } + + if (page_length != -1) + settings_set_viewlength (page_length); + + return 1; +} + +static int +stc_custom_locale (struct lexer *lexer, struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + const struct string *s; + + lex_match (lexer, '='); + + if ( !lex_force_string (lexer)) + return 0; + + s = lex_tokstr (lexer); + + /* First try this string as an encoding name */ + if ( valid_encoding (ds_cstr (s))) + set_default_encoding (ds_cstr (s)); + + /* Now try as a locale name (or alias) */ + else if (set_encoding_from_locale (ds_cstr (s))) + { + } + else + { + msg (ME, _("%s is not a recognised encoding or locale name"), + ds_cstr (s)); + return 0; } - if (page_length != -1) - set_viewlength (page_length); + lex_get (lexer); return 1; } + + static int -stc_custom_seed (struct cmd_set *cmd UNUSED) +stc_custom_seed (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match ('='); - if (lex_match_id ("RANDOM")) + lex_match (lexer, '='); + if (lex_match_id (lexer, "RANDOM")) set_rng (time (0)); else { - if (!lex_force_num ()) + if (!lex_force_num (lexer)) return 0; - set_rng (lex_number ()); - lex_get (); + set_rng (lex_number (lexer)); + lex_get (lexer); } return 1; } static int -stc_custom_width (struct cmd_set *cmd UNUSED) +stc_custom_width (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match ('='); - if (lex_match_id ("NARROW")) - set_viewwidth (79); - else if (lex_match_id ("WIDE")) - set_viewwidth (131); + lex_match (lexer, '='); + if (lex_match_id (lexer, "NARROW")) + settings_set_viewwidth (79); + else if (lex_match_id (lexer, "WIDE")) + settings_set_viewwidth (131); else { - if (!lex_force_int ()) + if (!lex_force_int (lexer)) return 0; - if (lex_integer () < 40) + if (lex_integer (lexer) < 40) { msg (SE, _("WIDTH must be at least 40.")); return 0; } - set_viewwidth (lex_integer ()); - lex_get (); + settings_set_viewwidth (lex_integer (lexer)); + lex_get (lexer); } return 1; @@ -403,51 +442,62 @@ stc_custom_width (struct cmd_set *cmd UNUSED) /* Parses FORMAT subcommand, which consists of a numeric format specifier. */ static int -stc_custom_format (struct cmd_set *cmd UNUSED) +stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { struct fmt_spec fmt; - lex_match ('='); - if (!parse_format_specifier (&fmt, 0)) + lex_match (lexer, '='); + if (!parse_format_specifier (lexer, &fmt)) return 0; - if ((formats[fmt.type].cat & FCAT_STRING) != 0) + if (fmt_is_string (fmt.type)) { + char str[FMT_STRING_LEN_MAX + 1]; msg (SE, _("FORMAT requires numeric output format as an argument. " "Specified format %s is of type string."), - fmt_to_string (&fmt)); + fmt_to_string (&fmt, str)); return 0; } - set_format (&fmt); + settings_set_format (&fmt); return 1; } static int -stc_custom_journal (struct cmd_set *cmd UNUSED) -{ - lex_match ('='); - if (!lex_match_id ("ON") && !lex_match_id ("OFF")) +stc_custom_journal (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + lex_match (lexer, '='); + if (lex_match_id (lexer, "ON") || lex_match_id (lexer, "YES")) + journal_enable (); + else if (lex_match_id (lexer, "OFF") || lex_match_id (lexer, "NO")) + journal_disable (); + else if (lex_token (lexer) == T_STRING || lex_token (lexer) == T_ID) { - if (token == T_STRING) - lex_get (); - else - { - lex_error (NULL); - return 0; - } + journal_set_file_name (ds_cstr (lex_tokstr (lexer))); + lex_get (lexer); + } + else + { + lex_error (lexer, NULL); + return 0; } return 1; } static int -stc_custom_listing (struct cmd_set *cmd UNUSED) +stc_custom_log (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + return stc_custom_journal (lexer, ds, cmd, aux); +} + +static int +stc_custom_listing (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { bool listing; - lex_match ('='); - if (lex_match_id ("ON") || lex_match_id ("YES")) + lex_match (lexer, '='); + if (lex_match_id (lexer, "ON") || lex_match_id (lexer, "YES")) listing = true; - else if (lex_match_id ("OFF") || lex_match_id ("NO")) + else if (lex_match_id (lexer, "OFF") || lex_match_id (lexer, "NO")) listing = false; else { @@ -460,166 +510,256 @@ stc_custom_listing (struct cmd_set *cmd UNUSED) } static int -stc_custom_disk (struct cmd_set *cmd UNUSED) +stc_custom_disk (struct lexer *lexer, struct dataset *ds, struct cmd_set *cmd UNUSED, void *aux) { - return stc_custom_listing (cmd); + return stc_custom_listing (lexer, ds, cmd, aux); } +static char * +show_blanks (const struct dataset *ds UNUSED) +{ + return (settings_get_blanks () == SYSMIS + ? xstrdup ("SYSMIS") + : xasprintf ("%g", settings_get_blanks ())); +} + static void -show_blanks (void) +format_cc (struct string *out, struct substring in, char grouping) { - if (get_blanks () == SYSMIS) - msg (MN, _("BLANKS is SYSMIS.")); - else - msg (MN, _("BLANKS is %g."), get_blanks ()); + while (!ss_is_empty (in)) + { + char c = ss_get_char (&in); + if (c == grouping || c == '\'') + ds_put_char (out, '\''); + else if (c == '"') + ds_put_char (out, '"'); + ds_put_char (out, c); + } +} + +static char * +show_cc (enum fmt_type type) +{ + const struct fmt_number_style *cc = settings_get_style (type); + struct string out; + ds_init_empty (&out); + format_cc (&out, cc->neg_prefix, cc->grouping); + ds_put_char (&out, cc->grouping); + format_cc (&out, cc->prefix, cc->grouping); + ds_put_char (&out, cc->grouping); + format_cc (&out, cc->suffix, cc->grouping); + ds_put_char (&out, cc->grouping); + format_cc (&out, cc->neg_suffix, cc->grouping); + + return ds_cstr (&out); } static char * -format_cc (const char *in, char grouping, char *out) +show_cca (const struct dataset *ds UNUSED) { - while (*in != '\0') - { - if (*in == grouping || *in == '\'') - *out++ = '\''; - *out++ = *in++; - } - return out; + return show_cc (FMT_CCA); } -static void -show_cc (int idx) +static char * +show_ccb (const struct dataset *ds UNUSED) { - const struct custom_currency *cc = get_cc (idx); - char cc_string[CC_WIDTH * 4 * 2 + 3 + 1]; - char *out; + return show_cc (FMT_CCB); +} - out = format_cc (cc->neg_prefix, cc->grouping, cc_string); - *out++ = cc->grouping; - out = format_cc (cc->prefix, cc->grouping, out); - *out++ = cc->grouping; - out = format_cc (cc->suffix, cc->grouping, out); - *out++ = cc->grouping; - out = format_cc (cc->neg_suffix, cc->grouping, out); - *out = '\0'; - - msg (MN, _("CC%c is \"%s\"."), "ABCDE"[idx], cc_string); +static char * +show_ccc (const struct dataset *ds UNUSED) +{ + return show_cc (FMT_CCC); } +static char * +show_ccd (const struct dataset *ds UNUSED) +{ + return show_cc (FMT_CCD); +} -static void -show_cca (void) +static char * +show_cce (const struct dataset *ds UNUSED) { - show_cc (0); + return show_cc (FMT_CCE); } -static void -show_ccb (void) +static char * +show_decimals (const struct dataset *ds UNUSED) { - show_cc (1); + return xasprintf ("\"%c\"", settings_get_decimal_char (FMT_F)); } -static void -show_ccc (void) +static char * +show_endcmd (const struct dataset *ds UNUSED) { - show_cc (2); + return xasprintf ("\"%c\"", settings_get_endcmd ()); } -static void -show_ccd (void) +static char * +show_errors (const struct dataset *ds UNUSED) { - show_cc (3); + bool terminal = settings_get_error_routing_to_terminal (); + bool listing = settings_get_error_routing_to_listing (); + return xstrdup (terminal && listing ? "BOTH" + : terminal ? "TERMINAL" + : listing ? "LISTING" + : "NONE"); } -static void -show_cce (void) +static char * +show_format (const struct dataset *ds UNUSED) { - show_cc (4); + char str[FMT_STRING_LEN_MAX + 1]; + return xstrdup (fmt_to_string (settings_get_format (), str)); } -static void -show_decimals (void) +static char * +show_length (const struct dataset *ds UNUSED) { - msg (MN, _("DECIMAL is \"%c\"."), get_decimal ()); + return xasprintf ("%d", settings_get_viewlength ()); } -static void -show_endcmd (void) +static char * +show_locale (const struct dataset *ds UNUSED) { - msg (MN, _("ENDCMD is \"%c\"."), get_endcmd ()); + return xstrdup (get_default_encoding ()); } -static void -show_format (void) +static char * +show_mxerrs (const struct dataset *ds UNUSED) { - msg (MN, _("FORMAT is %s."), fmt_to_string (get_format ())); + return xasprintf ("%d", settings_get_mxerrs ()); } -static void -show_length (void) +static char * +show_mxloops (const struct dataset *ds UNUSED) { - msg (MN, _("LENGTH is %d."), get_viewlength ()); + return xasprintf ("%d", settings_get_mxloops ()); } -static void -show_mxerrs (void) +static char * +show_mxwarns (const struct dataset *ds UNUSED) { - msg (MN, _("MXERRS is %d."), get_mxerrs ()); + return xasprintf ("%d", settings_get_mxwarns ()); } -static void -show_mxloops (void) +/* Returns a name for the given INTEGER_FORMAT value. */ +static char * +show_integer_format (enum integer_format integer_format) { - msg (MN, _("MXLOOPS is %d."), get_mxloops ()); + return xasprintf ("%s (%s)", + (integer_format == INTEGER_MSB_FIRST ? "MSBFIRST" + : integer_format == INTEGER_LSB_FIRST ? "LSBFIRST" + : "VAX"), + integer_format == INTEGER_NATIVE ? "NATIVE" : "nonnative"); } -static void -show_mxwarns (void) +/* Returns a name for the given FLOAT_FORMAT value. */ +static char * +show_float_format (enum float_format float_format) { - msg (MN, _("MXWARNS is %d."), get_mxwarns ()); + const char *format_name = ""; + + switch (float_format) + { + case FLOAT_IEEE_SINGLE_LE: + format_name = _("ISL (32-bit IEEE 754 single, little-endian)"); + break; + case FLOAT_IEEE_SINGLE_BE: + format_name = _("ISB (32-bit IEEE 754 single, big-endian)"); + break; + case FLOAT_IEEE_DOUBLE_LE: + format_name = _("IDL (64-bit IEEE 754 double, little-endian)"); + break; + case FLOAT_IEEE_DOUBLE_BE: + format_name = _("IDB (64-bit IEEE 754 double, big-endian)"); + break; + + case FLOAT_VAX_F: + format_name = _("VF (32-bit VAX F, VAX-endian)"); + break; + case FLOAT_VAX_D: + format_name = _("VD (64-bit VAX D, VAX-endian)"); + break; + case FLOAT_VAX_G: + format_name = _("VG (64-bit VAX G, VAX-endian)"); + break; + + case FLOAT_Z_SHORT: + format_name = _("ZS (32-bit IBM Z hexadecimal short, big-endian)"); + break; + case FLOAT_Z_LONG: + format_name = _("ZL (64-bit IBM Z hexadecimal long, big-endian)"); + break; + + case FLOAT_FP: + case FLOAT_HEX: + NOT_REACHED (); + } + + return xasprintf ("%s (%s)", format_name, + (float_format == FLOAT_NATIVE_DOUBLE + ? "NATIVE" : "nonnative")); } -static void -show_scompression (void) +static char * +show_rib (const struct dataset *ds UNUSED) { - if (get_scompression ()) - msg (MN, _("SCOMPRESSION is ON.")); - else - msg (MN, _("SCOMPRESSION is OFF.")); + return show_integer_format (settings_get_input_integer_format ()); } -static void -show_undefined (void) +static char * +show_rrb (const struct dataset *ds UNUSED) { - if (get_undefined ()) - msg (MN, _("UNDEFINED is WARN.")); - else - msg (MN, _("UNDEFINED is NOWARN.")); + return show_float_format (settings_get_input_float_format ()); } -static void -show_weight (void) +static char * +show_scompression (const struct dataset *ds UNUSED) { - struct variable *var = dict_get_weight (default_dict); - if (var == NULL) - msg (MN, _("WEIGHT is off.")); - else - msg (MN, _("WEIGHT is variable %s."), var->name); + return xstrdup (settings_get_scompression () ? "ON" : "OFF"); } -static void -show_width (void) +static char * +show_undefined (const struct dataset *ds UNUSED) +{ + return xstrdup (settings_get_undefined () ? "WARN" : "NOWARN"); +} + +static char * +show_weight (const struct dataset *ds) +{ + const struct variable *var = dict_get_weight (dataset_dict (ds)); + return xstrdup (var != NULL ? var_get_name (var) : "OFF"); +} + +static char * +show_wib (const struct dataset *ds UNUSED) +{ + return show_integer_format (settings_get_output_integer_format ()); +} + +static char * +show_wrb (const struct dataset *ds UNUSED) +{ + return show_float_format (settings_get_output_float_format ()); +} + +static char * +show_width (const struct dataset *ds UNUSED) { - msg (MN, _("WIDTH is %d."), get_viewwidth ()); + return xasprintf ("%d", settings_get_viewwidth ()); } -struct show_sbc +struct show_sbc { const char *name; - void (*function) (void); + char *(*function) (const struct dataset *); }; -struct show_sbc show_table[] = +const struct show_sbc show_table[] = { {"BLANKS", show_blanks}, {"CCA", show_cca}, @@ -629,90 +769,111 @@ struct show_sbc show_table[] = {"CCE", show_cce}, {"DECIMALS", show_decimals}, {"ENDCMD", show_endcmd}, + {"ERRORS", show_errors}, {"FORMAT", show_format}, {"LENGTH", show_length}, + {"LOCALE", show_locale}, {"MXERRS", show_mxerrs}, {"MXLOOPS", show_mxloops}, {"MXWARNS", show_mxwarns}, + {"RIB", show_rib}, + {"RRB", show_rrb}, {"SCOMPRESSION", show_scompression}, {"UNDEFINED", show_undefined}, {"WEIGHT", show_weight}, + {"WIB", show_wib}, + {"WRB", show_wrb}, {"WIDTH", show_width}, }; static void -show_all (void) +do_show (const struct dataset *ds, const struct show_sbc *sbc) +{ + char *value = sbc->function (ds); + msg (SN, _("%s is %s."), sbc->name, value); + free (value); +} + +static void +show_all (const struct dataset *ds) { size_t i; - + for (i = 0; i < sizeof show_table / sizeof *show_table; i++) - show_table[i].function (); + do_show (ds, &show_table[i]); } static void -show_all_cc (void) +show_all_cc (const struct dataset *ds) { int i; - for (i = 0; i < 5; i++) - show_cc (i); + for (i = 0; i < sizeof show_table / sizeof *show_table; i++) + { + const struct show_sbc *sbc = &show_table[i]; + if (!strncmp (sbc->name, "CC", 2)) + do_show (ds, sbc); + } } static void -show_warranty (void) +show_warranty (const struct dataset *ds UNUSED) { - msg (MN, lack_of_warranty); + fputs (lack_of_warranty, stdout); } static void -show_copying (void) +show_copying (const struct dataset *ds UNUSED) { - msg (MN, copyleft); + fputs (copyleft, stdout); } int -cmd_show (void) +cmd_show (struct lexer *lexer, struct dataset *ds) { - if (token == '.') + if (lex_token (lexer) == '.') { - show_all (); + show_all (ds); return CMD_SUCCESS; } - do + do { - if (lex_match (T_ALL)) - show_all (); - else if (lex_match_id ("CC")) - show_all_cc (); - else if (lex_match_id ("WARRANTY")) - show_warranty (); - else if (lex_match_id ("COPYING")) - show_copying (); - else if (token == T_ID) + if (lex_match (lexer, T_ALL)) + show_all (ds); + else if (lex_match_id (lexer, "CC")) + show_all_cc (ds); + else if (lex_match_id (lexer, "WARRANTY")) + show_warranty (ds); + else if (lex_match_id (lexer, "COPYING")) + show_copying (ds); + else if (lex_token (lexer) == T_ID) { int i; for (i = 0; i < sizeof show_table / sizeof *show_table; i++) - if (lex_match_id (show_table[i].name)) - { - show_table[i].function (); - goto found; + { + const struct show_sbc *sbc = &show_table[i]; + if (lex_match_id (lexer, sbc->name)) + { + do_show (ds, sbc); + goto found; + } } - lex_error (NULL); - return CMD_PART_SUCCESS_MAYBE; + lex_error (lexer, NULL); + return CMD_FAILURE; found: ; } - else + else { - lex_error (NULL); - return CMD_PART_SUCCESS_MAYBE; + lex_error (lexer, NULL); + return CMD_FAILURE; } - lex_match ('/'); + lex_match (lexer, '/'); } - while (token != '.'); + while (lex_token (lexer) != '.'); return CMD_SUCCESS; }