-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* 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 <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <data/format.h>
#include <data/procedure.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 <language/prompt.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/copyleft.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
+#include <libpspp/i18n.h>
#include <math/random.h>
+#include <output/journal.h>
#include <output/output.h>
#if HAVE_LIBTERMCAP
#endif /* !HAVE_TERMCAP_H */
#endif /* !HAVE_LIBTERMCAP */
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
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";
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.
*/
/* (functions) */
-static bool do_cc (const char *cc_string, enum fmt_type);
static enum integer_format stc_to_integer_format (int stc);
static enum float_format stc_to_float_format (int stc);
}
if (cmd.sbc_cca)
- do_cc (cmd.s_cca, FMT_CCA);
+ settings_set_cc ( cmd.s_cca, FMT_CCA);
if (cmd.sbc_ccb)
- do_cc (cmd.s_ccb, FMT_CCB);
+ settings_set_cc ( cmd.s_ccb, FMT_CCB);
if (cmd.sbc_ccc)
- do_cc (cmd.s_ccc, FMT_CCC);
+ settings_set_cc ( cmd.s_ccc, FMT_CCC);
if (cmd.sbc_ccd)
- do_cc (cmd.s_ccd, FMT_CCD);
+ settings_set_cc ( cmd.s_ccd, FMT_CCD);
if (cmd.sbc_cce)
- do_cc (cmd.s_cce, FMT_CCE);
+ settings_set_cc ( cmd.s_cce, FMT_CCE);
if (cmd.sbc_prompt)
prompt_set (PROMPT_FIRST, cmd.s_prompt);
prompt_set (PROMPT_DATA, cmd.s_dprompt);
if (cmd.sbc_decimal)
- fmt_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;
- set_error_routing_to_terminal (cmd.errors == STC_TERMINAL || both);
- set_error_routing_to_listing (cmd.errors == STC_LISTING || both);
+ 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)
- data_in_set_integer_format (stc_to_integer_format (cmd.rib));
+ settings_set_input_integer_format (stc_to_integer_format (cmd.rib));
if (cmd.sbc_rrb)
- data_in_set_float_format (stc_to_float_format (cmd.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)
- data_out_set_integer_format (stc_to_integer_format (cmd.wib));
+ settings_set_output_integer_format (stc_to_integer_format (cmd.wib));
if (cmd.sbc_wrb)
- data_out_set_float_format (stc_to_float_format (cmd.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");
/* 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)
+stc_to_integer_format (int stc)
{
return (stc == STC_MSBFIRST ? INTEGER_MSB_FIRST
: stc == STC_LSBFIRST ? INTEGER_LSB_FIRST
/* 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)
+stc_to_float_format (int stc)
{
- switch (stc)
+ switch (stc)
{
case STC_NATIVE:
return FLOAT_NATIVE_DOUBLE;
NOT_REACHED ();
}
-/* 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 fmt_number_style *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 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;
-}
-
-/* Extracts a token from IN into a newly allocated AFFIX. Tokens
- are delimited by GROUPING. The token is truncated to at most
- FMT_STYLE_AFFIX_MAX characters. Returns the first character
- following the token. */
-static const char *
-extract_cc_token (const char *in, int grouping, struct substring *affix)
-{
- size_t ofs = 0;
- ss_alloc_uninit (affix, FMT_STYLE_AFFIX_MAX);
- for (; *in != '\0' && *in != grouping; in++)
- {
- if (*in == '\'' && in[1] == grouping)
- in++;
- if (ofs < FMT_STYLE_AFFIX_MAX)
- ss_data (*affix)[ofs++] = *in;
- }
- affix->length = ofs;
-
- if (*in == grouping)
- in++;
- return in;
-}
-
-/* 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, enum fmt_type type)
-{
- struct fmt_number_style *cc = fmt_number_style_create ();
-
- /* Determine separators. */
- if (!find_cc_separators (cc_string, cc))
- {
- fmt_number_style_destroy (cc);
- msg (SE, _("%s: Custom currency string `%s' does not contain "
- "exactly three periods or commas (or it contains both)."),
- fmt_name (type), 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);
- fmt_set_style (type, 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 lexer *lexer,
- struct dataset *ds UNUSED,
+stc_custom_blanks (struct lexer *lexer,
+ struct dataset *ds UNUSED,
struct cmd_set *cmd UNUSED, void *aux UNUSED)
{
lex_match (lexer, '=');
if (lex_match_id (lexer, "SYSMIS"))
{
lex_get (lexer);
- set_blanks (SYSMIS);
+ settings_set_blanks (SYSMIS);
}
else
{
if (!lex_force_num (lexer))
return 0;
- set_blanks (lex_number (lexer));
+ settings_set_blanks (lex_number (lexer));
lex_get (lexer);
}
return 1;
/* Parses the EPOCH subcommand, which controls the epoch used for
parsing 2-digit years. */
static int
-stc_custom_epoch (struct lexer *lexer,
- struct dataset *ds UNUSED,
- struct cmd_set *cmd UNUSED, void *aux UNUSED)
+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"))
- set_epoch (-1);
- else if (lex_is_integer (lexer))
+ settings_set_epoch (-1);
+ else if (lex_is_integer (lexer))
{
int new_epoch = lex_integer (lexer);
lex_get (lexer);
- if (new_epoch < 1500)
+ 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 (lexer, _("expecting AUTOMATIC or year"));
return 0;
lex_get (lexer);
}
- if (page_length != -1)
- set_viewlength (page_length);
+ 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;
+ }
+
+ lex_get (lexer);
+
+ return 1;
+}
+
+
+
static int
stc_custom_seed (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED)
{
{
lex_match (lexer, '=');
if (lex_match_id (lexer, "NARROW"))
- set_viewwidth (79);
+ settings_set_viewwidth (79);
else if (lex_match_id (lexer, "WIDE"))
- set_viewwidth (131);
+ settings_set_viewwidth (131);
else
{
if (!lex_force_int (lexer))
msg (SE, _("WIDTH must be at least 40."));
return 0;
}
- set_viewwidth (lex_integer (lexer));
+ settings_set_viewwidth (lex_integer (lexer));
lex_get (lexer);
}
return 0;
}
- set_format (&fmt);
+ settings_set_format (&fmt);
return 1;
}
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, "OFF"))
+ 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 (lex_token (lexer) == T_STRING)
- lex_get (lexer);
- else
- {
- lex_error (lexer, 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_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)
{
return stc_custom_listing (lexer, ds, cmd, aux);
}
\f
-static void
-show_blanks (const struct dataset *ds UNUSED)
+static char *
+show_blanks (const struct dataset *ds UNUSED)
{
- if (get_blanks () == SYSMIS)
- msg (SN, _("BLANKS is SYSMIS."));
- else
- msg (SN, _("BLANKS is %g."), get_blanks ());
-
+ return (settings_get_blanks () == SYSMIS
+ ? xstrdup ("SYSMIS")
+ : xasprintf ("%g", settings_get_blanks ()));
}
-static char *
-format_cc (struct substring in, char grouping, char *out)
+static void
+format_cc (struct string *out, struct substring in, char grouping)
{
- while (!ss_is_empty (in))
+ while (!ss_is_empty (in))
{
char c = ss_get_char (&in);
if (c == grouping || c == '\'')
- *out++ = '\'';
+ ds_put_char (out, '\'');
else if (c == '"')
- *out++ = '"';
- *out++ = c;
+ ds_put_char (out, '"');
+ ds_put_char (out, c);
}
- return out;
}
-static void
-show_cc (enum fmt_type type)
+static char *
+show_cc (enum fmt_type type)
{
- const struct fmt_number_style *cc = fmt_get_style (type);
- char cc_string[FMT_STYLE_AFFIX_MAX * 4 * 2 + 3 + 1];
- char *out;
+ const struct fmt_number_style *cc = settings_get_style (type);
+ struct string 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);
+ 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 void
-show_cca (const struct dataset *ds UNUSED)
+static char *
+show_cca (const struct dataset *ds UNUSED)
{
- show_cc (FMT_CCA);
+ return show_cc (FMT_CCA);
}
-static void
-show_ccb (const struct dataset *ds UNUSED)
+static char *
+show_ccb (const struct dataset *ds UNUSED)
{
- show_cc (FMT_CCB);
+ return show_cc (FMT_CCB);
}
-static void
-show_ccc (const struct dataset *ds UNUSED)
+static char *
+show_ccc (const struct dataset *ds UNUSED)
{
- show_cc (FMT_CCC);
+ return show_cc (FMT_CCC);
}
-static void
-show_ccd (const struct dataset *ds UNUSED)
+static char *
+show_ccd (const struct dataset *ds UNUSED)
{
- show_cc (FMT_CCD);
+ return show_cc (FMT_CCD);
}
-static void
-show_cce (const struct dataset *ds UNUSED)
+static char *
+show_cce (const struct dataset *ds UNUSED)
{
- show_cc (FMT_CCE);
+ return show_cc (FMT_CCE);
}
-static void
-show_decimals (const struct dataset *ds UNUSED)
+static char *
+show_decimals (const struct dataset *ds UNUSED)
{
- msg (SN, _("DECIMAL is \"%c\"."), fmt_decimal_char (FMT_F));
+ return xasprintf ("\"%c\"", settings_get_decimal_char (FMT_F));
}
-static void
-show_endcmd (const struct dataset *ds UNUSED)
+static char *
+show_endcmd (const struct dataset *ds UNUSED)
{
- msg (SN, _("ENDCMD is \"%c\"."), get_endcmd ());
+ return xasprintf ("\"%c\"", settings_get_endcmd ());
}
-static void
-show_errors (const struct dataset *ds UNUSED)
+static char *
+show_errors (const struct dataset *ds UNUSED)
{
- bool terminal = get_error_routing_to_terminal ();
- bool listing = get_error_routing_to_listing ();
- msg (SN, _("ERRORS is \"%s\"."),
- terminal && listing ? "BOTH"
- : terminal ? "TERMINAL"
- : listing ? "LISTING"
- : "NONE");
+ 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_format (const struct dataset *ds UNUSED)
+static char *
+show_format (const struct dataset *ds UNUSED)
{
char str[FMT_STRING_LEN_MAX + 1];
- msg (SN, _("FORMAT is %s."), fmt_to_string (get_format (), str));
+ return xstrdup (fmt_to_string (settings_get_format (), str));
}
-static void
-show_length (const struct dataset *ds UNUSED)
+static char *
+show_length (const struct dataset *ds UNUSED)
{
- msg (SN, _("LENGTH is %d."), get_viewlength ());
+ return xasprintf ("%d", settings_get_viewlength ());
}
-static void
-show_mxerrs (const struct dataset *ds UNUSED)
+static char *
+show_locale (const struct dataset *ds UNUSED)
{
- msg (SN, _("MXERRS is %d."), get_mxerrs ());
+ return xstrdup (get_default_encoding ());
}
-static void
-show_mxloops (const struct dataset *ds UNUSED)
+static char *
+show_mxerrs (const struct dataset *ds UNUSED)
{
- msg (SN, _("MXLOOPS is %d."), get_mxloops ());
+ return xasprintf ("%d", settings_get_mxerrs ());
}
-static void
-show_mxwarns (const struct dataset *ds UNUSED)
+static char *
+show_mxloops (const struct dataset *ds UNUSED)
{
- msg (SN, _("MXWARNS is %d."), get_mxwarns ());
+ return xasprintf ("%d", settings_get_mxloops ());
}
-/* Outputs that SETTING has the given INTEGER_FORMAT value. */
-static void
-show_integer_format (const char *setting, enum integer_format integer_format)
+static char *
+show_mxwarns (const struct dataset *ds UNUSED)
{
- 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 ("%d", settings_get_mxwarns ());
}
-/* 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 INTEGER_FORMAT value. */
+static char *
+show_integer_format (enum integer_format integer_format)
+{
+ return xasprintf ("%s (%s)",
+ (integer_format == INTEGER_MSB_FIRST ? "MSBFIRST"
+ : integer_format == INTEGER_LSB_FIRST ? "LSBFIRST"
+ : "VAX"),
+ integer_format == INTEGER_NATIVE ? "NATIVE" : "nonnative");
+}
+
+/* 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:
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
-show_rib (const struct dataset *ds UNUSED)
+static char *
+show_rib (const struct dataset *ds UNUSED)
{
- show_integer_format ("RIB", data_in_get_integer_format ());
+ return show_integer_format (settings_get_input_integer_format ());
}
-static void
-show_rrb (const struct dataset *ds UNUSED)
+static char *
+show_rrb (const struct dataset *ds UNUSED)
{
- show_float_format ("RRB", data_in_get_float_format ());
+ return show_float_format (settings_get_input_float_format ());
}
-static void
-show_scompression (const struct dataset *ds UNUSED)
+static char *
+show_scompression (const struct dataset *ds UNUSED)
{
- if (get_scompression ())
- msg (SN, _("SCOMPRESSION is ON."));
- else
- msg (SN, _("SCOMPRESSION is OFF."));
+ return xstrdup (settings_get_scompression () ? "ON" : "OFF");
}
-static void
-show_undefined (const struct dataset *ds UNUSED)
+static char *
+show_undefined (const struct dataset *ds UNUSED)
{
- if (get_undefined ())
- msg (SN, _("UNDEFINED is WARN."));
- else
- msg (SN, _("UNDEFINED is NOWARN."));
+ return xstrdup (settings_get_undefined () ? "WARN" : "NOWARN");
}
-static void
-show_weight (const struct dataset *ds)
+static char *
+show_weight (const struct dataset *ds)
{
- 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));
+ const struct variable *var = dict_get_weight (dataset_dict (ds));
+ return xstrdup (var != NULL ? var_get_name (var) : "OFF");
}
-static void
-show_wib (const struct dataset *ds UNUSED)
+static char *
+show_wib (const struct dataset *ds UNUSED)
{
- show_integer_format ("WIB", data_out_get_integer_format ());
+ return show_integer_format (settings_get_output_integer_format ());
}
-static void
-show_wrb (const struct dataset *ds UNUSED)
+static char *
+show_wrb (const struct dataset *ds UNUSED)
{
- show_float_format ("WRB", data_out_get_float_format ());
+ return show_float_format (settings_get_output_float_format ());
}
-static void
-show_width (const struct dataset *ds UNUSED)
+static char *
+show_width (const struct dataset *ds UNUSED)
{
- msg (SN, _("WIDTH is %d."), get_viewwidth ());
+ return xasprintf ("%d", settings_get_viewwidth ());
}
-struct show_sbc
+struct show_sbc
{
const char *name;
- void (*function) (const struct dataset *);
+ char *(*function) (const struct dataset *);
};
-const struct show_sbc show_table[] =
+const struct show_sbc show_table[] =
{
{"BLANKS", show_blanks},
{"CCA", show_cca},
{"CCE", show_cce},
{"DECIMALS", show_decimals},
{"ENDCMD", show_endcmd},
- {"ERRORS", show_errors},
+ {"ERRORS", show_errors},
{"FORMAT", show_format},
{"LENGTH", show_length},
+ {"LOCALE", show_locale},
{"MXERRS", show_mxerrs},
{"MXLOOPS", show_mxloops},
{"MXWARNS", show_mxwarns},
};
static void
-show_all (const struct dataset *ds)
+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
-show_warranty (const struct dataset *ds UNUSED)
+show_warranty (const struct dataset *ds UNUSED)
{
- msg (MN, lack_of_warranty);
+ fputs (lack_of_warranty, stdout);
}
static void
-show_copying (const struct dataset *ds UNUSED)
+show_copying (const struct dataset *ds UNUSED)
{
- msg (MN, copyleft);
+ fputs (copyleft, stdout);
}
int
-cmd_show (struct lexer *lexer, struct dataset *ds)
+cmd_show (struct lexer *lexer, struct dataset *ds)
{
- if (lex_token (lexer) == '.')
+ if (lex_token (lexer) == '.')
{
show_all (ds);
return CMD_SUCCESS;
}
- do
+ do
{
if (lex_match (lexer, T_ALL))
show_all (ds);
- else if (lex_match_id (lexer, "CC"))
- show_all_cc ();
+ 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"))
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;
found: ;
}
- else
+ else
{
lex_error (lexer, NULL);
return CMD_FAILURE;
projects / pspp-builds.git / blobdiff