projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render: Add comment.
[pspp]
/
src
/
language
/
utilities
/
set.q
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index 0be8c47010a7cf541501487456e3ba7eae686de8..301cc645e8583257e80a69d599902710c5ede594 100644
(file)
--- a/
src/language/utilities/set.q
+++ b/
src/language/utilities/set.q
@@
-137,7
+137,6
@@
cmd_set (struct lexer *lexer, struct dataset *ds)
if (!parse_set (lexer, ds, &cmd, NULL))
{
if (!parse_set (lexer, ds, &cmd, NULL))
{
- free_set (&cmd);
return CMD_FAILURE;
}
return CMD_FAILURE;
}
@@
-347,20
+346,14
@@
stc_custom_tnumbers (struct lexer *lexer,
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "VALUES"))
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "VALUES"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_VALUES);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_VALUE);
else if (lex_match_id (lexer, "LABELS"))
else if (lex_match_id (lexer, "LABELS"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_LABELS);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_LABEL);
else if (lex_match_id (lexer, "BOTH"))
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_BOTH);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_BOTH);
else
{
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH");
return 0;
}
return 0;
}
@@
-376,20
+369,14
@@
stc_custom_tvars (struct lexer *lexer,
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAMES"))
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAMES"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_NAMES);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_VALUE);
else if (lex_match_id (lexer, "LABELS"))
else if (lex_match_id (lexer, "LABELS"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_LABELS);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_LABEL);
else if (lex_match_id (lexer, "BOTH"))
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_BOTH);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_BOTH);
else
{
else
{
- lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH");
return 0;
}
return 0;
}
@@
-568,7
+555,7
@@
stc_custom_format (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_se
if (!fmt_check_output (&fmt))
return 0;
if (!fmt_check_output (&fmt))
return 0;
-
+
if (fmt_is_string (fmt.type))
{
char str[FMT_STRING_LEN_MAX + 1];
if (fmt_is_string (fmt.type))
{
char str[FMT_STRING_LEN_MAX + 1];
@@
-907,7
+894,7
@@
show_current_directory (const struct dataset *ds UNUSED)
{
len <<= 1;
buf = xrealloc (buf, len);
{
len <<= 1;
buf = xrealloc (buf, len);
- }
+ }
while (NULL == (wd = getcwd (buf, len)));
return wd;
while (NULL == (wd = getcwd (buf, len)));
return wd;
@@
-922,7
+909,7
@@
show_tempdir (const struct dataset *ds UNUSED)
static char *
show_version (const struct dataset *ds UNUSED)
{
static char *
show_version (const struct dataset *ds UNUSED)
{
- return strdup (version);
+ return strdup (
announced_
version);
}
static char *
}
static char *