X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=50ddd9443ed8dc92d956068e8d3d3f07b2e09fc1;hb=14f4522a17db23e67a6fa17876633cc6260cb42b;hp=d264a00ef95880dc4a16155eb1305f6836f77e64;hpb=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;p=pspp diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index d264a00ef9..50ddd9443e 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -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, 2012, 2013, 2014 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 @@ -16,32 +16,38 @@ #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 "gl/vasnprintf.h" + +#include "data/casereader.h" +#include "data/data-in.h" +#include "data/data-out.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/settings.h" +#include "data/value.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/copyleft.h" +#include "libpspp/temp-file.h" +#include "libpspp/version.h" +#include "libpspp/float-format.h" +#include "libpspp/i18n.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "math/random.h" +#include "output/driver.h" +#include "output/journal.h" #if HAVE_LIBTERMCAP #if HAVE_TERMCAP_H @@ -60,8 +66,8 @@ int tgetnum (const char *); /* (specification) "SET" (stc_): blanks=custom; - block=string "x==1" "one character long"; - boxstring=string "x==3 || x==11" "3 or 11 characters long"; + block=string; + boxstring=string; case=size:upper/uplow; cca=string; ccb=string; @@ -69,55 +75,48 @@ int tgetnum (const char *); ccd=string; cce=string; compression=compress:on/off; - cpi=integer "x>0" "%s must be greater than 0"; - cprompt=string; + cpi=integer; decimal=dec:dot/comma; - disk=custom; - dprompt=string; - echo=echo:on/off; - endcmd=string "x==1" "one character long"; epoch=custom; - errorbreak=errbrk:on/off; - errors=errors:terminal/listing/both/on/none/off; + errors=custom; format=custom; headers=headers:no/yes/blank; highres=hires:on/off; - histogram=string "x==1" "one character long"; + histogram=string; 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"; + lpi=integer; menus=menus:standard/extended; - messages=messages:on/off/terminal/listing/both/on/none/off; + messages=custom; mexpand=mexp:on/off; - miterate=integer "x>0" "%s must be greater than 0"; - mnest=integer "x>0" "%s must be greater than 0"; + miterate=integer; + mnest=integer; mprint=mprint:on/off; - mxerrs=integer "x >= 1" "%s must be at least 1"; - mxloops=integer "x >=1" "%s must be at least 1"; + mxerrs=integer; + mxloops=integer; mxmemory=integer; mxwarns=integer; - nulline=null:on/off; - printback=prtbck:on/off; - prompt=string; - results=res:on/off/terminal/listing/both/on/none/off; + printback=custom; + results=custom; 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"; + scripttab=string; seed=custom; - tb1=string "x==3 || x==11" "3 or 11 characters long"; + tnumbers=custom; + tvars=custom; + tb1=string; 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>0" "%s must be positive"; + workspace=integer; xsort=xsort:yes/no. */ @@ -152,36 +151,32 @@ cmd_set (struct lexer *lexer, struct dataset *ds) if (cmd.sbc_cce) settings_set_cc ( cmd.s_cce, FMT_CCE); - if (cmd.sbc_prompt) - prompt_set (PROMPT_FIRST, cmd.s_prompt); - if (cmd.sbc_cprompt) - prompt_set (PROMPT_LATER, cmd.s_cprompt); - if (cmd.sbc_dprompt) - prompt_set (PROMPT_DATA, cmd.s_dprompt); - if (cmd.sbc_decimal) settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ','); - if (cmd.sbc_echo) - settings_set_echo (cmd.echo == STC_ON); - if (cmd.sbc_endcmd) - settings_set_endcmd (cmd.s_endcmd[0]); - if (cmd.sbc_errorbreak) - 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) settings_set_include (cmd.inc == STC_ON); if (cmd.sbc_mxerrs) - settings_set_mxerrs (cmd.n_mxerrs[0]); + { + if (cmd.n_mxerrs[0] >= 1) + settings_set_max_messages (MSG_S_ERROR, cmd.n_mxerrs[0]); + else + msg (SE, _("%s must be at least 1."), "MXERRS"); + } + if (cmd.sbc_mxloops) + { + if (cmd.n_mxloops[0] >= 1) + settings_set_mxloops (cmd.n_mxloops[0]); + else + msg (SE, _("%s must be at least 1."), "MXLOOPS"); + } if (cmd.sbc_mxwarns) - settings_set_mxwarns (cmd.n_mxwarns[0]); - if (cmd.sbc_nulline) - settings_set_nulline (cmd.null == STC_ON); + { + if (cmd.n_mxwarns[0] >= 0) + settings_set_max_messages (MSG_S_WARNING, cmd.n_mxwarns[0]); + else + msg (SE, _("%s must not be negative."), "MXWARNS"); + } if (cmd.sbc_rib) settings_set_input_integer_format (stc_to_integer_format (cmd.rib)); if (cmd.sbc_rrb) @@ -200,6 +195,8 @@ cmd_set (struct lexer *lexer, struct dataset *ds) { if ( cmd.n_workspace[0] < 1024 && ! settings_get_testing_mode ()) msg (SE, _("WORKSPACE must be at least 1MB")); + else if (cmd.n_workspace[0] <= 0) + msg (SE, _("WORKSPACE must be positive")); else settings_set_workspace (cmd.n_workspace[0] * 1024L); } @@ -208,8 +205,12 @@ cmd_set (struct lexer *lexer, struct dataset *ds) msg (SW, _("%s is obsolete."), "BLOCK"); if (cmd.sbc_boxstring) msg (SW, _("%s is obsolete."), "BOXSTRING"); + if (cmd.sbc_cpi) + msg (SW, _("%s is obsolete."), "CPI"); if (cmd.sbc_histogram) msg (SW, _("%s is obsolete."), "HISTOGRAM"); + if (cmd.sbc_lpi) + msg (SW, _("%s is obsolete."), "LPI"); if (cmd.sbc_menus) msg (SW, _("%s is obsolete."), "MENUS"); if (cmd.sbc_xsort) @@ -224,7 +225,7 @@ cmd_set (struct lexer *lexer, struct dataset *ds) msg (SW, _("%s is obsolete."), "TB1"); if (cmd.sbc_case) - msg (SW, _("%s is not implemented."), "CASE"); + msg (SW, _("%s is not yet implemented."), "CASE"); if (cmd.sbc_compression) msg (SW, _("Active file compression is not implemented.")); @@ -280,7 +281,30 @@ stc_to_float_format (int stc) NOT_REACHED (); } +static int +set_output_routing (struct lexer *lexer, enum settings_output_type type) +{ + enum settings_output_devices devices; + + lex_match (lexer, T_EQUALS); + if (lex_match_id (lexer, "ON") || lex_match_id (lexer, "BOTH")) + devices = SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL; + else if (lex_match_id (lexer, "TERMINAL")) + devices = SETTINGS_DEVICE_TERMINAL; + else if (lex_match_id (lexer, "LISTING")) + devices = SETTINGS_DEVICE_LISTING; + else if (lex_match_id (lexer, "OFF") || lex_match_id (lexer, "NONE")) + devices = 0; + else + { + lex_error (lexer, NULL); + return 0; + } + + settings_set_output_routing (type, devices); + return 1; +} /* Parses the BLANKS subcommand, which controls the value that completely blank fields in numeric data imply. X, Wnd: Syntax is @@ -290,7 +314,7 @@ stc_custom_blanks (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "SYSMIS")) { lex_get (lexer); @@ -306,6 +330,64 @@ stc_custom_blanks (struct lexer *lexer, return 1; } +static int +stc_custom_tnumbers (struct lexer *lexer, + struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + lex_match (lexer, T_EQUALS); + + if (lex_match_id (lexer, "VALUES")) + { + settings_set_value_style (SETTINGS_VAL_STYLE_VALUES); + } + else if (lex_match_id (lexer, "LABELS")) + { + settings_set_value_style (SETTINGS_VAL_STYLE_LABELS); + } + else if (lex_match_id (lexer, "BOTH")) + { + settings_set_value_style (SETTINGS_VAL_STYLE_BOTH); + } + else + { + lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH", NULL_SENTINEL); + return 0; + } + + return 1; +} + + +static int +stc_custom_tvars (struct lexer *lexer, + struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + lex_match (lexer, T_EQUALS); + + if (lex_match_id (lexer, "NAMES")) + { + settings_set_var_style (SETTINGS_VAR_STYLE_NAMES); + } + else if (lex_match_id (lexer, "LABELS")) + { + settings_set_var_style (SETTINGS_VAR_STYLE_LABELS); + } + else if (lex_match_id (lexer, "BOTH")) + { + settings_set_var_style (SETTINGS_VAR_STYLE_BOTH); + } + else + { + lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH", NULL_SENTINEL); + return 0; + } + + return 1; +} + + /* Parses the EPOCH subcommand, which controls the epoch used for parsing 2-digit years. */ static int @@ -313,7 +395,7 @@ stc_custom_epoch (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "AUTOMATIC")) settings_set_epoch (-1); else if (lex_is_integer (lexer)) @@ -336,12 +418,19 @@ stc_custom_epoch (struct lexer *lexer, return 1; } +static int +stc_custom_errors (struct lexer *lexer, struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + return set_output_routing (lexer, SETTINGS_OUTPUT_ERROR); +} + static int stc_custom_length (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { int page_length; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NONE")) page_length = -1; else @@ -367,27 +456,26 @@ static int stc_custom_locale (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - const struct string *s; + const char *s; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if ( !lex_force_string (lexer)) return 0; - s = lex_tokstr (lexer); + s = lex_tokcstr (lexer); /* First try this string as an encoding name */ - if ( valid_encoding (ds_cstr (s))) - set_default_encoding (ds_cstr (s)); + if ( valid_encoding (s)) + set_default_encoding (s); /* Now try as a locale name (or alias) */ - else if (set_encoding_from_locale (ds_cstr (s))) + else if (set_encoding_from_locale (s)) { } else { - msg (ME, _("%s is not a recognised encoding or locale name"), - ds_cstr (s)); + msg (ME, _("%s is not a recognized encoding or locale name"), s); return 0; } @@ -396,12 +484,31 @@ stc_custom_locale (struct lexer *lexer, struct dataset *ds UNUSED, return 1; } +static int +stc_custom_messages (struct lexer *lexer, struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + return set_output_routing (lexer, SETTINGS_OUTPUT_NOTE); +} +static int +stc_custom_printback (struct lexer *lexer, struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + return set_output_routing (lexer, SETTINGS_OUTPUT_SYNTAX); +} + +static int +stc_custom_results (struct lexer *lexer, struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + return set_output_routing (lexer, SETTINGS_OUTPUT_RESULT); +} static int stc_custom_seed (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "RANDOM")) set_rng (time (0)); else @@ -418,7 +525,7 @@ stc_custom_seed (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set static int stc_custom_width (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NARROW")) settings_set_viewwidth (79); else if (lex_match_id (lexer, "WIDE")) @@ -446,9 +553,13 @@ stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se { struct fmt_spec fmt; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!parse_format_specifier (lexer, &fmt)) return 0; + + if (!fmt_check_output (&fmt)) + return 0; + if (fmt_is_string (fmt.type)) { char str[FMT_STRING_LEN_MAX + 1]; @@ -465,14 +576,17 @@ stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se static int stc_custom_journal (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); 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) + else if (lex_is_string (lexer) || lex_token (lexer) == T_ID) { - journal_set_file_name (ds_cstr (lex_tokstr (lexer))); + char *filename = utf8_to_filename (lex_tokcstr (lexer)); + journal_set_file_name (filename); + free (filename); + lex_get (lexer); } else @@ -488,216 +602,216 @@ stc_custom_log (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set * { 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) + +static char * +show_output_routing (enum settings_output_type type) { - bool listing; - - lex_match (lexer, '='); - if (lex_match_id (lexer, "ON") || lex_match_id (lexer, "YES")) - listing = true; - else if (lex_match_id (lexer, "OFF") || lex_match_id (lexer, "NO")) - listing = false; + enum settings_output_devices devices; + const char *s; + + devices = settings_get_output_routing (type); + if (devices & SETTINGS_DEVICE_LISTING) + s = devices & SETTINGS_DEVICE_TERMINAL ? "BOTH" : "LISTING"; + else if (devices & SETTINGS_DEVICE_TERMINAL) + s = "TERMINAL"; else - { - /* FIXME */ - return 0; - } - outp_enable_device (listing, OUTP_DEV_LISTING); + s = "NONE"; - return 1; + return xstrdup (s); } -static int -stc_custom_disk (struct lexer *lexer, struct dataset *ds, struct cmd_set *cmd UNUSED, void *aux) -{ - return stc_custom_listing (lexer, ds, cmd, aux); -} - -static void +static char * show_blanks (const struct dataset *ds UNUSED) { - if (settings_get_blanks () == SYSMIS) - msg (SN, _("BLANKS is SYSMIS.")); - else - msg (SN, _("BLANKS is %g."), settings_get_blanks ()); - + return (settings_get_blanks () == SYSMIS + ? xstrdup ("SYSMIS") + : xasprintf ("%.*g", DBL_DIG + 1, settings_get_blanks ())); } -static char * -format_cc (struct substring in, char grouping, char *out) +static void +format_cc (struct string *out, const char *in, char grouping) { - while (!ss_is_empty (in)) + while (*in != '\0') { - char c = ss_get_char (&in); + char c = *in++; if (c == grouping || c == '\'') - *out++ = '\''; + ds_put_byte (out, '\''); else if (c == '"') - *out++ = '"'; - *out++ = c; + ds_put_byte (out, '"'); + ds_put_byte (out, c); } - return out; } -static void +static char * show_cc (enum fmt_type type) { const struct fmt_number_style *cc = settings_get_style (type); - char cc_string[FMT_STYLE_AFFIX_MAX * 4 * 2 + 3 + 1]; - char *out; - - 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 (SN, _("%s is \"%s\"."), fmt_name (type), cc_string); + struct string out; + + ds_init_empty (&out); + format_cc (&out, cc->neg_prefix.s, cc->grouping); + ds_put_byte (&out, cc->grouping); + format_cc (&out, cc->prefix.s, cc->grouping); + ds_put_byte (&out, cc->grouping); + format_cc (&out, cc->suffix.s, cc->grouping); + ds_put_byte (&out, cc->grouping); + format_cc (&out, cc->neg_suffix.s, cc->grouping); + + return ds_cstr (&out); } -static void +static char * show_cca (const struct dataset *ds UNUSED) { - show_cc (FMT_CCA); + return show_cc (FMT_CCA); } -static void +static char * show_ccb (const struct dataset *ds UNUSED) { - show_cc (FMT_CCB); + return show_cc (FMT_CCB); } -static void +static char * show_ccc (const struct dataset *ds UNUSED) { - show_cc (FMT_CCC); + return show_cc (FMT_CCC); } -static void +static char * show_ccd (const struct dataset *ds UNUSED) { - show_cc (FMT_CCD); + return show_cc (FMT_CCD); } -static void +static char * show_cce (const struct dataset *ds UNUSED) { - show_cc (FMT_CCE); + return show_cc (FMT_CCE); } -static void +static char * show_decimals (const struct dataset *ds UNUSED) { - msg (SN, _("DECIMAL is \"%c\"."), settings_get_decimal_char (FMT_F)); -} - -static void -show_endcmd (const struct dataset *ds UNUSED) -{ - msg (SN, _("ENDCMD is \"%c\"."), settings_get_endcmd ()); + return xasprintf ("`%c'", settings_get_decimal_char (FMT_F)); } -static void +static char * show_errors (const struct dataset *ds UNUSED) { - bool terminal = settings_get_error_routing_to_terminal (); - bool listing = settings_get_error_routing_to_listing (); - msg (SN, _("ERRORS is \"%s\"."), - terminal && listing ? "BOTH" - : terminal ? "TERMINAL" - : listing ? "LISTING" - : "NONE"); + return show_output_routing (SETTINGS_OUTPUT_ERROR); } -static void +static char * show_format (const struct dataset *ds UNUSED) { char str[FMT_STRING_LEN_MAX + 1]; - msg (SN, _("FORMAT is %s."), fmt_to_string (settings_get_format (), str)); + return xstrdup (fmt_to_string (settings_get_format (), str)); } -static void +static char * +show_journal (const struct dataset *ds UNUSED) +{ + return (journal_is_enabled () + ? xasprintf ("\"%s\"", journal_get_file_name ()) + : xstrdup ("disabled")); +} + +static char * show_length (const struct dataset *ds UNUSED) { - msg (SN, _("LENGTH is %d."), settings_get_viewlength ()); + return xasprintf ("%d", settings_get_viewlength ()); } -static void +static char * show_locale (const struct dataset *ds UNUSED) { - msg (SN, _("LOCALE is %s"), get_default_encoding ()); + return xstrdup (get_default_encoding ()); } -static void +static char * +show_messages (const struct dataset *ds UNUSED) +{ + return show_output_routing (SETTINGS_OUTPUT_NOTE); +} + +static char * +show_printback (const struct dataset *ds UNUSED) +{ + return show_output_routing (SETTINGS_OUTPUT_SYNTAX); +} + +static char * +show_results (const struct dataset *ds UNUSED) +{ + return show_output_routing (SETTINGS_OUTPUT_RESULT); +} + +static char * show_mxerrs (const struct dataset *ds UNUSED) { - msg (SN, _("MXERRS is %d."), settings_get_mxerrs ()); + return xasprintf ("%d", settings_get_max_messages (MSG_S_ERROR)); } -static void +static char * show_mxloops (const struct dataset *ds UNUSED) { - msg (SN, _("MXLOOPS is %d."), settings_get_mxloops ()); + return xasprintf ("%d", settings_get_mxloops ()); } -static void +static char * show_mxwarns (const struct dataset *ds UNUSED) { - msg (SN, _("MXWARNS is %d."), settings_get_mxwarns ()); + return xasprintf ("%d", settings_get_max_messages (MSG_S_WARNING)); } -/* Outputs that SETTING has the given INTEGER_FORMAT value. */ -static void -show_integer_format (const char *setting, enum integer_format integer_format) +/* Returns a name for the given INTEGER_FORMAT value. */ +static char * +show_integer_format (enum integer_format integer_format) { - msg (SN, _("%s is %s (%s)."), - setting, - (integer_format == INTEGER_MSB_FIRST ? "MSBFIRST" - : integer_format == INTEGER_LSB_FIRST ? "LSBFIRST" - : "VAX"), - integer_format == INTEGER_NATIVE ? "NATIVE" : "nonnative"); + return xasprintf ("%s (%s)", + (integer_format == INTEGER_MSB_FIRST ? "MSBFIRST" + : integer_format == INTEGER_LSB_FIRST ? "LSBFIRST" + : "VAX"), + integer_format == INTEGER_NATIVE ? "NATIVE" : "nonnative"); } -/* Outputs that SETTING has the given FLOAT_FORMAT value. */ -static void -show_float_format (const char *setting, enum float_format float_format) +/* Returns a name for the given FLOAT_FORMAT value. */ +static char * +show_float_format (enum float_format float_format) { const char *format_name = ""; switch (float_format) { case FLOAT_IEEE_SINGLE_LE: - format_name = "ISL (32-bit IEEE 754 single, little-endian)"; + 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)"; + 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)"; + 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)"; + format_name = _("IDB (64-bit IEEE 754 double, big-endian)"); break; case FLOAT_VAX_F: - format_name = "VF (32-bit VAX F, VAX-endian)"; + format_name = _("VF (32-bit VAX F, VAX-endian)"); break; case FLOAT_VAX_D: - format_name = "VD (64-bit VAX D, VAX-endian)"; + format_name = _("VD (64-bit VAX D, VAX-endian)"); break; case FLOAT_VAX_G: - format_name = "VG (64-bit VAX G, VAX-endian)"; + 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)"; + 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)"; + format_name = _("ZL (64-bit IBM Z hexadecimal long, big-endian)"); break; case FLOAT_FP: @@ -705,73 +819,123 @@ show_float_format (const char *setting, enum float_format float_format) NOT_REACHED (); } - msg (SN, _("%s is %s (%s)."), - setting, format_name, - float_format == FLOAT_NATIVE_DOUBLE ? "NATIVE" : "nonnative"); + return xasprintf ("%s (%s)", format_name, + (float_format == FLOAT_NATIVE_DOUBLE + ? "NATIVE" : "nonnative")); } -static void +static char * show_rib (const struct dataset *ds UNUSED) { - show_integer_format ("RIB", settings_get_input_integer_format ()); + return show_integer_format (settings_get_input_integer_format ()); } -static void +static char * show_rrb (const struct dataset *ds UNUSED) { - show_float_format ("RRB", settings_get_input_float_format ()); + return show_float_format (settings_get_input_float_format ()); } -static void +static char * show_scompression (const struct dataset *ds UNUSED) { - if (settings_get_scompression ()) - msg (SN, _("SCOMPRESSION is ON.")); - else - msg (SN, _("SCOMPRESSION is OFF.")); + return xstrdup (settings_get_scompression () ? "ON" : "OFF"); } -static void +static char * show_undefined (const struct dataset *ds UNUSED) { - if (settings_get_undefined ()) - msg (SN, _("UNDEFINED is WARN.")); - else - msg (SN, _("UNDEFINED is NOWARN.")); + return xstrdup (settings_get_undefined () ? "WARN" : "NOWARN"); } -static void +static char * show_weight (const struct dataset *ds) { const struct variable *var = dict_get_weight (dataset_dict (ds)); - if (var == NULL) - msg (SN, _("WEIGHT is off.")); - else - msg (SN, _("WEIGHT is variable %s."), var_get_name (var)); + return xstrdup (var != NULL ? var_get_name (var) : "OFF"); } -static void +static char * show_wib (const struct dataset *ds UNUSED) { - show_integer_format ("WIB", settings_get_output_integer_format ()); + return show_integer_format (settings_get_output_integer_format ()); } -static void +static char * show_wrb (const struct dataset *ds UNUSED) { - show_float_format ("WRB", settings_get_output_float_format ()); + return show_float_format (settings_get_output_float_format ()); } -static void +static char * show_width (const struct dataset *ds UNUSED) { - msg (SN, _("WIDTH is %d."), settings_get_viewwidth ()); + return xasprintf ("%d", settings_get_viewwidth ()); +} + +static char * +show_workspace (const struct dataset *ds UNUSED) +{ + size_t ws = settings_get_workspace () / 1024L; + return xasprintf ("%zu", ws); +} + +static char * +show_current_directory (const struct dataset *ds UNUSED) +{ + char *buf = NULL; + char *wd = NULL; + size_t len = 256; + + do + { + len <<= 1; + buf = xrealloc (buf, len); + } + while (NULL == (wd = getcwd (buf, len))); + + return wd; +} + +static char * +show_tempdir (const struct dataset *ds UNUSED) +{ + return strdup (temp_dir_name ()); +} + +static char * +show_version (const struct dataset *ds UNUSED) +{ + return strdup (version); } +static char * +show_system (const struct dataset *ds UNUSED) +{ + return strdup (host_system); +} + +static char * +show_n (const struct dataset *ds) +{ + casenumber n; + size_t l; + + const struct casereader *reader = dataset_source (ds); + + if (reader == NULL) + return strdup (_("Unknown")); + + n = casereader_count_cases (reader); + + return asnprintf (NULL, &l, "%ld", n); +} + + struct show_sbc { const char *name; - void (*function) (const struct dataset *); + char *(*function) (const struct dataset *); }; const struct show_sbc show_table[] = @@ -783,40 +947,61 @@ const struct show_sbc show_table[] = {"CCD", show_ccd}, {"CCE", show_cce}, {"DECIMALS", show_decimals}, - {"ENDCMD", show_endcmd}, + {"DIRECTORY", show_current_directory}, + {"ENVIRONMENT", show_system}, {"ERRORS", show_errors}, {"FORMAT", show_format}, + {"JOURNAL", show_journal}, {"LENGTH", show_length}, {"LOCALE", show_locale}, + {"MESSAGES", show_messages}, {"MXERRS", show_mxerrs}, {"MXLOOPS", show_mxloops}, {"MXWARNS", show_mxwarns}, + {"N", show_n}, + {"PRINTBACk", show_printback}, + {"RESULTS", show_results}, {"RIB", show_rib}, {"RRB", show_rrb}, {"SCOMPRESSION", show_scompression}, + {"TEMPDIR", show_tempdir}, {"UNDEFINED", show_undefined}, + {"VERSION", show_version}, {"WEIGHT", show_weight}, {"WIB", show_wib}, {"WRB", show_wrb}, {"WIDTH", show_width}, + {"WORKSPACE", show_workspace}, }; +static 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 (ds); + 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 @@ -831,10 +1016,11 @@ show_copying (const struct dataset *ds UNUSED) fputs (copyleft, stdout); } + int cmd_show (struct lexer *lexer, struct dataset *ds) { - if (lex_token (lexer) == '.') + if (lex_token (lexer) == T_ENDCMD) { show_all (ds); return CMD_SUCCESS; @@ -845,20 +1031,23 @@ cmd_show (struct lexer *lexer, struct dataset *ds) if (lex_match (lexer, T_ALL)) show_all (ds); else if (lex_match_id (lexer, "CC")) - show_all_cc (); + show_all_cc (ds); else if (lex_match_id (lexer, "WARRANTY")) show_warranty (ds); - else if (lex_match_id (lexer, "COPYING")) + else if (lex_match_id (lexer, "COPYING") || lex_match_id (lexer, "LICENSE")) 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 (lexer, show_table[i].name)) - { - show_table[i].function (ds); - 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 (lexer, NULL); return CMD_FAILURE; @@ -871,12 +1060,51 @@ cmd_show (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); return CMD_SUCCESS; } + +#define MAX_SAVED_SETTINGS 5 + +static struct settings *saved_settings[MAX_SAVED_SETTINGS]; +static int n_saved_settings; + +int +cmd_preserve (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) +{ + if (n_saved_settings < MAX_SAVED_SETTINGS) + { + saved_settings[n_saved_settings++] = settings_get (); + return CMD_SUCCESS; + } + else + { + msg (SE, _("Too many PRESERVE commands without a RESTORE: at most " + "%d levels of saved settings are allowed."), + MAX_SAVED_SETTINGS); + return CMD_CASCADING_FAILURE; + } +} + +int +cmd_restore (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) +{ + if (n_saved_settings > 0) + { + struct settings *s = saved_settings[--n_saved_settings]; + settings_set (s); + settings_destroy (s); + return CMD_SUCCESS; + } + else + { + msg (SE, _("RESTORE without matching PRESERVE.")); + return CMD_FAILURE; + } +} /* Local Variables: