projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index 50a98e483efeed4ede0fa6336692b2e57e0394c3..cfa9ea66248a2ca0879d5c183f778f72cff2a657 100644
(file)
--- a/
src/language/stats/aggregate.c
+++ b/
src/language/stats/aggregate.c
@@
-175,11
+175,11
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
subcase_init_empty (&agr.sort);
/* OUTFILE subcommand must be first. */
subcase_init_empty (&agr.sort);
/* OUTFILE subcommand must be first. */
- lex_match (lexer,
'/'
);
+ lex_match (lexer,
T_SLASH
);
if (!lex_force_match_id (lexer, "OUTFILE"))
goto error;
if (!lex_force_match_id (lexer, "OUTFILE"))
goto error;
- lex_match (lexer,
'='
);
- if (!lex_match (lexer,
'*'
))
+ lex_match (lexer,
T_EQUALS
);
+ if (!lex_match (lexer,
T_ASTERISK
))
{
out_file = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
if (out_file == NULL)
{
out_file = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
if (out_file == NULL)
@@
-188,7
+188,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
if (out_file == NULL && lex_match_id (lexer, "MODE"))
{
if (out_file == NULL && lex_match_id (lexer, "MODE"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (lex_match_id (lexer, "ADDVARIABLES"))
{
agr.add_variables = true;
if (lex_match_id (lexer, "ADDVARIABLES"))
{
agr.add_variables = true;
@@
-215,11
+215,11
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
/* Read most of the subcommands. */
for (;;)
{
/* Read most of the subcommands. */
for (;;)
{
- lex_match (lexer,
'/'
);
+ lex_match (lexer,
T_SLASH
);
if (lex_match_id (lexer, "MISSING"))
{
if (lex_match_id (lexer, "MISSING"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!lex_match_id (lexer, "COLUMNWISE"))
{
lex_error (lexer, _("expecting %s"), "COLUMNWISE");
if (!lex_match_id (lexer, "COLUMNWISE"))
{
lex_error (lexer, _("expecting %s"), "COLUMNWISE");
@@
-235,7
+235,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
{
int i;
{
int i;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!parse_sort_criteria (lexer, dict, &agr.sort, &agr.break_vars,
&saw_direction))
goto error;
if (!parse_sort_criteria (lexer, dict, &agr.sort, &agr.break_vars,
&saw_direction))
goto error;
@@
-258,7
+258,7
@@
cmd_aggregate (struct lexer *lexer, struct dataset *ds)
"the same way as the input data."));
/* Read in the aggregate functions. */
"the same way as the input data."));
/* Read in the aggregate functions. */
- lex_match (lexer,
'/'
);
+ lex_match (lexer,
T_SLASH
);
if (!parse_aggregate_functions (lexer, dict, &agr))
goto error;
if (!parse_aggregate_functions (lexer, dict, &agr))
goto error;
@@
-412,7
+412,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
ds_init_empty (&function_name);
/* Parse the list of target variables. */
ds_init_empty (&function_name);
/* Parse the list of target variables. */
- while (!lex_match (lexer,
'='
))
+ while (!lex_match (lexer,
T_EQUALS
))
{
size_t n_dest_prev = n_dest;
{
size_t n_dest_prev = n_dest;
@@
-432,10
+432,10
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
- if (lex_
token (lexer) == T_STRING
)
+ if (lex_
is_string (lexer)
)
{
struct string label;
{
struct string label;
- ds_init_s
tring (&label, lex_tokstr
(lexer));
+ ds_init_s
ubstring (&label, lex_tokss
(lexer));
ds_truncate (&label, 255);
dest_label[n_dest - 1] = ds_xstrdup (&label);
ds_truncate (&label, 255);
dest_label[n_dest - 1] = ds_xstrdup (&label);
@@
-451,7
+451,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
goto error;
}
goto error;
}
- ds_assign_s
tring (&function_name, lex_tokstr
(lexer));
+ ds_assign_s
ubstring (&function_name, lex_tokss
(lexer));
exclude = ds_chomp (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
exclude = ds_chomp (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
@@
-468,11
+468,11
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
lex_get (lexer);
/* Check for leading lparen. */
lex_get (lexer);
/* Check for leading lparen. */
- if (!lex_match (lexer,
'('
))
+ if (!lex_match (lexer,
T_LPAREN
))
{
if (function->src_vars == AGR_SV_YES)
{
{
if (function->src_vars == AGR_SV_YES)
{
- lex_force_match (lexer,
'('
);
+ lex_force_match (lexer,
T_LPAREN
);
goto error;
}
}
goto error;
}
}
@@
-498,10
+498,10
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
{
int type;
{
int type;
- lex_match (lexer,
','
);
- if (lex_
token (lexer) == T_STRING
)
+ lex_match (lexer,
T_COMMA
);
+ if (lex_
is_string (lexer)
)
{
{
- arg[i].c =
ds_xstrdup (lex_tokstr
(lexer));
+ arg[i].c =
ss_xstrdup (lex_tokss
(lexer));
type = VAL_STRING;
}
else if (lex_is_number (lexer))
type = VAL_STRING;
}
else if (lex_is_number (lexer))
@@
-528,7
+528,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
}
/* Trailing rparen. */
}
/* Trailing rparen. */
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
goto error;
/* Now check that the number of source variables match
goto error;
/* Now check that the number of source variables match
@@
-670,9
+670,9
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
free (dest);
free (dest_label);
free (dest);
free (dest_label);
- if (!lex_match (lexer,
'/'
))
+ if (!lex_match (lexer,
T_SLASH
))
{
{
- if (lex_token (lexer) ==
'.'
)
+ if (lex_token (lexer) ==
T_ENDCMD
)
return true;
lex_error (lexer, "expecting end of command");
return true;
lex_error (lexer, "expecting end of command");