X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fset.q;h=243de30063c8b12332009d185ed02274c0a5bb06;hb=8d1e072157ee3c8273e328c491be3c8bf57452da;hp=38a6589b8e4c10aa23d4ccd6825c914b9f58097b;hpb=14decddbe997e8059910e02d28c5cccd747240fc;p=pspp diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 38a6589b8e..243de30063 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -22,6 +22,9 @@ #include #include +#include "gl/vasnprintf.h" + +#include "data/casereader.h" #include "data/data-in.h" #include "data/data-out.h" #include "data/dataset.h" @@ -105,6 +108,7 @@ int tgetnum (const char *); scripttab=string; seed=custom; tnumbers=custom; + tvars=custom; tb1=string; tbfonts=string; undefined=undef:warn/nowarn; @@ -354,6 +358,35 @@ stc_custom_tnumbers (struct lexer *lexer, } +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 @@ -866,6 +899,23 @@ 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; @@ -891,6 +941,7 @@ 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},