X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.c;h=c70635cec03fc06da0dd7c472a8da626e2010fd6;hb=899ca177810116bc0ff1c4bcce9368d79cd71d42;hp=c86ac9cc7e2c856ee685d271cf0995e5a9bbafd1;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp diff --git a/src/data/settings.c b/src/data/settings.c index c86ac9cc7e..c70635cec0 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 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 @@ -15,26 +15,25 @@ 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/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,115 +48,151 @@ struct settings /* Format of reals in output (SET WRB). */ enum float_format output_float_format; - int *viewlength; - int *viewwidth; + /* MATRIX...END MATRIX settings. */ + enum settings_mdisplay mdisplay; + + int viewlength; + int viewwidth; bool safer_mode; - bool do_echo; bool include; - int epoch; - bool errorbreak; bool route_errors_to_terminal; bool route_errors_to_listing; bool scompress; bool undefined; double blanks; - int mxwarns; - int mxerrs; + int max_messages[MSG_N_SEVERITIES]; bool printback; - bool mprint; + + /* Macro settings. */ + bool mexpand; /* Expand macros? */ + bool mprint; /* Print macro expansions? */ + int miterate; /* Maximum iterations of !FOR. */ + int mnest; /* Maximum nested macro expansion levels. */ + int mxloops; - bool nulline; - char endcmd; size_t workspace; struct fmt_spec default_format; bool testing_mode; + int fuzzbits; + int scalemin; int cmd_algorithm; - int *algorithm; + int global_algorithm; int syntax; - struct fmt_number_style *styles; + struct fmt_settings styles; + double small; + + enum settings_output_devices output_routing[SETTINGS_N_OUTPUT_TYPES]; + + enum settings_value_show show_values; + enum settings_value_show show_variables; }; 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, - /* do_echo */ - false, - /* include */ - true, - /* epoch */ - -1, - /* errorbreak */ - false, - /* route_errors_to_terminal */ - true, - /* route_errors_to_listing */ - true, - /* scompress */ - true, - /* undefined */ - true, - /* blanks */ - SYSMIS, - /* mxwarns */ - 100, - /* mxerrs */ - 100, - /* 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 + .input_integer_format = INTEGER_NATIVE, + .input_float_format = FLOAT_NATIVE_DOUBLE, + .output_integer_format = INTEGER_NATIVE, + .output_float_format = FLOAT_NATIVE_DOUBLE, + .mdisplay = SETTINGS_MDISPLAY_TEXT, + .viewlength = 24, + .viewwidth = 79, + .safer_mode = false, + .include = true, + .route_errors_to_terminal = true, + .route_errors_to_listing = true, + .scompress = true, + .undefined = true, + .blanks = SYSMIS, + + .max_messages = { + [MSG_S_ERROR] = 100, + [MSG_S_WARNING] = 100, + [MSG_S_NOTE] = 100 + }, + + .printback = true, + + .mexpand = true, + .mprint = false, + .miterate = 1000, + .mnest = 50, + + .mxloops = 40, + .workspace = 64L * 1024 * 1024, + .default_format = { .type = FMT_F, .w = 8, .d = 2 }, + .testing_mode = false, + .fuzzbits = 6, + .scalemin = 24, + .cmd_algorithm = ENHANCED, + .global_algorithm = ENHANCED, + .syntax = ENHANCED, + .styles = FMT_SETTINGS_INIT, + .small = .0001, + + /* output_routing */ + .output_routing = { +#define LT (SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL) + [SETTINGS_OUTPUT_ERROR] = LT, + [SETTINGS_OUTPUT_NOTE] = LT, + [SETTINGS_OUTPUT_SYNTAX] = 0, + [SETTINGS_OUTPUT_RESULT] = LT +#undef LT + }, + + .show_values = SETTINGS_VALUE_SHOW_LABEL, + .show_variables = SETTINGS_VALUE_SHOW_LABEL, }; -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_create (); - settings_set_decimal_char (get_system_decimal ()); } +/* Cleans up the settings module. */ void settings_done (void) { - fmt_done (the_settings.styles); + settings_destroy (&the_settings); +} + +static void +settings_copy (struct settings *dst, const struct settings *src) +{ + *dst = *src; + dst->styles = fmt_settings_copy (&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_uninit (&s->styles); + if (s != &the_settings) + free (s); + } } /* Returns the floating-point format used for RB and RBHEX @@ -171,7 +206,7 @@ settings_get_input_float_format (void) /* Sets the floating-point format used for RB and RBHEX input to FORMAT. */ void -settings_set_input_float_format ( enum float_format format) +settings_set_input_float_format (enum float_format format) { the_settings.input_float_format = format; } @@ -186,7 +221,7 @@ settings_get_input_integer_format (void) /* Sets the integer format used for IB and PIB input to FORMAT. */ void -settings_set_input_integer_format ( enum integer_format format) +settings_set_input_integer_format (enum integer_format format) { the_settings.input_integer_format = format; } @@ -215,7 +250,7 @@ settings_get_output_float_format (void) /* Sets the output float format to FLOAT_FORMAT. */ void -settings_set_output_float_format ( enum float_format float_format) +settings_set_output_float_format (enum float_format float_format) { the_settings.output_float_format = float_format; } @@ -224,35 +259,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_) +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) +settings_set_viewwidth (int viewwidth_) { - the_settings.viewwidth = width; - the_settings.viewlength = length; + the_settings.viewwidth = viewwidth_; } /* Whether PSPP can erase and overwrite files. */ @@ -269,20 +297,6 @@ settings_set_safer_mode (void) the_settings.safer_mode = true; } -/* Echo commands to the listing file/printer? */ -bool -settings_get_echo (void) -{ - return the_settings.do_echo; -} - -/* Set echo. */ -void -settings_set_echo ( bool echo) -{ - the_settings.do_echo = echo; -} - /* If echo is on, whether commands from include files are echoed. */ bool settings_get_include (void) @@ -292,77 +306,23 @@ settings_get_include (void) /* Set include file echo. */ void -settings_set_include ( bool include) +settings_set_include (bool include) { the_settings.include = include; } -/* What year to use as the start of the epoch. */ +/* Returns the year that starts the epoch. */ int settings_get_epoch (void) { - assert (the_settings.epoch >= 0); - - return the_settings.epoch; + return the_settings.styles.epoch; } /* Sets the year that starts the epoch. */ void -settings_set_epoch ( int epoch) +settings_set_epoch (int epoch) { - if (epoch < 0) - { - time_t t = time (0); - struct tm *tm = localtime (&t); - epoch = (tm != NULL ? tm->tm_year + 1900 : 2000) - 69; - } - - the_settings.epoch = epoch; - assert (the_settings.epoch >= 0); -} - -/* Does an error stop execution? */ -bool -settings_get_errorbreak (void) -{ - return the_settings.errorbreak; -} - -/* Sets whether an error stops execution. */ -void -settings_set_errorbreak ( bool errorbreak) -{ - the_settings.errorbreak = errorbreak; -} - -/* Route error messages to terminal? */ -bool -settings_get_error_routing_to_terminal (void) -{ - return the_settings.route_errors_to_terminal; -} - -/* Sets whether error messages should be routed to the - terminal. */ -void -settings_set_error_routing_to_terminal ( bool route_to_terminal) -{ - the_settings.route_errors_to_terminal = route_to_terminal; -} - -/* Route error messages to listing file? */ -bool -settings_get_error_routing_to_listing (void) -{ - return the_settings.route_errors_to_listing; -} - -/* Sets whether error messages should be routed to the - listing file. */ -void -settings_set_error_routing_to_listing ( bool route_to_listing) -{ - the_settings.route_errors_to_listing = route_to_listing; + the_settings.styles.epoch = epoch; } /* Compress system files by default? */ @@ -374,7 +334,7 @@ settings_get_scompression (void) /* Set system file default compression. */ void -settings_set_scompression ( bool scompress) +settings_set_scompression (bool scompress) { the_settings.scompress = scompress; } @@ -388,7 +348,7 @@ settings_get_undefined (void) /* Set whether to warn on undefined values. */ void -settings_set_undefined ( bool undefined) +settings_set_undefined (bool undefined) { the_settings.undefined = undefined; } @@ -403,51 +363,63 @@ settings_get_blanks (void) /* Set the value that blank numeric fields are set to when read in. */ void -settings_set_blanks ( double blanks) +settings_set_blanks (double blanks) { the_settings.blanks = blanks; } -/* Maximum number of warnings + errors. */ +/* Returns the maximum number of messages to show of the given SEVERITY before + aborting. (The value for MSG_S_WARNING is interpreted as maximum number of + warnings and errors combined.) */ int -settings_get_mxwarns (void) +settings_get_max_messages (enum msg_severity severity) { - return the_settings.mxwarns; + assert (severity < MSG_N_SEVERITIES); + return the_settings.max_messages[severity]; } -/* Sets maximum number of warnings + errors. */ +/* Sets the maximum number of messages to show of the given SEVERITY before + aborting to MAX. (The value for MSG_S_WARNING is interpreted as maximum + number of warnings and errors combined.) In addition, in the case of + warnings the special value of zero indicates that no warnings are to be + issued. +*/ void -settings_set_mxwarns ( int mxwarns) +settings_set_max_messages (enum msg_severity severity, int max) { - the_settings.mxwarns = mxwarns; -} + assert (severity < MSG_N_SEVERITIES); -/* Maximum number of errors. */ -int -settings_get_mxerrs (void) -{ - return the_settings.mxerrs; -} + if (severity == MSG_S_WARNING) + { + if (max == 0) + { + msg (MW, + _("MXWARNS set to zero. No further warnings will be given even when potentially problematic situations are encountered.")); + msg_ui_disable_warnings (true); + } + else if (the_settings.max_messages [MSG_S_WARNING] == 0) + { + msg_ui_disable_warnings (false); + the_settings.max_messages[MSG_S_WARNING] = max; + msg (MW, _("Warnings re-enabled. %d warnings will be issued before aborting syntax processing."), max); + } + } -/* Sets maximum number of errors. */ -void -settings_set_mxerrs ( int mxerrs) -{ - the_settings.mxerrs = mxerrs; + the_settings.max_messages[severity] = max; } -/* Whether commands are written to the display. */ +/* Returns whether to expand macro invocations. */ bool -settings_get_printback (void) +settings_get_mexpand (void) { - return the_settings.printback; + return the_settings.mexpand; } -/* Sets whether commands are written to the display. */ +/* Sets whether to expand macro invocations. */ void -settings_set_printback ( bool printback) +settings_set_mexpand (bool mexpand) { - the_settings.printback = printback; + the_settings.mexpand = mexpand; } /* Independent of get_printback, controls whether the commands @@ -461,51 +433,52 @@ settings_get_mprint (void) /* Sets whether the commands generated by macro invocations are displayed. */ void -settings_set_mprint ( bool mprint) +settings_set_mprint (bool mprint) { the_settings.mprint = mprint; } -/* Implied limit of unbounded loop. */ +/* Returns the limit for loop iterations within a macro. */ int -settings_get_mxloops (void) +settings_get_miterate (void) { - return the_settings.mxloops; + return the_settings.miterate; } -/* Set implied limit of unbounded loop. */ +/* Sets the limit for loop iterations within a macro. */ void -settings_set_mxloops ( int mxloops) +settings_set_miterate (int miterate) { - the_settings.mxloops = mxloops; + the_settings.miterate = miterate; } -/* Whether a blank line is a command terminator. */ -bool -settings_get_nulline (void) +/* Returns the limit for recursion macro expansions. */ +int settings_get_mnest (void) { - return the_settings.nulline; + return the_settings.mnest; } -/* Set whether a blank line is a command terminator. */ +/* Sets the limit for recursion macro expansions. */ void -settings_set_nulline ( bool nulline) +settings_set_mnest (int mnest) { - the_settings.nulline = nulline; + the_settings.mnest = mnest; } -/* The character used to terminate commands. */ -char -settings_get_endcmd (void) +int settings_get_mxloops (void); +void settings_set_mxloops (int); +/* Implied limit of unbounded loop. */ +int +settings_get_mxloops (void) { - return the_settings.endcmd; + return the_settings.mxloops; } -/* Set the character used to terminate commands. */ +/* Set implied limit of unbounded loop. */ void -settings_set_endcmd ( char endcmd) +settings_set_mxloops (int mxloops) { - the_settings.endcmd = endcmd; + the_settings.mxloops = mxloops; } /* Approximate maximum amount of memory to use for cases, in @@ -529,7 +502,7 @@ settings_get_workspace_cases (const struct caseproto *proto) bytes. */ void -settings_set_workspace ( size_t workspace) +settings_set_workspace (size_t workspace) { the_settings.workspace = workspace; } @@ -545,7 +518,7 @@ settings_get_format (void) /* Set default format for variables created by transformations and by DATA LIST {FREE,LIST}. */ void -settings_set_format ( const struct fmt_spec *default_format) +settings_set_format (const struct fmt_spec *default_format) { the_settings.default_format = *default_format; } @@ -560,38 +533,61 @@ settings_get_testing_mode (void) /* Set testing mode. */ void -settings_set_testing_mode ( bool testing_mode) +settings_set_testing_mode (bool testing_mode) { the_settings.testing_mode = testing_mode; } +int +settings_get_fuzzbits (void) +{ + return the_settings.fuzzbits; +} + +void +settings_set_fuzzbits (int fuzzbits) +{ + the_settings.fuzzbits = fuzzbits; +} + +int +settings_get_scalemin (void) +{ + return the_settings.scalemin; +} + +void +settings_set_scalemin (int scalemin) +{ + the_settings.scalemin = scalemin; +} + /* Return the current algorithm setting */ 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 */ void -settings_set_cmd_algorithm ( enum behavior_mode mode) +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 */ @@ -603,85 +599,19 @@ settings_get_syntax (void) /* Set the syntax option */ void -settings_set_syntax ( enum behavior_mode mode) +settings_set_syntax (enum behavior_mode mode) { the_settings.syntax = mode; } - -/* Find the grouping characters in CC_STRING and set CC's - grouping and decimal members appropriately. Returns true if - successful, false otherwise. */ -static bool -find_cc_separators (const char *cc_string, struct fmt_number_style *cc) -{ - const char *sp; - int comma_cnt, dot_cnt; - - /* Count commas and periods. There must be exactly three of - one or the other, except that an apostrophe escapes a - following comma or period. */ - comma_cnt = dot_cnt = 0; - for (sp = cc_string; *sp; sp++) - if (*sp == ',') - comma_cnt++; - else if (*sp == '.') - dot_cnt++; - else if (*sp == '\'' && (sp[1] == '.' || sp[1] == ',' || sp[1] == '\'')) - sp++; - - if ((comma_cnt == 3) == (dot_cnt == 3)) - return false; - - if (comma_cnt == 3) - { - cc->decimal = '.'; - cc->grouping = ','; - } - else - { - cc->decimal = ','; - cc->grouping = '.'; - } - return true; -} - -/* Extracts a token from IN into a newly allocated AFFIX. Tokens - are delimited by GROUPING. The token is truncated to at most - FMT_STYLE_AFFIX_MAX characters. Returns the first character - following the token. */ -static const char * -extract_cc_token (const char *in, int grouping, struct substring *affix) -{ - size_t ofs = 0; - ss_alloc_uninit (affix, FMT_STYLE_AFFIX_MAX); - for (; *in != '\0' && *in != grouping; in++) - { - if (*in == '\'' && in[1] == grouping) - in++; - if (ofs < FMT_STYLE_AFFIX_MAX) - ss_data (*affix)[ofs++] = *in; - } - affix->length = ofs; - - if (*in == grouping) - in++; - return in; -} - - /* Sets custom currency specifier CC having name CC_NAME ('A' through 'E') to correspond to the settings in CC_STRING. */ bool settings_set_cc (const char *cc_string, enum fmt_type type) { - struct fmt_number_style *cc = &the_settings.styles[type]; - - assert (fmt_get_category (type) == FMT_CAT_CUSTOM); - - /* Determine separators. */ - if (!find_cc_separators (cc_string, cc)) + struct fmt_number_style *style = fmt_number_style_from_string (cc_string); + if (!style) { msg (SE, _("%s: Custom currency string `%s' does not contain " "exactly three periods or commas (or it contains both)."), @@ -689,40 +619,39 @@ 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); - cc_string = extract_cc_token (cc_string, cc->grouping, &cc->prefix); - cc_string = extract_cc_token (cc_string, cc->grouping, &cc->suffix); - cc_string = extract_cc_token (cc_string, cc->grouping, &cc->neg_suffix); - - fmt_check_style (cc); - + fmt_settings_set_cc (&the_settings.styles, type, style); return true; } -/* Returns the decimal point character for TYPE. */ -int -settings_get_decimal_char (enum fmt_type type) +void +settings_set_decimal_char (char decimal) { - return fmt_get_style (the_settings.styles, type)->decimal; + the_settings.styles.decimal = decimal; } void -settings_set_decimal_char (char decimal) +settings_set_include_leading_zero (bool include_leading_zero) { - fmt_set_decimal (the_settings.styles, decimal); + the_settings.styles.include_leading_zero = include_leading_zero; } +const struct fmt_settings * +settings_get_fmt_settings (void) +{ + return &the_settings.styles; +} - -/* Returns the number formatting style associated with the given - format TYPE. */ -const struct fmt_number_style * -settings_get_style (enum fmt_type type) +double +settings_get_small (void) { - assert (is_fmt_type (type)); - return &the_settings.styles[type]; + return the_settings.small; } +void +settings_set_small (double small) +{ + the_settings.small = small; +} /* Returns a string of the form "$#,###.##" according to FMT, which must be of type FMT_DOLLAR. The caller must free the @@ -730,30 +659,81 @@ settings_get_style (enum fmt_type type) char * settings_dollar_template (const struct fmt_spec *fmt) { - const struct fmt_number_style *styles = the_settings.styles; struct string str = DS_EMPTY_INITIALIZER; int c; const struct fmt_number_style *fns ; assert (fmt->type == FMT_DOLLAR); - fns = fmt_get_style (styles, fmt->type); + fns = fmt_settings_get_style (&the_settings.styles, fmt->type); - ds_put_char (&str, '$'); - for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0; ) + 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); } + +void +settings_set_output_routing (enum settings_output_type type, + enum settings_output_devices devices) +{ + assert (type < SETTINGS_N_OUTPUT_TYPES); + the_settings.output_routing[type] = devices; +} + +enum settings_output_devices +settings_get_output_routing (enum settings_output_type type) +{ + assert (type < SETTINGS_N_OUTPUT_TYPES); + return the_settings.output_routing[type] | SETTINGS_DEVICE_UNFILTERED; +} + +enum settings_value_show +settings_get_show_values (void) +{ + return the_settings.show_values; +} + +void +settings_set_show_values (enum settings_value_show s) +{ + the_settings.show_values = s; +} + + +enum settings_value_show +settings_get_show_variables (void) +{ + return the_settings.show_variables; +} + +void +settings_set_show_variables (enum settings_value_show s) +{ + the_settings.show_variables = s; +} + +enum settings_mdisplay +settings_get_mdisplay (void) +{ + return the_settings.mdisplay; +} + +void +settings_set_mdisplay (enum settings_mdisplay mdisplay) +{ + the_settings.mdisplay = mdisplay; +}