X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.c;h=71d4261de8d7afa442ad14eec28509877315c938;hb=2b0538e3901bfc1301729ab5b84e4d3e05ee4ccc;hp=3e637a31b36883c2bd7f00e533ead94d22c80f75;hpb=377d05c1eb7b390e2cdb049469fe6b0cfcf52615;p=pspp-builds.git
diff --git a/src/data/settings.c b/src/data/settings.c
index 3e637a31..71d4261d 100644
--- a/src/data/settings.c
+++ b/src/data/settings.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 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
@@ -15,26 +15,27 @@
along with this program. If not, see . */
#include
-#include "settings.h"
+
+#include "data/settings.h"
+
#include
#include
#include
-#include "format.h"
-#include "value.h"
-#include "xalloc.h"
-#include
-#include
-#include
-#include
-#include "error.h"
-#include "minmax.h"
+#include "data/case.h"
+#include "data/format.h"
+#include "data/value.h"
+#include "libpspp/i18n.h"
+#include "libpspp/integer-format.h"
+#include "libpspp/message.h"
+
+#include "gl/error.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-static int global_algorithm = ENHANCED;
-
struct settings
{
/* Integer format used for IB and PIB input. */
@@ -49,8 +50,8 @@ struct settings
/* Format of reals in output (SET WRB). */
enum float_format output_float_format;
- int *viewlength;
- int *viewwidth;
+ int viewlength;
+ int viewwidth;
bool safer_mode;
bool include;
int epoch;
@@ -63,14 +64,12 @@ struct settings
bool printback;
bool mprint;
int mxloops;
- bool nulline;
- char endcmd;
size_t workspace;
struct fmt_spec default_format;
bool testing_mode;
int cmd_algorithm;
- int *algorithm;
+ int global_algorithm;
int syntax;
struct fmt_settings *styles;
@@ -79,87 +78,98 @@ struct settings
};
static struct settings the_settings = {
- /* input_integer_format */
- INTEGER_NATIVE,
- /* input_float_format */
- FLOAT_NATIVE_DOUBLE,
- /* output_integer_format */
- INTEGER_NATIVE,
- /* output_float_format */
- FLOAT_NATIVE_DOUBLE,
- /* viewlength */
- NULL,
- /* viewwidth */
- NULL,
- /* safer_mode */
- false,
- /* include */
- true,
- /* epoch */
- -1,
- /* route_errors_to_terminal */
- true,
- /* route_errors_to_listing */
- true,
- /* scompress */
- true,
- /* undefined */
- true,
- /* blanks */
- SYSMIS,
- /* max_messages */
+ INTEGER_NATIVE, /* input_integer_format */
+ FLOAT_NATIVE_DOUBLE, /* input_float_format */
+ INTEGER_NATIVE, /* output_integer_format */
+ FLOAT_NATIVE_DOUBLE, /* output_float_format */
+ 24, /* viewlength */
+ 79, /* viewwidth */
+ false, /* safer_mode */
+ true, /* include */
+ -1, /* epoch */
+ true, /* route_errors_to_terminal */
+ true, /* route_errors_to_listing */
+ true, /* scompress */
+ true, /* undefined */
+ SYSMIS, /* blanks */
+
+ /* max_messages */
{
100, /* MSG_S_ERROR */
100, /* MSG_S_WARNING */
100 /* MSG_S_NOTE */
},
- /* printback */
- true,
- /* mprint */
- true,
- /* mxloops */
- 1,
- /* nulline */
- true,
- /* endcmd */
- '.',
- /* workspace */
- 64L * 1024 * 1024,
- /* default_format */
- {FMT_F, 8, 2},
- /* testing_mode */
- false,
- /* cmd_algorithm */
- ENHANCED,
- /* algorithm */
- &global_algorithm,
- /* syntax */
- ENHANCED,
- /* styles */
- NULL,
- /* output devices */
+
+ true, /* printback */
+ true, /* mprint */
+ 1, /* mxloops */
+ 64L * 1024 * 1024, /* workspace */
+ {FMT_F, 8, 2}, /* default_format */
+ false, /* testing_mode */
+ ENHANCED, /* cmd_algorithm */
+ ENHANCED, /* global_algorithm */
+ ENHANCED, /* syntax */
+ NULL, /* styles */
+
+ /* output_routing */
{SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL,
SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL,
0,
SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL}
};
-static void init_viewport ( int *, int *);
-
+/* Initializes the settings module. */
void
-settings_init (int *width, int *length)
+settings_init (void)
{
- init_viewport (width, length);
settings_set_epoch (-1);
the_settings.styles = fmt_settings_create ();
settings_set_decimal_char (get_system_decimal ());
}
+/* Cleans up the settings module. */
void
settings_done (void)
{
- fmt_settings_destroy (the_settings.styles);
+ settings_destroy (&the_settings);
+}
+
+static void
+settings_copy (struct settings *dst, const struct settings *src)
+{
+ *dst = *src;
+ dst->styles = fmt_settings_clone (src->styles);
+}
+
+/* Returns a copy of the current settings. */
+struct settings *
+settings_get (void)
+{
+ struct settings *s = xmalloc (sizeof *s);
+ settings_copy (s, &the_settings);
+ return s;
+}
+
+/* Replaces the current settings by those in S. The caller retains ownership
+ of S. */
+void
+settings_set (const struct settings *s)
+{
+ settings_destroy (&the_settings);
+ settings_copy (&the_settings, s);
+}
+
+/* Destroys S. */
+void
+settings_destroy (struct settings *s)
+{
+ if (s != NULL)
+ {
+ fmt_settings_destroy (s->styles);
+ if (s != &the_settings)
+ free (s);
+ }
}
/* Returns the floating-point format used for RB and RBHEX
@@ -226,35 +236,28 @@ settings_set_output_float_format ( enum float_format float_format)
int
settings_get_viewlength (void)
{
- return *the_settings.viewlength;
+ return the_settings.viewlength;
}
/* Sets the view length. */
void
settings_set_viewlength ( int viewlength_)
{
- *the_settings.viewlength = viewlength_;
+ the_settings.viewlength = viewlength_;
}
/* Screen width. */
int
settings_get_viewwidth(void)
{
- return *the_settings.viewwidth;
+ return the_settings.viewwidth;
}
/* Sets the screen width. */
void
settings_set_viewwidth ( int viewwidth_)
{
- *the_settings.viewwidth = viewwidth_;
-}
-
-static void
-init_viewport ( int *width, int *length)
-{
- the_settings.viewwidth = width;
- the_settings.viewlength = length;
+ the_settings.viewwidth = viewwidth_;
}
/* Whether PSPP can erase and overwrite files. */
@@ -422,34 +425,6 @@ settings_set_mxloops ( int mxloops)
the_settings.mxloops = mxloops;
}
-/* Whether a blank line is a command terminator. */
-bool
-settings_get_nulline (void)
-{
- return the_settings.nulline;
-}
-
-/* Set whether a blank line is a command terminator. */
-void
-settings_set_nulline ( bool nulline)
-{
- the_settings.nulline = nulline;
-}
-
-/* The character used to terminate commands. */
-char
-settings_get_endcmd (void)
-{
- return the_settings.endcmd;
-}
-
-/* Set the character used to terminate commands. */
-void
-settings_set_endcmd ( char endcmd)
-{
- the_settings.endcmd = endcmd;
-}
-
/* Approximate maximum amount of memory to use for cases, in
bytes. */
size_t
@@ -511,14 +486,14 @@ settings_set_testing_mode ( bool testing_mode)
enum behavior_mode
settings_get_algorithm (void)
{
- return *the_settings.algorithm;
+ return the_settings.cmd_algorithm;
}
/* Set the algorithm option globally. */
void
settings_set_algorithm (enum behavior_mode mode)
{
- global_algorithm = mode;
+ the_settings.global_algorithm = the_settings.cmd_algorithm = mode;
}
/* Set the algorithm option for this command only */
@@ -526,14 +501,13 @@ void
settings_set_cmd_algorithm ( enum behavior_mode mode)
{
the_settings.cmd_algorithm = mode;
- the_settings.algorithm = &the_settings.cmd_algorithm;
}
/* Unset the algorithm option for this command */
void
unset_cmd_algorithm (void)
{
- the_settings.algorithm = &global_algorithm;
+ the_settings.cmd_algorithm = the_settings.global_algorithm;
}
/* Get the current syntax setting */
@@ -552,11 +526,10 @@ settings_set_syntax ( enum behavior_mode mode)
-/* Find the grouping characters in CC_STRING and set CC's
- grouping and decimal members appropriately. Returns true if
- successful, false otherwise. */
+/* Find the grouping characters in CC_STRING and sets *GROUPING and *DECIMAL
+ appropriately. Returns true if successful, false otherwise. */
static bool
-find_cc_separators (const char *cc_string, struct fmt_number_style *cc)
+find_cc_separators (const char *cc_string, char *decimal, char *grouping)
{
const char *sp;
int comma_cnt, dot_cnt;
@@ -578,36 +551,32 @@ find_cc_separators (const char *cc_string, struct fmt_number_style *cc)
if (comma_cnt == 3)
{
- cc->decimal = '.';
- cc->grouping = ',';
+ *decimal = '.';
+ *grouping = ',';
}
else
{
- cc->decimal = ',';
- cc->grouping = '.';
+ *decimal = ',';
+ *grouping = '.';
}
return true;
}
-/* Extracts a token from IN into AFFIX, using BUFFER for storage. BUFFER must
- have at least FMT_STYLE_AFFIX_MAX + 1 bytes of space. Tokens are delimited
- by GROUPING. The token is truncated to at most FMT_STYLE_AFFIX_MAX bytes,
- followed by a null terminator. Returns the first character following the
- token. */
+/* Extracts a token from IN into a newly allocated string AFFIXP. Tokens are
+ delimited by GROUPING. Returns the first character following the token. */
static const char *
-extract_cc_token (const char *in, int grouping, struct substring *affix,
- char buffer[FMT_STYLE_AFFIX_MAX + 1])
+extract_cc_token (const char *in, int grouping, char **affixp)
{
- size_t ofs = 0;
+ char *out;
+ out = *affixp = xmalloc (strlen (in) + 1);
for (; *in != '\0' && *in != grouping; in++)
{
if (*in == '\'' && in[1] == grouping)
in++;
- if (ofs < FMT_STYLE_AFFIX_MAX)
- buffer[ofs++] = *in;
+ *out++ = *in;
}
- *affix = ss_buffer (buffer, ofs);
+ *out = '\0';
if (*in == grouping)
in++;
@@ -619,16 +588,13 @@ extract_cc_token (const char *in, int grouping, struct substring *affix,
bool
settings_set_cc (const char *cc_string, enum fmt_type type)
{
- char a[FMT_STYLE_AFFIX_MAX + 1];
- char b[FMT_STYLE_AFFIX_MAX + 1];
- char c[FMT_STYLE_AFFIX_MAX + 1];
- char d[FMT_STYLE_AFFIX_MAX + 1];
- struct fmt_number_style cc;
+ char *neg_prefix, *prefix, *suffix, *neg_suffix;
+ char decimal, grouping;
assert (fmt_get_category (type) == FMT_CAT_CUSTOM);
/* Determine separators. */
- if (!find_cc_separators (cc_string, &cc))
+ if (!find_cc_separators (cc_string, &decimal, &grouping))
{
msg (SE, _("%s: Custom currency string `%s' does not contain "
"exactly three periods or commas (or it contains both)."),
@@ -636,12 +602,18 @@ settings_set_cc (const char *cc_string, enum fmt_type type)
return false;
}
- cc_string = extract_cc_token (cc_string, cc.grouping, &cc.neg_prefix, a);
- cc_string = extract_cc_token (cc_string, cc.grouping, &cc.prefix, b);
- cc_string = extract_cc_token (cc_string, cc.grouping, &cc.suffix, c);
- cc_string = extract_cc_token (cc_string, cc.grouping, &cc.neg_suffix, d);
+ cc_string = extract_cc_token (cc_string, grouping, &neg_prefix);
+ cc_string = extract_cc_token (cc_string, grouping, &prefix);
+ cc_string = extract_cc_token (cc_string, grouping, &suffix);
+ cc_string = extract_cc_token (cc_string, grouping, &neg_suffix);
+
+ fmt_settings_set_style (the_settings.styles, type, decimal, grouping,
+ neg_prefix, prefix, suffix, neg_suffix);
- fmt_settings_set_style (the_settings.styles, type, &cc);
+ free (neg_suffix);
+ free (suffix);
+ free (prefix);
+ free (neg_prefix);
return true;
}
@@ -682,20 +654,20 @@ settings_dollar_template (const struct fmt_spec *fmt)
fns = fmt_settings_get_style (the_settings.styles, fmt->type);
- ds_put_char (&str, '$');
+ ds_put_byte (&str, '$');
for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0; )
{
- ds_put_char (&str, '#');
+ ds_put_byte (&str, '#');
if (--c % 4 == 0 && c > 0)
{
- ds_put_char (&str, fns->grouping);
+ ds_put_byte (&str, fns->grouping);
--c;
}
}
if (fmt->d > 0)
{
- ds_put_char (&str, fns->decimal);
- ds_put_char_multiple (&str, '#', fmt->d);
+ ds_put_byte (&str, fns->decimal);
+ ds_put_byte_multiple (&str, '#', fmt->d);
}
return ds_cstr (&str);