/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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
#include <config.h>
+#include <float.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include "math/random.h"
#include "output/driver.h"
#include "output/journal.h"
+#include "output/pivot-table.h"
#if HAVE_LIBTERMCAP
#if HAVE_TERMCAP_H
epoch=custom;
errors=custom;
format=custom;
+ fuzzbits=integer;
headers=headers:no/yes/blank;
highres=hires:on/off;
histogram=string;
tvars=custom;
tb1=string;
tbfonts=string;
+ tlook=custom;
undefined=undef:warn/nowarn;
wib=wib:msbfirst/lsbfirst/vax/native;
wrb=wrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl;
if (!parse_set (lexer, ds, &cmd, NULL))
{
- free_set (&cmd);
return CMD_FAILURE;
}
if (cmd.sbc_decimal)
settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ',');
+ if (cmd.sbc_fuzzbits)
+ {
+ int fuzzbits = cmd.n_fuzzbits[0];
+ if (fuzzbits >= 0 && fuzzbits <= 20)
+ settings_set_fuzzbits (fuzzbits);
+ else
+ msg (SE, _("%s must be between 0 and 20."), "FUZZBITS");
+ }
if (cmd.sbc_include)
settings_set_include (cmd.inc == STC_ON);
if (cmd.sbc_workspace)
{
if ( cmd.n_workspace[0] < 1024 && ! settings_get_testing_mode ())
- msg (SE, _("WORKSPACE must be at least 1MB"));
+ msg (SE, _("%s must be at least 1MB"), "WORKSPACE");
else if (cmd.n_workspace[0] <= 0)
- msg (SE, _("WORKSPACE must be positive"));
+ msg (SE, _("%s must be positive"), "WORKSPACE");
else
settings_set_workspace (cmd.n_workspace[0] * 1024L);
}
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "VALUES"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_VALUES);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_VALUE);
else if (lex_match_id (lexer, "LABELS"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_LABELS);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_LABEL);
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_BOTH);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_BOTH);
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH", NULL_SENTINEL);
+ lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH");
return 0;
}
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAMES"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_NAMES);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_VALUE);
else if (lex_match_id (lexer, "LABELS"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_LABELS);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_LABEL);
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_BOTH);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_BOTH);
else
{
- lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH", NULL_SENTINEL);
+ lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH");
return 0;
}
return 1;
}
+static int
+stc_custom_tlook (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, "NONE"))
+ pivot_table_look_set_default (pivot_table_look_builtin_default ());
+ else if (lex_is_string (lexer))
+ {
+ struct pivot_table_look *look;
+ char *error = pivot_table_look_read (lex_tokcstr (lexer), &look);
+ lex_get (lexer);
+
+ if (error)
+ {
+ msg (SE, "%s", error);
+ free (error);
+ return 0;
+ }
+
+ pivot_table_look_set_default (look);
+ pivot_table_look_unref (look);
+ }
+
+ return 1;
+}
/* Parses the EPOCH subcommand, which controls the epoch used for
parsing 2-digit years. */
lex_get (lexer);
if (new_epoch < 1500)
{
- msg (SE, _("EPOCH must be 1500 or later."));
+ msg (SE, _("%s must be 1500 or later."), "EPOCH");
return 0;
}
settings_set_epoch (new_epoch);
}
else
{
- lex_error (lexer, _("expecting AUTOMATIC or year"));
+ lex_error (lexer, _("expecting %s or year"), "AUTOMATIC");
return 0;
}
return 0;
if (lex_integer (lexer) < 1)
{
- msg (SE, _("LENGTH must be at least 1."));
+ msg (SE, _("%s must be at least %d."), "LENGTH", 1);
return 0;
}
page_length = lex_integer (lexer);
return 0;
if (lex_integer (lexer) < 40)
{
- msg (SE, _("WIDTH must be at least 40."));
+ msg (SE, _("%s must be at least %d."), "WIDTH", 40);
return 0;
}
settings_set_viewwidth (lex_integer (lexer));
if (!fmt_check_output (&fmt))
return 0;
-
+
if (fmt_is_string (fmt.type))
{
char str[FMT_STRING_LEN_MAX + 1];
- msg (SE, _("FORMAT requires numeric output format as an argument. "
+ msg (SE, _("%s requires numeric output format as an argument. "
"Specified format %s is of type string."),
+ "FORMAT",
fmt_to_string (&fmt, str));
return 0;
}
{
return (settings_get_blanks () == SYSMIS
? xstrdup ("SYSMIS")
- : xasprintf ("%g", settings_get_blanks ()));
+ : xasprintf ("%.*g", DBL_DIG + 1, settings_get_blanks ()));
}
static void
return xstrdup (fmt_to_string (settings_get_format (), str));
}
+static char *
+show_fuzzbits (const struct dataset *ds UNUSED)
+{
+ return xasprintf ("%d", settings_get_fuzzbits ());
+}
+
static char *
show_journal (const struct dataset *ds UNUSED)
{
{
len <<= 1;
buf = xrealloc (buf, len);
- }
+ }
while (NULL == (wd = getcwd (buf, len)));
return wd;
static char *
show_version (const struct dataset *ds UNUSED)
{
- return strdup (version);
+ return strdup (announced_version);
}
static char *
{"ENVIRONMENT", show_system},
{"ERRORS", show_errors},
{"FORMAT", show_format},
+ {"FUZZBITS", show_fuzzbits},
{"JOURNAL", show_journal},
{"LENGTH", show_length},
{"LOCALE", show_locale},
}
else
{
- msg (SE, _("Too many PRESERVE commands without a RESTORE: at most "
+ msg (SE, _("Too many %s commands without a %s: at most "
"%d levels of saved settings are allowed."),
+ "PRESERVE", "RESTORE",
MAX_SAVED_SETTINGS);
return CMD_CASCADING_FAILURE;
}
}
else
{
- msg (SE, _("RESTORE without matching PRESERVE."));
+ msg (SE, _("%s without matching %s."), "RESTORE", "PRESERVE");
return CMD_FAILURE;
}
}