X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=a05878a3abbab4afc0a6722906e7a10991aadb3f;hb=fd0958dc7caa5806b82b9757e2b937c5b7def369;hp=b403843a1abe604c9f4d683c10e6cf542db10365;hpb=18f6e8958244f938e9e9a03a4230cacf0d22a470;p=pspp diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index b403843a1a..a05878a3ab 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. Written by Ben Pfaff . This program is free software; you can redistribute it and/or @@ -24,17 +24,21 @@ #include #include +#include #include #include #include #include #include #include +#include #include #include #include #include #include +#include +#include #include #include #include @@ -73,7 +77,7 @@ int tgetnum (const char *); endcmd=string "x==1" "one character long"; epoch=custom; errorbreak=errbrk:on/off; - errors=errors:on/off/terminal/listing/both/none; + errors=errors:terminal/listing/both/on/none/off; format=custom; headers=headers:no/yes/blank; highres=hires:on/off; @@ -85,7 +89,7 @@ int tgetnum (const char *); lowres=lores:auto/on/off; lpi=integer "x>0" "%s must be greater than 0"; menus=menus:standard/extended; - messages=messages:on/off/terminal/listing/both/none; + messages=messages:on/off/terminal/listing/both/on/none/off; mexpand=mexp:on/off; miterate=integer "x>0" "%s must be greater than 0"; mnest=integer "x>0" "%s must be greater than 0"; @@ -97,7 +101,7 @@ int tgetnum (const char *); nulline=null:on/off; printback=prtbck:on/off; prompt=string; - results=res:on/off/terminal/listing/both/none; + results=res:on/off/terminal/listing/both/on/none/off; safer=safe:on; scompression=scompress:on/off; scripttab=string "x==1" "one character long"; @@ -105,36 +109,41 @@ int tgetnum (const char *); tb1=string "x==3 || x==11" "3 or 11 characters long"; tbfonts=string; undefined=undef:warn/nowarn; + wib=wib:msbfirst/lsbfirst/vax/native; + wrb=wrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl; width=custom; workspace=integer "x>=1024" "%s must be at least 1 MB"; xsort=xsort:yes/no. */ +/* (headers) */ + /* (declarations) */ -/* (_functions) */ +/* (functions) */ -static bool do_cc (const char *cc_string, int idx); +static bool do_cc (const char *cc_string, enum fmt_type); +static enum integer_format stc_to_integer_format (int stc); +static enum float_format stc_to_float_format (int stc); int -cmd_set (void) +cmd_set (struct dataset *ds) { struct cmd_set cmd; - bool ok = true; - if (!parse_set (&cmd, NULL)) + if (!parse_set (ds, &cmd, NULL)) return CMD_FAILURE; if (cmd.sbc_cca) - ok = ok && do_cc (cmd.s_cca, 0); + do_cc (cmd.s_cca, FMT_CCA); if (cmd.sbc_ccb) - ok = ok && do_cc (cmd.s_ccb, 1); + do_cc (cmd.s_ccb, FMT_CCB); if (cmd.sbc_ccc) - ok = ok && do_cc (cmd.s_ccc, 2); + do_cc (cmd.s_ccc, FMT_CCC); if (cmd.sbc_ccd) - ok = ok && do_cc (cmd.s_ccd, 3); + do_cc (cmd.s_ccd, FMT_CCD); if (cmd.sbc_cce) - ok = ok && do_cc (cmd.s_cce, 4); + do_cc (cmd.s_cce, FMT_CCE); if (cmd.sbc_prompt) getl_set_prompt (GETL_PROMPT_FIRST, cmd.s_prompt); @@ -144,13 +153,19 @@ cmd_set (void) getl_set_prompt (GETL_PROMPT_DATA, cmd.s_dprompt); if (cmd.sbc_decimal) - set_decimal (cmd.dec == STC_DOT ? '.' : ','); + fmt_set_decimal (cmd.dec == STC_DOT ? '.' : ','); if (cmd.sbc_echo) set_echo (cmd.echo == STC_ON); if (cmd.sbc_endcmd) set_endcmd (cmd.s_endcmd[0]); if (cmd.sbc_errorbreak) set_errorbreak (cmd.errbrk == STC_ON); + if (cmd.sbc_errors) + { + bool both = cmd.errors == STC_BOTH || cmd.errors == STC_ON; + set_error_routing_to_terminal (cmd.errors == STC_TERMINAL || both); + set_error_routing_to_listing (cmd.errors == STC_LISTING || both); + } if (cmd.sbc_include) set_include (cmd.inc == STC_ON); if (cmd.sbc_mxerrs) @@ -165,6 +180,10 @@ cmd_set (void) set_scompression (cmd.scompress == STC_ON); if (cmd.sbc_undefined) set_undefined (cmd.undef == STC_WARN); + if (cmd.sbc_wib) + data_out_set_integer_format (stc_to_integer_format (cmd.wib)); + if (cmd.sbc_wrb) + data_out_set_float_format (stc_to_float_format (cmd.wrb)); if (cmd.sbc_workspace) set_workspace (cmd.n_workspace[0] * 1024L); @@ -196,17 +215,63 @@ cmd_set (void) return CMD_SUCCESS; } +/* Returns the integer_format value corresponding to STC, + which should be the value of cmd.rib or cmd.wib. */ +static enum integer_format +stc_to_integer_format (int stc) +{ + return (stc == STC_MSBFIRST ? INTEGER_MSB_FIRST + : stc == STC_LSBFIRST ? INTEGER_LSB_FIRST + : stc == STC_VAX ? INTEGER_VAX + : INTEGER_NATIVE); +} + +/* Returns the float_format value corresponding to STC, + which should be the value of cmd.rrb or cmd.wrb. */ +static enum float_format +stc_to_float_format (int stc) +{ + switch (stc) + { + case STC_NATIVE: + return FLOAT_NATIVE_DOUBLE; + + case STC_ISL: + return FLOAT_IEEE_SINGLE_LE; + case STC_ISB: + return FLOAT_IEEE_SINGLE_BE; + case STC_IDL: + return FLOAT_IEEE_DOUBLE_LE; + case STC_IDB: + return FLOAT_IEEE_DOUBLE_BE; + + case STC_VF: + return FLOAT_VAX_F; + case STC_VD: + return FLOAT_VAX_D; + case STC_VG: + return FLOAT_VAX_G; + + case STC_ZS: + return FLOAT_Z_SHORT; + case STC_ZL: + return FLOAT_Z_LONG; + } + + NOT_REACHED (); +} + /* 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 custom_currency *cc) +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 acts escapes a + 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++) @@ -233,23 +298,23 @@ find_cc_separators (const char *cc_string, struct custom_currency *cc) return true; } -/* Extracts a token from IN into TOKEn. Tokens are delimited by - GROUPING. The token is truncated to at most CC_WIDTH - characters (including null terminator). Returns the first - character following the token. */ +/* 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, char token[CC_WIDTH]) +extract_cc_token (const char *in, int grouping, struct substring *affix) { - char *out = token; - + 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 (out < &token[CC_WIDTH - 1]) - *out++ = *in; + if (ofs < FMT_STYLE_AFFIX_MAX) + ss_data (*affix)[ofs++] = *in; } - *out = '\0'; + affix->length = ofs; if (*in == grouping) in++; @@ -259,25 +324,26 @@ extract_cc_token (const char *in, int grouping, char token[CC_WIDTH]) /* Sets custom currency specifier CC having name CC_NAME ('A' through 'E') to correspond to the settings in CC_STRING. */ static bool -do_cc (const char *cc_string, int idx) +do_cc (const char *cc_string, enum fmt_type type) { - struct custom_currency cc; + struct fmt_number_style *cc = fmt_number_style_create (); /* Determine separators. */ - if (!find_cc_separators (cc_string, &cc)) + if (!find_cc_separators (cc_string, cc)) { - msg (SE, _("CC%c: Custom currency string `%s' does not contain " - "exactly three periods or commas (not both)."), - "ABCDE"[idx], cc_string); + fmt_number_style_destroy (cc); + msg (SE, _("%s: Custom currency string `%s' does not contain " + "exactly three periods or commas (or it contains both)."), + fmt_name (type), cc_string); 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); + 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); - set_cc (idx, &cc); + fmt_set_style (type, cc); return true; } @@ -286,7 +352,7 @@ do_cc (const char *cc_string, int idx) completely blank fields in numeric data imply. X, Wnd: Syntax is SYSMIS or a numeric value. */ static int -stc_custom_blanks (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_blanks (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { lex_match ('='); if ((token == T_ID && lex_id_match ("SYSMIS", tokid))) @@ -307,7 +373,7 @@ stc_custom_blanks (struct cmd_set *cmd UNUSED, void *aux UNUSED) /* Parses the EPOCH subcommand, which controls the epoch used for parsing 2-digit years. */ static int -stc_custom_epoch (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_epoch (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { lex_match ('='); if (lex_match_id ("AUTOMATIC")) @@ -333,7 +399,7 @@ stc_custom_epoch (struct cmd_set *cmd UNUSED, void *aux UNUSED) } static int -stc_custom_length (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_length (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { int page_length; @@ -360,7 +426,7 @@ stc_custom_length (struct cmd_set *cmd UNUSED, void *aux UNUSED) } static int -stc_custom_seed (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_seed (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { lex_match ('='); if (lex_match_id ("RANDOM")) @@ -377,7 +443,7 @@ stc_custom_seed (struct cmd_set *cmd UNUSED, void *aux UNUSED) } static int -stc_custom_width (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_width (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { lex_match ('='); if (lex_match_id ("NARROW")) @@ -403,18 +469,19 @@ stc_custom_width (struct cmd_set *cmd UNUSED, void *aux UNUSED) /* Parses FORMAT subcommand, which consists of a numeric format specifier. */ static int -stc_custom_format (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_format (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { struct fmt_spec fmt; lex_match ('='); - if (!parse_format_specifier (&fmt, 0)) + if (!parse_format_specifier (&fmt)) return 0; - if ((formats[fmt.type].cat & FCAT_STRING) != 0) + if (fmt_is_string (fmt.type)) { + char str[FMT_STRING_LEN_MAX + 1]; msg (SE, _("FORMAT requires numeric output format as an argument. " "Specified format %s is of type string."), - fmt_to_string (&fmt)); + fmt_to_string (&fmt, str)); return 0; } @@ -423,7 +490,7 @@ stc_custom_format (struct cmd_set *cmd UNUSED, void *aux UNUSED) } static int -stc_custom_journal (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_journal (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { lex_match ('='); if (!lex_match_id ("ON") && !lex_match_id ("OFF")) @@ -440,7 +507,7 @@ stc_custom_journal (struct cmd_set *cmd UNUSED, void *aux UNUSED) } static int -stc_custom_listing (struct cmd_set *cmd UNUSED, void *aux UNUSED) +stc_custom_listing (struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { bool listing; @@ -460,13 +527,13 @@ stc_custom_listing (struct cmd_set *cmd UNUSED, void *aux UNUSED) } static int -stc_custom_disk (struct cmd_set *cmd UNUSED, void *aux) +stc_custom_disk (struct dataset *ds, struct cmd_set *cmd UNUSED, void *aux) { - return stc_custom_listing (cmd, aux); + return stc_custom_listing (ds, cmd, aux); } static void -show_blanks (void) +show_blanks (const struct dataset *ds UNUSED) { if (get_blanks () == SYSMIS) msg (SN, _("BLANKS is SYSMIS.")); @@ -476,22 +543,25 @@ show_blanks (void) } static char * -format_cc (const char *in, char grouping, char *out) +format_cc (struct substring in, char grouping, char *out) { - while (*in != '\0') + while (!ss_is_empty (in)) { - if (*in == grouping || *in == '\'') + char c = ss_get_char (&in); + if (c == grouping || c == '\'') *out++ = '\''; - *out++ = *in++; + else if (c == '"') + *out++ = '"'; + *out++ = c; } return out; } static void -show_cc (int idx) +show_cc (enum fmt_type type) { - const struct custom_currency *cc = get_cc (idx); - char cc_string[CC_WIDTH * 4 * 2 + 3 + 1]; + const struct fmt_number_style *cc = fmt_get_style (type); + char cc_string[FMT_STYLE_AFFIX_MAX * 4 * 2 + 3 + 1]; char *out; out = format_cc (cc->neg_prefix, cc->grouping, cc_string); @@ -503,84 +573,156 @@ show_cc (int idx) out = format_cc (cc->neg_suffix, cc->grouping, out); *out = '\0'; - msg (SN, _("CC%c is \"%s\"."), "ABCDE"[idx], cc_string); + msg (SN, _("%s is \"%s\"."), fmt_name (type), cc_string); } - static void -show_cca (void) +show_cca (const struct dataset *ds UNUSED) { - show_cc (0); + show_cc (FMT_CCA); } static void -show_ccb (void) +show_ccb (const struct dataset *ds UNUSED) { - show_cc (1); + show_cc (FMT_CCB); } static void -show_ccc (void) +show_ccc (const struct dataset *ds UNUSED) { - show_cc (2); + show_cc (FMT_CCC); } static void -show_ccd (void) +show_ccd (const struct dataset *ds UNUSED) { - show_cc (3); + show_cc (FMT_CCD); } static void -show_cce (void) +show_cce (const struct dataset *ds UNUSED) { - show_cc (4); + show_cc (FMT_CCE); } static void -show_decimals (void) +show_decimals (const struct dataset *ds UNUSED) { - msg (SN, _("DECIMAL is \"%c\"."), get_decimal ()); + msg (SN, _("DECIMAL is \"%c\"."), fmt_decimal_char (FMT_F)); } static void -show_endcmd (void) +show_endcmd (const struct dataset *ds UNUSED) { msg (SN, _("ENDCMD is \"%c\"."), get_endcmd ()); } static void -show_format (void) +show_errors (const struct dataset *ds UNUSED) { - msg (SN, _("FORMAT is %s."), fmt_to_string (get_format ())); + bool terminal = get_error_routing_to_terminal (); + bool listing = get_error_routing_to_listing (); + msg (SN, _("ERRORS is \"%s\"."), + terminal && listing ? "BOTH" + : terminal ? "TERMINAL" + : listing ? "LISTING" + : "NONE"); } static void -show_length (void) +show_format (const struct dataset *ds UNUSED) +{ + char str[FMT_STRING_LEN_MAX + 1]; + msg (SN, _("FORMAT is %s."), fmt_to_string (get_format (), str)); +} + +static void +show_length (const struct dataset *ds UNUSED) { msg (SN, _("LENGTH is %d."), get_viewlength ()); } static void -show_mxerrs (void) +show_mxerrs (const struct dataset *ds UNUSED) { msg (SN, _("MXERRS is %d."), get_mxerrs ()); } static void -show_mxloops (void) +show_mxloops (const struct dataset *ds UNUSED) { msg (SN, _("MXLOOPS is %d."), get_mxloops ()); } static void -show_mxwarns (void) +show_mxwarns (const struct dataset *ds UNUSED) { msg (SN, _("MXWARNS is %d."), get_mxwarns ()); } +/* Outputs that SETTING has the given INTEGER_FORMAT value. */ static void -show_scompression (void) +show_integer_format (const char *setting, enum integer_format integer_format) +{ + msg (SN, _("%s is %s (%s)."), + setting, + (integer_format == INTEGER_MSB_FIRST ? "MSBFIRST" + : integer_format == INTEGER_LSB_FIRST ? "LSBFIRST" + : "VAX"), + integer_format == INTEGER_NATIVE ? "NATIVE" : "nonnative"); +} + +/* Outputs that SETTING has the given FLOAT_FORMAT value. */ +static void +show_float_format (const char *setting, enum float_format float_format) +{ + const char *format_name = ""; + + switch (float_format) + { + case FLOAT_IEEE_SINGLE_LE: + format_name = "ISL (32-bit IEEE 754 single, little-endian)"; + break; + case FLOAT_IEEE_SINGLE_BE: + format_name = "ISB (32-bit IEEE 754 single, big-endian)"; + break; + case FLOAT_IEEE_DOUBLE_LE: + format_name = "IDL (64-bit IEEE 754 double, little-endian)"; + break; + case FLOAT_IEEE_DOUBLE_BE: + format_name = "IDB (64-bit IEEE 754 double, big-endian)"; + break; + + case FLOAT_VAX_F: + format_name = "VF (32-bit VAX F, VAX-endian)"; + break; + case FLOAT_VAX_D: + format_name = "VD (64-bit VAX D, VAX-endian)"; + break; + case FLOAT_VAX_G: + format_name = "VG (64-bit VAX G, VAX-endian)"; + break; + + case FLOAT_Z_SHORT: + format_name = "ZS (32-bit IBM Z hexadecimal short, big-endian)"; + break; + case FLOAT_Z_LONG: + format_name = "ZL (64-bit IBM Z hexadecimal long, big-endian)"; + break; + + case FLOAT_FP: + case FLOAT_HEX: + NOT_REACHED (); + } + + msg (SN, _("%s is %s (%s)."), + setting, format_name, + float_format == FLOAT_NATIVE_DOUBLE ? "NATIVE" : "nonnative"); +} + +static void +show_scompression (const struct dataset *ds UNUSED) { if (get_scompression ()) msg (SN, _("SCOMPRESSION is ON.")); @@ -589,7 +731,7 @@ show_scompression (void) } static void -show_undefined (void) +show_undefined (const struct dataset *ds UNUSED) { if (get_undefined ()) msg (SN, _("UNDEFINED is WARN.")); @@ -598,9 +740,9 @@ show_undefined (void) } static void -show_weight (void) +show_weight (const struct dataset *ds) { - struct variable *var = dict_get_weight (default_dict); + struct variable *var = dict_get_weight (dataset_dict (ds)); if (var == NULL) msg (SN, _("WEIGHT is off.")); else @@ -608,7 +750,19 @@ show_weight (void) } static void -show_width (void) +show_wib (const struct dataset *ds UNUSED) +{ + show_integer_format ("WIB", data_out_get_integer_format ()); +} + +static void +show_wrb (const struct dataset *ds UNUSED) +{ + show_float_format ("WRB", data_out_get_float_format ()); +} + +static void +show_width (const struct dataset *ds UNUSED) { msg (SN, _("WIDTH is %d."), get_viewwidth ()); } @@ -616,10 +770,10 @@ show_width (void) struct show_sbc { const char *name; - void (*function) (void); + void (*function) (const struct dataset *); }; -struct show_sbc show_table[] = +const struct show_sbc show_table[] = { {"BLANKS", show_blanks}, {"CCA", show_cca}, @@ -629,6 +783,7 @@ struct show_sbc show_table[] = {"CCE", show_cce}, {"DECIMALS", show_decimals}, {"ENDCMD", show_endcmd}, + {"ERRORS", show_errors}, {"FORMAT", show_format}, {"LENGTH", show_length}, {"MXERRS", show_mxerrs}, @@ -637,16 +792,18 @@ struct show_sbc show_table[] = {"SCOMPRESSION", show_scompression}, {"UNDEFINED", show_undefined}, {"WEIGHT", show_weight}, + {"WIB", show_wib}, + {"WRB", show_wrb}, {"WIDTH", show_width}, }; static void -show_all (void) +show_all (const struct dataset *ds) { size_t i; for (i = 0; i < sizeof show_table / sizeof *show_table; i++) - show_table[i].function (); + show_table[i].function (ds); } static void @@ -659,36 +816,36 @@ show_all_cc (void) } static void -show_warranty (void) +show_warranty (const struct dataset *ds UNUSED) { msg (MN, lack_of_warranty); } static void -show_copying (void) +show_copying (const struct dataset *ds UNUSED) { msg (MN, copyleft); } int -cmd_show (void) +cmd_show (struct dataset *ds) { if (token == '.') { - show_all (); + show_all (ds); return CMD_SUCCESS; } do { if (lex_match (T_ALL)) - show_all (); + show_all (ds); else if (lex_match_id ("CC")) show_all_cc (); else if (lex_match_id ("WARRANTY")) - show_warranty (); + show_warranty (ds); else if (lex_match_id ("COPYING")) - show_copying (); + show_copying (ds); else if (token == T_ID) { int i; @@ -696,7 +853,7 @@ cmd_show (void) for (i = 0; i < sizeof show_table / sizeof *show_table; i++) if (lex_match_id (show_table[i].name)) { - show_table[i].function (); + show_table[i].function (ds); goto found; } lex_error (NULL);