X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=0be8c47010a7cf541501487456e3ba7eae686de8;hb=005ed2b3279a59e9767efedc8c5d9a40f1df4c77;hp=9a7e841707f535076bf1ad0126f454dd17aa1ba8;hpb=0b0ca44889e637251cb5f2dbf3c7fdc4ec8b9bd7;p=pspp

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index 9a7e841707..0be8c47010 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, 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
@@ -16,6 +16,7 @@
 
 #include <config.h>
 
+#include <float.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -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;
@@ -152,6 +154,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 +203,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 +413,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 +448,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 +545,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));
@@ -562,8 +572,9 @@ stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se
   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 +635,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 +719,12 @@ 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)
 {
@@ -950,6 +967,7 @@ 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},
@@ -1081,8 +1099,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;
     }
@@ -1100,7 +1119,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;
     }
 }