X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.c;h=db9c3a16329d88d16f07da86ac7a88816f1208e9;hb=14e92ae17ea68adfe8d703b740e20c7f368138fb;hp=13512cc03242f7b7d7d78e6ebf2d0369bb9f13c3;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp diff --git a/src/data/settings.c b/src/data/settings.c index 13512cc032..db9c3a1632 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, 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 @@ -29,7 +29,6 @@ #include "libpspp/integer-format.h" #include "libpspp/message.h" -#include "gl/error.h" #include "gl/minmax.h" #include "gl/xalloc.h" @@ -64,11 +63,10 @@ struct settings bool printback; bool mprint; int mxloops; - bool nulline; - char endcmd; size_t workspace; struct fmt_spec default_format; bool testing_mode; + int fuzzbits; int cmd_algorithm; int global_algorithm; @@ -77,6 +75,9 @@ struct settings struct fmt_settings *styles; 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 = { @@ -104,12 +105,11 @@ static struct settings the_settings = { true, /* printback */ true, /* mprint */ - 1, /* mxloops */ - true, /* nulline */ - '.', /* endcmd */ + 40, /* mxloops */ 64L * 1024 * 1024, /* workspace */ {FMT_F, 8, 2}, /* default_format */ false, /* testing_mode */ + 6, /* fuzzbits */ ENHANCED, /* cmd_algorithm */ ENHANCED, /* global_algorithm */ ENHANCED, /* syntax */ @@ -119,7 +119,10 @@ static struct settings the_settings = { {SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL, SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL, 0, - SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL} + SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL}, + + SETTINGS_VALUE_SHOW_LABEL, + SETTINGS_VALUE_SHOW_LABEL }; /* Initializes the settings module. */ @@ -187,7 +190,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; } @@ -202,7 +205,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; } @@ -231,7 +234,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; } @@ -245,7 +248,7 @@ settings_get_viewlength (void) /* Sets the view length. */ void -settings_set_viewlength ( int viewlength_) +settings_set_viewlength (int viewlength_) { the_settings.viewlength = viewlength_; } @@ -259,7 +262,7 @@ settings_get_viewwidth(void) /* Sets the screen width. */ void -settings_set_viewwidth ( int viewwidth_) +settings_set_viewwidth (int viewwidth_) { the_settings.viewwidth = viewwidth_; } @@ -287,7 +290,7 @@ settings_get_include (void) /* Set include file echo. */ void -settings_set_include ( bool include) +settings_set_include (bool include) { the_settings.include = include; } @@ -303,7 +306,7 @@ settings_get_epoch (void) /* Sets the year that starts the epoch. */ void -settings_set_epoch ( int epoch) +settings_set_epoch (int epoch) { if (epoch < 0) { @@ -325,7 +328,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; } @@ -339,7 +342,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; } @@ -354,7 +357,7 @@ 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; } @@ -371,9 +374,9 @@ settings_get_max_messages (enum msg_severity severity) /* 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 + 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. + issued. */ void settings_set_max_messages (enum msg_severity severity, int max) @@ -382,13 +385,13 @@ settings_set_max_messages (enum msg_severity severity, int max) if (severity == MSG_S_WARNING) { - if ( max == 0) + 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) + else if (the_settings.max_messages [MSG_S_WARNING] == 0) { msg_ui_disable_warnings (false); the_settings.max_messages[MSG_S_WARNING] = max; @@ -410,7 +413,7 @@ 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; } @@ -424,39 +427,11 @@ settings_get_mxloops (void) /* Set implied limit of unbounded loop. */ void -settings_set_mxloops ( int mxloops) +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 @@ -478,7 +453,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; } @@ -494,7 +469,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; } @@ -509,11 +484,23 @@ 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; +} + /* Return the current algorithm setting */ enum behavior_mode settings_get_algorithm (void) @@ -530,7 +517,7 @@ settings_set_algorithm (enum behavior_mode 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; } @@ -551,18 +538,17 @@ 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. */ +/* 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; @@ -584,36 +570,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++; @@ -625,16 +607,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)."), @@ -642,12 +621,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; } @@ -688,20 +673,20 @@ settings_dollar_template (const struct fmt_spec *fmt) 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); @@ -721,3 +706,28 @@ 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; +}