X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=710bc2f44e44d5372e960bc7a1433109427dd1e4;hb=ccaf88efae9f6f4d93d7812834c412e8fd511bb2;hp=243de30063c8b12332009d185ed02274c0a5bb06;hpb=f863b6025897457e1b61d043833e25a35a4c246e;p=pspp diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 243de30063..710bc2f44e 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, 2010, 2011 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 @@ -16,6 +16,7 @@ #include +#include #include #include #include @@ -79,6 +80,7 @@ int tgetnum (const char *); epoch=custom; errors=custom; format=custom; + fuzzbits=integer; 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)) { - free_set (&cmd); 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_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); @@ -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 ()) - 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); } @@ -403,14 +412,14 @@ stc_custom_epoch (struct lexer *lexer, 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; } @@ -438,7 +447,7 @@ stc_custom_length (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se 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); @@ -535,7 +544,7 @@ stc_custom_width (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set 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)); @@ -558,12 +567,13 @@ stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se 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; } @@ -624,7 +634,7 @@ show_blanks (const struct dataset *ds UNUSED) { return (settings_get_blanks () == SYSMIS ? xstrdup ("SYSMIS") - : xasprintf ("%g", settings_get_blanks ())); + : xasprintf ("%.*g", DBL_DIG + 1, settings_get_blanks ())); } static void @@ -708,6 +718,20 @@ show_format (const struct dataset *ds UNUSED) 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) +{ + return (journal_is_enabled () + ? xasprintf ("\"%s\"", journal_get_file_name ()) + : xstrdup ("disabled")); +} + static char * show_length (const struct dataset *ds UNUSED) { @@ -864,6 +888,13 @@ show_width (const struct dataset *ds UNUSED) 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) { @@ -875,7 +906,7 @@ show_current_directory (const struct dataset *ds UNUSED) { len <<= 1; buf = xrealloc (buf, len); - } + } while (NULL == (wd = getcwd (buf, len))); return wd; @@ -890,7 +921,7 @@ show_tempdir (const struct dataset *ds UNUSED) static char * show_version (const struct dataset *ds UNUSED) { - return strdup (version); + return strdup (announced_version); } static char * @@ -935,6 +966,8 @@ const struct show_sbc show_table[] = {"ENVIRONMENT", show_system}, {"ERRORS", show_errors}, {"FORMAT", show_format}, + {"FUZZBITS", show_fuzzbits}, + {"JOURNAL", show_journal}, {"LENGTH", show_length}, {"LOCALE", show_locale}, {"MESSAGES", show_messages}, @@ -954,6 +987,7 @@ const struct show_sbc show_table[] = {"WIB", show_wib}, {"WRB", show_wrb}, {"WIDTH", show_width}, + {"WORKSPACE", show_workspace}, }; static void @@ -1064,8 +1098,9 @@ cmd_preserve (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) } 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; } @@ -1083,7 +1118,7 @@ cmd_restore (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) } else { - msg (SE, _("RESTORE without matching PRESERVE.")); + msg (SE, _("%s without matching %s."), "RESTORE", "PRESERVE"); return CMD_FAILURE; } }