X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=50ddd9443ed8dc92d956068e8d3d3f07b2e09fc1;hb=14f4522a17db23e67a6fa17876633cc6260cb42b;hp=9a2e981a910d1d3930a41b4de03d8bf6ca3bb8c4;hpb=01b970b8972e4e457b1d8e3f5af350c325152942;p=pspp diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 9a2e981a91..50ddd9443e 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013, 2014 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,32 +16,38 @@ #include +#include #include #include #include #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include "gl/vasnprintf.h" + +#include "data/casereader.h" +#include "data/data-in.h" +#include "data/data-out.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/settings.h" +#include "data/value.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/copyleft.h" +#include "libpspp/temp-file.h" +#include "libpspp/version.h" +#include "libpspp/float-format.h" +#include "libpspp/i18n.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "math/random.h" +#include "output/driver.h" +#include "output/journal.h" #if HAVE_LIBTERMCAP #if HAVE_TERMCAP_H @@ -60,8 +66,8 @@ int tgetnum (const char *); /* (specification) "SET" (stc_): blanks=custom; - block=string "x==1" "one character long"; - boxstring=string "x==3 || x==11" "3 or 11 characters long"; + block=string; + boxstring=string; case=size:upper/uplow; cca=string; ccb=string; @@ -69,51 +75,48 @@ int tgetnum (const char *); ccd=string; cce=string; compression=compress:on/off; - cpi=integer "x>0" "%s must be greater than 0"; - cprompt=string; + cpi=integer; decimal=dec:dot/comma; - dprompt=string; - endcmd=string "x==1" "one character long"; epoch=custom; errors=custom; format=custom; headers=headers:no/yes/blank; highres=hires:on/off; - histogram=string "x==1" "one character long"; + histogram=string; include=inc:on/off; journal=custom; log=custom; length=custom; locale=custom; lowres=lores:auto/on/off; - lpi=integer "x>0" "%s must be greater than 0"; + lpi=integer; menus=menus:standard/extended; messages=custom; mexpand=mexp:on/off; - miterate=integer "x>0" "%s must be greater than 0"; - mnest=integer "x>0" "%s must be greater than 0"; + miterate=integer; + mnest=integer; mprint=mprint:on/off; - mxerrs=integer "x >= 1" "%s must be at least 1"; - mxloops=integer "x >=1" "%s must be at least 1"; + mxerrs=integer; + mxloops=integer; mxmemory=integer; mxwarns=integer; - nulline=null:on/off; printback=custom; - prompt=string; results=custom; rib=rib:msbfirst/lsbfirst/vax/native; rrb=rrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl; safer=safe:on; scompression=scompress:on/off; - scripttab=string "x==1" "one character long"; + scripttab=string; seed=custom; - tb1=string "x==3 || x==11" "3 or 11 characters long"; + tnumbers=custom; + tvars=custom; + tb1=string; 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>0" "%s must be positive"; + workspace=integer; xsort=xsort:yes/no. */ @@ -148,26 +151,32 @@ cmd_set (struct lexer *lexer, struct dataset *ds) if (cmd.sbc_cce) settings_set_cc ( cmd.s_cce, FMT_CCE); - if (cmd.sbc_prompt) - prompt_set (PROMPT_FIRST, cmd.s_prompt); - if (cmd.sbc_cprompt) - prompt_set (PROMPT_LATER, cmd.s_cprompt); - if (cmd.sbc_dprompt) - prompt_set (PROMPT_DATA, cmd.s_dprompt); - if (cmd.sbc_decimal) settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ','); - if (cmd.sbc_endcmd) - settings_set_endcmd (cmd.s_endcmd[0]); if (cmd.sbc_include) settings_set_include (cmd.inc == STC_ON); if (cmd.sbc_mxerrs) - settings_set_max_messages (MSG_S_ERROR, cmd.n_mxerrs[0]); + { + if (cmd.n_mxerrs[0] >= 1) + settings_set_max_messages (MSG_S_ERROR, cmd.n_mxerrs[0]); + else + msg (SE, _("%s must be at least 1."), "MXERRS"); + } + if (cmd.sbc_mxloops) + { + if (cmd.n_mxloops[0] >= 1) + settings_set_mxloops (cmd.n_mxloops[0]); + else + msg (SE, _("%s must be at least 1."), "MXLOOPS"); + } if (cmd.sbc_mxwarns) - settings_set_max_messages (MSG_S_WARNING, cmd.n_mxwarns[0]); - if (cmd.sbc_nulline) - settings_set_nulline (cmd.null == STC_ON); + { + if (cmd.n_mxwarns[0] >= 0) + settings_set_max_messages (MSG_S_WARNING, cmd.n_mxwarns[0]); + else + msg (SE, _("%s must not be negative."), "MXWARNS"); + } if (cmd.sbc_rib) settings_set_input_integer_format (stc_to_integer_format (cmd.rib)); if (cmd.sbc_rrb) @@ -186,6 +195,8 @@ cmd_set (struct lexer *lexer, struct dataset *ds) { if ( cmd.n_workspace[0] < 1024 && ! settings_get_testing_mode ()) msg (SE, _("WORKSPACE must be at least 1MB")); + else if (cmd.n_workspace[0] <= 0) + msg (SE, _("WORKSPACE must be positive")); else settings_set_workspace (cmd.n_workspace[0] * 1024L); } @@ -194,8 +205,12 @@ cmd_set (struct lexer *lexer, struct dataset *ds) msg (SW, _("%s is obsolete."), "BLOCK"); if (cmd.sbc_boxstring) msg (SW, _("%s is obsolete."), "BOXSTRING"); + if (cmd.sbc_cpi) + msg (SW, _("%s is obsolete."), "CPI"); if (cmd.sbc_histogram) msg (SW, _("%s is obsolete."), "HISTOGRAM"); + if (cmd.sbc_lpi) + msg (SW, _("%s is obsolete."), "LPI"); if (cmd.sbc_menus) msg (SW, _("%s is obsolete."), "MENUS"); if (cmd.sbc_xsort) @@ -271,7 +286,7 @@ set_output_routing (struct lexer *lexer, enum settings_output_type type) { enum settings_output_devices devices; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "ON") || lex_match_id (lexer, "BOTH")) devices = SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL; else if (lex_match_id (lexer, "TERMINAL")) @@ -299,7 +314,7 @@ stc_custom_blanks (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "SYSMIS")) { lex_get (lexer); @@ -315,6 +330,64 @@ stc_custom_blanks (struct lexer *lexer, return 1; } +static int +stc_custom_tnumbers (struct lexer *lexer, + struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + lex_match (lexer, T_EQUALS); + + if (lex_match_id (lexer, "VALUES")) + { + settings_set_value_style (SETTINGS_VAL_STYLE_VALUES); + } + else if (lex_match_id (lexer, "LABELS")) + { + settings_set_value_style (SETTINGS_VAL_STYLE_LABELS); + } + else if (lex_match_id (lexer, "BOTH")) + { + settings_set_value_style (SETTINGS_VAL_STYLE_BOTH); + } + else + { + lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH", NULL_SENTINEL); + return 0; + } + + return 1; +} + + +static int +stc_custom_tvars (struct lexer *lexer, + struct dataset *ds UNUSED, + struct cmd_set *cmd UNUSED, void *aux UNUSED) +{ + lex_match (lexer, T_EQUALS); + + if (lex_match_id (lexer, "NAMES")) + { + settings_set_var_style (SETTINGS_VAR_STYLE_NAMES); + } + else if (lex_match_id (lexer, "LABELS")) + { + settings_set_var_style (SETTINGS_VAR_STYLE_LABELS); + } + else if (lex_match_id (lexer, "BOTH")) + { + settings_set_var_style (SETTINGS_VAR_STYLE_BOTH); + } + else + { + lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH", NULL_SENTINEL); + return 0; + } + + return 1; +} + + /* Parses the EPOCH subcommand, which controls the epoch used for parsing 2-digit years. */ static int @@ -322,7 +395,7 @@ stc_custom_epoch (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "AUTOMATIC")) settings_set_epoch (-1); else if (lex_is_integer (lexer)) @@ -357,7 +430,7 @@ stc_custom_length (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se { int page_length; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NONE")) page_length = -1; else @@ -383,27 +456,26 @@ static int stc_custom_locale (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - const struct string *s; + const char *s; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if ( !lex_force_string (lexer)) return 0; - s = lex_tokstr (lexer); + s = lex_tokcstr (lexer); /* First try this string as an encoding name */ - if ( valid_encoding (ds_cstr (s))) - set_default_encoding (ds_cstr (s)); + if ( valid_encoding (s)) + set_default_encoding (s); /* Now try as a locale name (or alias) */ - else if (set_encoding_from_locale (ds_cstr (s))) + else if (set_encoding_from_locale (s)) { } else { - msg (ME, _("%s is not a recognized encoding or locale name"), - ds_cstr (s)); + msg (ME, _("%s is not a recognized encoding or locale name"), s); return 0; } @@ -436,7 +508,7 @@ stc_custom_results (struct lexer *lexer, struct dataset *ds UNUSED, static int stc_custom_seed (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "RANDOM")) set_rng (time (0)); else @@ -453,7 +525,7 @@ stc_custom_seed (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set static int stc_custom_width (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NARROW")) settings_set_viewwidth (79); else if (lex_match_id (lexer, "WIDE")) @@ -481,7 +553,7 @@ stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se { struct fmt_spec fmt; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!parse_format_specifier (lexer, &fmt)) return 0; @@ -504,14 +576,17 @@ stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se static int stc_custom_journal (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_set *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "ON") || lex_match_id (lexer, "YES")) journal_enable (); else if (lex_match_id (lexer, "OFF") || lex_match_id (lexer, "NO")) journal_disable (); else if (lex_is_string (lexer) || lex_token (lexer) == T_ID) { - journal_set_file_name (ds_cstr (lex_tokstr (lexer))); + char *filename = utf8_to_filename (lex_tokcstr (lexer)); + journal_set_file_name (filename); + free (filename); + lex_get (lexer); } else @@ -550,20 +625,20 @@ 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 -format_cc (struct string *out, struct substring in, char grouping) +format_cc (struct string *out, const char *in, char grouping) { - while (!ss_is_empty (in)) + while (*in != '\0') { - char c = ss_get_char (&in); + char c = *in++; if (c == grouping || c == '\'') - ds_put_char (out, '\''); + ds_put_byte (out, '\''); else if (c == '"') - ds_put_char (out, '"'); - ds_put_char (out, c); + ds_put_byte (out, '"'); + ds_put_byte (out, c); } } @@ -574,13 +649,13 @@ show_cc (enum fmt_type type) struct string out; ds_init_empty (&out); - format_cc (&out, cc->neg_prefix, cc->grouping); - ds_put_char (&out, cc->grouping); - format_cc (&out, cc->prefix, cc->grouping); - ds_put_char (&out, cc->grouping); - format_cc (&out, cc->suffix, cc->grouping); - ds_put_char (&out, cc->grouping); - format_cc (&out, cc->neg_suffix, cc->grouping); + format_cc (&out, cc->neg_prefix.s, cc->grouping); + ds_put_byte (&out, cc->grouping); + format_cc (&out, cc->prefix.s, cc->grouping); + ds_put_byte (&out, cc->grouping); + format_cc (&out, cc->suffix.s, cc->grouping); + ds_put_byte (&out, cc->grouping); + format_cc (&out, cc->neg_suffix.s, cc->grouping); return ds_cstr (&out); } @@ -621,12 +696,6 @@ show_decimals (const struct dataset *ds UNUSED) return xasprintf ("`%c'", settings_get_decimal_char (FMT_F)); } -static char * -show_endcmd (const struct dataset *ds UNUSED) -{ - return xasprintf ("`%c'", settings_get_endcmd ()); -} - static char * show_errors (const struct dataset *ds UNUSED) { @@ -640,6 +709,14 @@ show_format (const struct dataset *ds UNUSED) return xstrdup (fmt_to_string (settings_get_format (), str)); } +static char * +show_journal (const struct dataset *ds UNUSED) +{ + return (journal_is_enabled () + ? xasprintf ("\"%s\"", journal_get_file_name ()) + : xstrdup ("disabled")); +} + static char * show_length (const struct dataset *ds UNUSED) { @@ -796,6 +873,65 @@ show_width (const struct dataset *ds UNUSED) return xasprintf ("%d", settings_get_viewwidth ()); } +static char * +show_workspace (const struct dataset *ds UNUSED) +{ + size_t ws = settings_get_workspace () / 1024L; + return xasprintf ("%zu", ws); +} + +static char * +show_current_directory (const struct dataset *ds UNUSED) +{ + char *buf = NULL; + char *wd = NULL; + size_t len = 256; + + do + { + len <<= 1; + buf = xrealloc (buf, len); + } + while (NULL == (wd = getcwd (buf, len))); + + return wd; +} + +static char * +show_tempdir (const struct dataset *ds UNUSED) +{ + return strdup (temp_dir_name ()); +} + +static char * +show_version (const struct dataset *ds UNUSED) +{ + return strdup (version); +} + +static char * +show_system (const struct dataset *ds UNUSED) +{ + return strdup (host_system); +} + +static char * +show_n (const struct dataset *ds) +{ + casenumber n; + size_t l; + + const struct casereader *reader = dataset_source (ds); + + if (reader == NULL) + return strdup (_("Unknown")); + + n = casereader_count_cases (reader); + + return asnprintf (NULL, &l, "%ld", n); +} + + struct show_sbc { const char *name; @@ -811,25 +947,31 @@ const struct show_sbc show_table[] = {"CCD", show_ccd}, {"CCE", show_cce}, {"DECIMALS", show_decimals}, - {"ENDCMD", show_endcmd}, + {"DIRECTORY", show_current_directory}, + {"ENVIRONMENT", show_system}, {"ERRORS", show_errors}, {"FORMAT", show_format}, + {"JOURNAL", show_journal}, {"LENGTH", show_length}, {"LOCALE", show_locale}, {"MESSAGES", show_messages}, {"MXERRS", show_mxerrs}, {"MXLOOPS", show_mxloops}, {"MXWARNS", show_mxwarns}, + {"N", show_n}, {"PRINTBACk", show_printback}, {"RESULTS", show_results}, {"RIB", show_rib}, {"RRB", show_rrb}, {"SCOMPRESSION", show_scompression}, + {"TEMPDIR", show_tempdir}, {"UNDEFINED", show_undefined}, + {"VERSION", show_version}, {"WEIGHT", show_weight}, {"WIB", show_wib}, {"WRB", show_wrb}, {"WIDTH", show_width}, + {"WORKSPACE", show_workspace}, }; static void @@ -874,10 +1016,11 @@ show_copying (const struct dataset *ds UNUSED) fputs (copyleft, stdout); } + int cmd_show (struct lexer *lexer, struct dataset *ds) { - if (lex_token (lexer) == '.') + if (lex_token (lexer) == T_ENDCMD) { show_all (ds); return CMD_SUCCESS; @@ -891,7 +1034,7 @@ cmd_show (struct lexer *lexer, struct dataset *ds) show_all_cc (ds); else if (lex_match_id (lexer, "WARRANTY")) show_warranty (ds); - else if (lex_match_id (lexer, "COPYING")) + else if (lex_match_id (lexer, "COPYING") || lex_match_id (lexer, "LICENSE")) show_copying (ds); else if (lex_token (lexer) == T_ID) { @@ -917,9 +1060,9 @@ cmd_show (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); return CMD_SUCCESS; } @@ -930,12 +1073,12 @@ static struct settings *saved_settings[MAX_SAVED_SETTINGS]; static int n_saved_settings; int -cmd_preserve (struct lexer *lexer, struct dataset *ds UNUSED) +cmd_preserve (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) { if (n_saved_settings < MAX_SAVED_SETTINGS) { saved_settings[n_saved_settings++] = settings_get (); - return lex_end_of_command (lexer); + return CMD_SUCCESS; } else { @@ -947,14 +1090,14 @@ cmd_preserve (struct lexer *lexer, struct dataset *ds UNUSED) } int -cmd_restore (struct lexer *lexer, struct dataset *ds UNUSED) +cmd_restore (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) { if (n_saved_settings > 0) { struct settings *s = saved_settings[--n_saved_settings]; settings_set (s); settings_destroy (s); - return lex_end_of_command (lexer); + return CMD_SUCCESS; } else {