X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=dcf7a327be79e2681bbfbe841affb0a02b370592;hb=0fefc291f125f7b621bfd53e230c07f86f3494dc;hp=8b892c7fb6bfdb092207a6950ca0fb7a01055c6d;hpb=92e42986429596633f71457a585b3266209822dd;p=pspp diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 8b892c7fb6..dcf7a327be 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -20,7 +20,11 @@ #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" @@ -34,6 +38,8 @@ #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" @@ -59,8 +65,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; @@ -68,29 +74,29 @@ int tgetnum (const char *); ccd=string; cce=string; compression=compress:on/off; - cpi=integer "x>0" "%s must be greater than 0"; + cpi=integer; decimal=dec:dot/comma; 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; printback=custom; @@ -99,16 +105,16 @@ int tgetnum (const char *); 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; tnumbers=custom; - tb1=string "x==3 || x==11" "3 or 11 characters long"; + 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. */ @@ -149,7 +155,12 @@ cmd_set (struct lexer *lexer, struct dataset *ds) 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) @@ -158,7 +169,12 @@ cmd_set (struct lexer *lexer, struct dataset *ds) 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.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) @@ -177,6 +193,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); } @@ -816,6 +834,58 @@ show_width (const struct dataset *ds UNUSED) return xasprintf ("%d", settings_get_viewwidth ()); } +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; @@ -831,6 +901,8 @@ const struct show_sbc show_table[] = {"CCD", show_ccd}, {"CCE", show_cce}, {"DECIMALS", show_decimals}, + {"DIRECTORY", show_current_directory}, + {"ENVIRONMENT", show_system}, {"ERRORS", show_errors}, {"FORMAT", show_format}, {"LENGTH", show_length}, @@ -839,12 +911,15 @@ const struct show_sbc show_table[] = {"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}, @@ -893,6 +968,7 @@ show_copying (const struct dataset *ds UNUSED) fputs (copyleft, stdout); } + int cmd_show (struct lexer *lexer, struct dataset *ds) { @@ -910,7 +986,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) {