projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
totals can go first as well as last
[pspp]
/
src
/
language
/
data-io
/
data-list.c
diff --git
a/src/language/data-io/data-list.c
b/src/language/data-io/data-list.c
index 0b98f40a07e2a2e08d6e54ce0a944473f68c1738..1ade0dc617c566c885001a21634ea37d55df438b 100644
(file)
--- a/
src/language/data-io/data-list.c
+++ b/
src/language/data-io/data-list.c
@@
-67,8
+67,7
@@
static bool parse_fixed (struct lexer *, struct dictionary *,
static bool parse_free (struct lexer *, struct dictionary *,
struct pool *, struct data_parser *);
static bool parse_free (struct lexer *, struct dictionary *,
struct pool *, struct data_parser *);
-static trns_free_func data_list_trns_free;
-static trns_proc_func data_list_trns_proc;
+static const struct trns_class data_list_trns_class;
int
cmd_data_list (struct lexer *lexer, struct dataset *ds)
int
cmd_data_list (struct lexer *lexer, struct dataset *ds)
@@
-118,33
+117,25
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
}
else if (lex_match_id (lexer, "RECORDS"))
{
}
else if (lex_match_id (lexer, "RECORDS"))
{
+ if (data_parser_get_records (parser) > 0)
+ {
+ lex_sbc_only_once ("RECORDS");
+ goto error;
+ }
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
- if (!lex_force_int
(lexer
))
+ if (!lex_force_int
_range (lexer, "RECORDS", 0, INT_MAX
))
goto error;
goto error;
-
- int records = lex_integer (lexer);
- if (records < 0)
- {
- msg (SE, _("The %s value must be nonnegative."), "RECORDS");
- goto error;
- }
- data_parser_set_records (parser, records);
+ data_parser_set_records (parser, lex_integer (lexer));
lex_get (lexer);
lex_match (lexer, T_RPAREN);
}
else if (lex_match_id (lexer, "SKIP"))
{
lex_match (lexer, T_EQUALS);
lex_get (lexer);
lex_match (lexer, T_RPAREN);
}
else if (lex_match_id (lexer, "SKIP"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int
(lexer
))
+ if (!lex_force_int
_range (lexer, "SKIP", 0, INT_MAX
))
goto error;
goto error;
- int skip = lex_integer (lexer);
- if (skip < 0)
- {
- msg (SE, _("The %s value must be nonnegative."), "SKIP");
- goto error;
- }
- data_parser_set_skip (parser, skip);
+ data_parser_set_skip (parser, lex_integer (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "END"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "END"))
@@
-156,7
+147,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
}
if (end)
{
}
if (end)
{
-
msg (SE, _("The %s subcommand may only be specified once."),
"END");
+
lex_sbc_only_once (
"END");
goto error;
}
goto error;
}
@@
-242,7
+233,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
data_parser_set_quotes (parser, ss_cstr ("'\""));
data_parser_set_soft_delimiters (parser,
ss_cstr (CC_SPACES));
data_parser_set_quotes (parser, ss_cstr ("'\""));
data_parser_set_soft_delimiters (parser,
ss_cstr (CC_SPACES));
- const char decimal = settings_get_
decimal_char (FMT_F)
;
+ const char decimal = settings_get_
fmt_settings ()->decimal
;
data_parser_set_hard_delimiters (parser,
ss_buffer (",", (decimal == '.') ? 1 : 0));
}
data_parser_set_hard_delimiters (parser,
ss_buffer (",", (decimal == '.') ? 1 : 0));
}
@@
-303,7
+294,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
trns->parser = parser;
trns->reader = reader;
trns->end = end;
trns->parser = parser;
trns->reader = reader;
trns->end = end;
- add_transformation (ds,
data_list_trns_proc, data_list_trns_free
, trns);
+ add_transformation (ds,
&data_list_trns_class
, trns);
}
else
data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL);
}
else
data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL);
@@
-311,12
+302,14
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
fh_unref (fh);
free (encoding);
fh_unref (fh);
free (encoding);
- return CMD_DATA_LIST;
+ data_list_seen ();
+
+ return CMD_SUCCESS;
error:
data_parser_destroy (parser);
if (!in_input_program ())
error:
data_parser_destroy (parser);
if (!in_input_program ())
- dict_
destroy
(dict);
+ dict_
unref
(dict);
fh_unref (fh);
free (encoding);
return CMD_CASCADING_FAILURE;
fh_unref (fh);
free (encoding);
return CMD_CASCADING_FAILURE;
@@
-339,21
+332,21
@@
parse_fixed (struct lexer *lexer, struct dictionary *dict,
while (lex_token (lexer) != T_ENDCMD)
{
char **names;
while (lex_token (lexer) != T_ENDCMD)
{
char **names;
- size_t n
ame_cnt
, name_idx;
+ size_t n
_names
, name_idx;
struct fmt_spec *formats, *f;
struct fmt_spec *formats, *f;
- size_t
format_cnt
;
+ size_t
n_formats
;
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
|| !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
|| !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
- &names, &n
ame_cnt
, PV_NONE)
- || !parse_var_placements (lexer, tmp_pool, n
ame_cnt
, FMT_FOR_INPUT,
- &formats, &
format_cnt
))
+ &names, &n
_names
, PV_NONE)
+ || !parse_var_placements (lexer, tmp_pool, n
_names
, FMT_FOR_INPUT,
+ &formats, &
n_formats
))
return false;
/* Create variables and var specs. */
name_idx = 0;
return false;
/* Create variables and var specs. */
name_idx = 0;
- for (f = formats; f < &formats[
format_cnt
]; f++)
+ for (f = formats; f < &formats[
n_formats
]; f++)
if (!execute_placement_format (f, &record, &column))
{
char *name;
if (!execute_placement_format (f, &record, &column))
{
char *name;
@@
-368,7
+361,8
@@
parse_fixed (struct lexer *lexer, struct dictionary *dict,
if (v != NULL)
{
/* Success. */
if (v != NULL)
{
/* Success. */
- struct fmt_spec output = fmt_for_output_from_input (f);
+ struct fmt_spec output = fmt_for_output_from_input (
+ f, settings_get_fmt_settings ());
var_set_both_formats (v, &output);
}
else
var_set_both_formats (v, &output);
}
else
@@
-414,7
+408,7
@@
parse_fixed (struct lexer *lexer, struct dictionary *dict,
column += f->w;
}
column += f->w;
}
- assert (name_idx == n
ame_cnt
);
+ assert (name_idx == n
_names
);
}
return true;
}
return true;
@@
-434,11
+428,11
@@
parse_free (struct lexer *lexer, struct dictionary *dict,
{
struct fmt_spec input, output;
char **name;
{
struct fmt_spec input, output;
char **name;
- size_t n
ame_cnt
;
+ size_t n
_names
;
size_t i;
if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
size_t i;
if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
- &name, &n
ame_cnt
, PV_NONE))
+ &name, &n
_names
, PV_NONE))
return false;
if (lex_match (lexer, T_LPAREN))
return false;
if (lex_match (lexer, T_LPAREN))
@@
-472,7
+466,8
@@
parse_free (struct lexer *lexer, struct dictionary *dict,
if (input.type == FMT_N)
input.type = FMT_F;
if (input.type == FMT_N)
input.type = FMT_F;
- output = fmt_for_output_from_input (&input);
+ output = fmt_for_output_from_input (&input,
+ settings_get_fmt_settings ());
}
else
{
}
else
{
@@
-481,7
+476,7
@@
parse_free (struct lexer *lexer, struct dictionary *dict,
output = *settings_get_format ();
}
output = *settings_get_format ();
}
- for (i = 0; i < n
ame_cnt
; i++)
+ for (i = 0; i < n
_names
; i++)
{
struct variable *v;
{
struct variable *v;
@@
-517,11
+512,11
@@
data_list_trns_free (void *trns_)
}
/* Handle DATA LIST transformation TRNS, parsing data into *C. */
}
/* Handle DATA LIST transformation TRNS, parsing data into *C. */
-static
in
t
+static
enum trns_resul
t
data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
{
struct data_list_trns *trns = trns_;
data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
{
struct data_list_trns *trns = trns_;
-
in
t retval;
+
enum trns_resul
t retval;
*c = case_unshare (*c);
if (data_parser_parse (trns->parser, trns->reader, *c))
*c = case_unshare (*c);
if (data_parser_parse (trns->parser, trns->reader, *c))
@@
-538,7
+533,7
@@
data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
/* If there was an END subcommand handle it. */
if (trns->end != NULL)
{
/* If there was an END subcommand handle it. */
if (trns->end != NULL)
{
- double *end =
&case_data_rw (*c, trns->end)->f
;
+ double *end =
case_num_rw (*c, trns->end)
;
if (retval == TRNS_END_FILE)
{
*end = 1.0;
if (retval == TRNS_END_FILE)
{
*end = 1.0;
@@
-550,4
+545,9
@@
data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
return retval;
}
return retval;
}
-
\f
+
+static const struct trns_class data_list_trns_class = {
+ .name = "DATA LIST",
+ .execute = data_list_trns_proc,
+ .destroy = data_list_trns_free,
+};