projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SET: Improve error messages for SET CCx.
[pspp]
/
src
/
language
/
data-io
/
save.c
diff --git
a/src/language/data-io/save.c
b/src/language/data-io/save.c
index d12593ffca59ad841412a8cf9db1a37125183cf8..bf78276b84af29b234cf1f543b27b2768b668d1d 100644
(file)
--- a/
src/language/data-io/save.c
+++ b/
src/language/data-io/save.c
@@
-99,8
+99,7
@@
struct output_trns
struct casewriter *writer; /* Writer. */
};
struct casewriter *writer; /* Writer. */
};
-static trns_proc_func output_trns_proc;
-static trns_free_func output_trns_free;
+static const struct trns_class output_trns_class;
static struct casewriter *parse_write_command (struct lexer *,
struct dataset *,
enum writer_type,
static struct casewriter *parse_write_command (struct lexer *,
struct dataset *,
enum writer_type,
@@
-140,7
+139,7
@@
parse_output_trns (struct lexer *lexer, struct dataset *ds, enum writer_type wri
return CMD_CASCADING_FAILURE;
}
return CMD_CASCADING_FAILURE;
}
- add_transformation (ds,
output_trns_proc, output_trns_free
, t);
+ add_transformation (ds,
&output_trns_class
, t);
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
@@
-199,7
+198,7
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
{
if (handle != NULL)
{
{
if (handle != NULL)
{
- lex_sbc_only_once ("OUTFILE");
+ lex_sbc_only_once (
lexer,
"OUTFILE");
goto error;
}
goto error;
}
@@
-213,7
+212,7
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
{
if (metadata != NULL)
{
{
if (metadata != NULL)
{
- lex_sbc_only_once ("METADATA");
+ lex_sbc_only_once (
lexer,
"METADATA");
goto error;
}
goto error;
}
@@
-238,8
+237,7
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
cw = true;
else
{
cw = true;
else
{
- lex_error_expecting (lexer, "READONLY", "WRITEABLE",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "READONLY", "WRITEABLE");
goto error;
}
sysfile_opts.create_writeable = porfile_opts.create_writeable = cw;
goto error;
}
sysfile_opts.create_writeable = porfile_opts.create_writeable = cw;
@@
-253,7
+251,7
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
*retain_unselected = false;
else
{
*retain_unselected = false;
else
{
- lex_error_expecting (lexer, "RETAIN", "DELETE"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "RETAIN", "DELETE");
goto error;
}
}
goto error;
}
}
@@
-270,7
+268,7
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
&& lex_match_id (lexer, "VERSION"))
{
lex_match (lexer, T_EQUALS);
&& lex_match_id (lexer, "VERSION"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int
(lexer
))
+ if (!lex_force_int
_range (lexer, "VERSION", 2, 3
))
goto error;
sysfile_opts.version = lex_integer (lexer);
lex_get (lexer);
goto error;
sysfile_opts.version = lex_integer (lexer);
lex_get (lexer);
@@
-284,19
+282,19
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
porfile_opts.type = PFM_TAPE;
else
{
porfile_opts.type = PFM_TAPE;
else
{
- lex_error_expecting (lexer, "COMM", "TAPE"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "COMM", "TAPE");
goto error;
}
}
else if (writer_type == PORFILE_WRITER && lex_match_id (lexer, "DIGITS"))
{
lex_match (lexer, T_EQUALS);
goto error;
}
}
else if (writer_type == PORFILE_WRITER && lex_match_id (lexer, "DIGITS"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int
(lexer
))
+ if (!lex_force_int
_range (lexer, "DIGITS", 1, INT_MAX
))
goto error;
porfile_opts.digits = lex_integer (lexer);
lex_get (lexer);
}
goto error;
porfile_opts.digits = lex_integer (lexer);
lex_get (lexer);
}
- else if (!parse_dict_trim (lexer, dict))
+ else if (!parse_dict_trim (lexer, dict
, false
))
goto error;
if (!lex_match (lexer, T_SLASH))
goto error;
if (!lex_match (lexer, T_SLASH))
@@
-365,7
+363,7
@@
parse_write_command (struct lexer *lexer, struct dataset *ds,
}
/* Writes case *C to the system file specified on XSAVE or XEXPORT. */
}
/* Writes case *C to the system file specified on XSAVE or XEXPORT. */
-static
in
t
+static
enum trns_resul
t
output_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
{
struct output_trns *t = trns_;
output_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
{
struct output_trns *t = trns_;
@@
-383,3
+381,9
@@
output_trns_free (void *trns_)
free (t);
return ok;
}
free (t);
return ok;
}
+
+static const struct trns_class output_trns_class = {
+ .name = "XSAVE/XEXPORT",
+ .execute = output_trns_proc,
+ .destroy = output_trns_free,
+};