projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render: Add comment.
[pspp]
/
src
/
language
/
utilities
/
set.q
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index 14cc4be5873daa66edbd3428f8ffff24f29c11eb..301cc645e8583257e80a69d599902710c5ede594 100644
(file)
--- a/
src/language/utilities/set.q
+++ b/
src/language/utilities/set.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012 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
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,6
+16,7
@@
#include <config.h>
#include <config.h>
+#include <float.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
@@
-79,6
+80,7
@@
int tgetnum (const char *);
epoch=custom;
errors=custom;
format=custom;
epoch=custom;
errors=custom;
format=custom;
+ fuzzbits=integer;
headers=headers:no/yes/blank;
highres=hires:on/off;
histogram=string;
headers=headers:no/yes/blank;
highres=hires:on/off;
histogram=string;
@@
-135,7
+137,6
@@
cmd_set (struct lexer *lexer, struct dataset *ds)
if (!parse_set (lexer, ds, &cmd, NULL))
{
if (!parse_set (lexer, ds, &cmd, NULL))
{
- free_set (&cmd);
return CMD_FAILURE;
}
return CMD_FAILURE;
}
@@
-152,6
+153,14
@@
cmd_set (struct lexer *lexer, struct dataset *ds)
if (cmd.sbc_decimal)
settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ',');
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_include)
settings_set_include (cmd.inc == STC_ON);
@@
-193,9
+202,9
@@
cmd_set (struct lexer *lexer, struct dataset *ds)
if (cmd.sbc_workspace)
{
if ( cmd.n_workspace[0] < 1024 && ! settings_get_testing_mode ())
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)
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);
}
else
settings_set_workspace (cmd.n_workspace[0] * 1024L);
}
@@
-337,20
+346,14
@@
stc_custom_tnumbers (struct lexer *lexer,
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "VALUES"))
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"))
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"))
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_BOTH);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_BOTH);
else
{
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH");
return 0;
}
return 0;
}
@@
-366,20
+369,14
@@
stc_custom_tvars (struct lexer *lexer,
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAMES"))
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"))
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"))
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_BOTH);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_BOTH);
else
{
else
{
- lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH");
return 0;
}
return 0;
}
@@
-403,14
+400,14
@@
stc_custom_epoch (struct lexer *lexer,
lex_get (lexer);
if (new_epoch < 1500)
{
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
{
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;
}
@@
-438,7
+435,7
@@
stc_custom_length (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se
return 0;
if (lex_integer (lexer) < 1)
{
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;
}
page_length = lex_integer (lexer);
@@
-535,7
+532,7
@@
stc_custom_width (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set
return 0;
if (lex_integer (lexer) < 40)
{
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));
return 0;
}
settings_set_viewwidth (lex_integer (lexer));
@@
-558,12
+555,13
@@
stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se
if (!fmt_check_output (&fmt))
return 0;
if (!fmt_check_output (&fmt))
return 0;
-
+
if (fmt_is_string (fmt.type))
{
char str[FMT_STRING_LEN_MAX + 1];
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."),
"Specified format %s is of type string."),
+ "FORMAT",
fmt_to_string (&fmt, str));
return 0;
}
fmt_to_string (&fmt, str));
return 0;
}
@@
-624,7
+622,7
@@
show_blanks (const struct dataset *ds UNUSED)
{
return (settings_get_blanks () == SYSMIS
? xstrdup ("SYSMIS")
{
return (settings_get_blanks () == SYSMIS
? xstrdup ("SYSMIS")
- : xasprintf ("%
g"
, settings_get_blanks ()));
+ : xasprintf ("%
.*g", DBL_DIG + 1
, settings_get_blanks ()));
}
static void
}
static void
@@
-708,6
+706,12
@@
show_format (const struct dataset *ds UNUSED)
return xstrdup (fmt_to_string (settings_get_format (), str));
}
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)
{
static char *
show_journal (const struct dataset *ds UNUSED)
{
@@
-876,7
+880,7
@@
static char *
show_workspace (const struct dataset *ds UNUSED)
{
size_t ws = settings_get_workspace () / 1024L;
show_workspace (const struct dataset *ds UNUSED)
{
size_t ws = settings_get_workspace () / 1024L;
- return xasprintf ("%
ld
", ws);
+ return xasprintf ("%
zu
", ws);
}
static char *
}
static char *
@@
-890,7
+894,7
@@
show_current_directory (const struct dataset *ds UNUSED)
{
len <<= 1;
buf = xrealloc (buf, len);
{
len <<= 1;
buf = xrealloc (buf, len);
- }
+ }
while (NULL == (wd = getcwd (buf, len)));
return wd;
while (NULL == (wd = getcwd (buf, len)));
return wd;
@@
-905,7
+909,7
@@
show_tempdir (const struct dataset *ds UNUSED)
static char *
show_version (const struct dataset *ds UNUSED)
{
static char *
show_version (const struct dataset *ds UNUSED)
{
- return strdup (version);
+ return strdup (
announced_
version);
}
static char *
}
static char *
@@
-950,6
+954,7
@@
const struct show_sbc show_table[] =
{"ENVIRONMENT", show_system},
{"ERRORS", show_errors},
{"FORMAT", show_format},
{"ENVIRONMENT", show_system},
{"ERRORS", show_errors},
{"FORMAT", show_format},
+ {"FUZZBITS", show_fuzzbits},
{"JOURNAL", show_journal},
{"LENGTH", show_length},
{"LOCALE", show_locale},
{"JOURNAL", show_journal},
{"LENGTH", show_length},
{"LOCALE", show_locale},
@@
-1081,8
+1086,9
@@
cmd_preserve (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
}
else
{
}
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."),
"%d levels of saved settings are allowed."),
+ "PRESERVE", "RESTORE",
MAX_SAVED_SETTINGS);
return CMD_CASCADING_FAILURE;
}
MAX_SAVED_SETTINGS);
return CMD_CASCADING_FAILURE;
}
@@
-1100,7
+1106,7
@@
cmd_restore (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
}
else
{
}
else
{
- msg (SE, _("
RESTORE without matching PRESERVE.")
);
+ msg (SE, _("
%s without matching %s."), "RESTORE", "PRESERVE"
);
return CMD_FAILURE;
}
}
return CMD_FAILURE;
}
}