projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve error messages for missing subcommands.
[pspp]
/
src
/
language
/
dictionary
/
numeric.c
diff --git
a/src/language/dictionary/numeric.c
b/src/language/dictionary/numeric.c
index 1a81e0e494ceb9300e468fc3520768d46212d8be..ae9f25325a48ce0cded05b7451aa691633372d63 100644
(file)
--- a/
src/language/dictionary/numeric.c
+++ b/
src/language/dictionary/numeric.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2010, 2011
, 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
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
@@
-45,8
+45,7
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
do
{
do
{
- /* Format spec for variables to create. f.type==-1 if default is to
- be used. */
+ /* Format spec for variables to create. */
struct fmt_spec f;
if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
struct fmt_spec f;
if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
@@
-59,25
+58,26
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
if (!parse_format_specifier (lexer, &f))
goto fail;
if (!parse_format_specifier (lexer, &f))
goto fail;
- if (
! fmt_check_output (&f))
+ if (! fmt_check_output (&f))
goto fail;
if (fmt_is_string (f.type))
{
char str[FMT_STRING_LEN_MAX + 1];
goto fail;
if (fmt_is_string (f.type))
{
char str[FMT_STRING_LEN_MAX + 1];
- msg (SE, _("Format type %s may not be used with a numeric "
- "variable."), fmt_to_string (&f, str));
+ lex_next_error (lexer, -1, -1,
+ _("Format type %s may not be used with a numeric "
+ "variable."), fmt_to_string (&f, str));
goto fail;
}
if (!lex_match (lexer, T_RPAREN))
{
goto fail;
}
if (!lex_match (lexer, T_RPAREN))
{
- lex_error_expecting (lexer, "`)'"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "`)'");
goto fail;
}
}
else
goto fail;
}
}
else
- f
.type = -1
;
+ f
= var_default_formats (0)
;
/* Create each variable. */
for (i = 0; i < nv; i++)
/* Create each variable. */
for (i = 0; i < nv; i++)
@@
-86,10
+86,7
@@
cmd_numeric (struct lexer *lexer, struct dataset *ds)
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
- {
- if (f.type != -1)
- var_set_both_formats (new_var, &f);
- }
+ var_set_both_formats (new_var, &f);
}
/* Clean up. */
}
/* Clean up. */
@@
-139,8
+136,9
@@
cmd_string (struct lexer *lexer, struct dataset *ds)
if (!fmt_is_string (f.type))
{
char str[FMT_STRING_LEN_MAX + 1];
if (!fmt_is_string (f.type))
{
char str[FMT_STRING_LEN_MAX + 1];
- msg (SE, _("Format type %s may not be used with a string "
- "variable."), fmt_to_string (&f, str));
+ lex_next_error (lexer, -2, -2,
+ _("Format type %s may not be used with a string "
+ "variable."), fmt_to_string (&f, str));
goto fail;
}
if (!fmt_check_output (&f))
goto fail;
}
if (!fmt_check_output (&f))