for (g = 0 ; g < n_group_vars ; ++g )
{
if ( g > 0 ) ds_put_cstr (&group_var_str, " ");
for (g = 0 ; g < n_group_vars ; ++g )
{
if ( g > 0 ) ds_put_cstr (&group_var_str, " ");
}
ds_put_format (&label, _("%s of %s by %s"), function_name[f],
}
ds_put_format (&label, _("%s of %s by %s"), function_name[f],
- ds_put_format (&label,_("%s of %s"), function_name[f], src_var->name);
+ ds_put_format (&label, _("%s of %s"),
+ function_name[f], var_get_name (src_var));
criteria.crits[i].dir = SRT_ASCEND;
}
for (i = 0; i < n_group_vars; i++)
{
criteria.crits[i + n_splits].fv = group_vars[i]->fv;
criteria.crits[i].dir = SRT_ASCEND;
}
for (i = 0; i < n_group_vars; i++)
{
criteria.crits[i + n_splits].fv = group_vars[i]->fv;
out = rank_sorted_casefile (sorted_cf, &criteria,
dataset_dict (ds),
rank_specs, n_rank_specs,
out = rank_sorted_casefile (sorted_cf, &criteria,
dataset_dict (ds),
rank_specs, n_rank_specs,
const struct missing_values *mv)
{
struct casefile *dest = fastfile_create (casefile_get_value_cnt (cf));
const struct missing_values *mv)
{
struct casefile *dest = fastfile_create (casefile_get_value_cnt (cf));
- snprintf(name, SHORT_NAME_LEN + 1, "%c%s",
- function_name[f][0], src_var->name);
+ snprintf (name, SHORT_NAME_LEN + 1, "%c%s",
+ function_name[f][0], var_get_name (src_var));
if ( g < n_group_vars - 1)
ds_put_cstr (&varlist, " ");
if ( g < n_group_vars - 1)
ds_put_cstr (&varlist, " ");
rank_specs[i].rfunc == PROPORTION )
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s using %s BY %s)"),
rank_specs[i].rfunc == PROPORTION )
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s using %s BY %s)"),
- src_vars[v]->name,
- rank_specs[i].destvars[v]->name,
+ var_get_name (src_vars[v]),
+ var_get_name (rank_specs[i].destvars[v]),
else
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s BY %s)"),
else
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s BY %s)"),
- src_vars[v]->name,
- rank_specs[i].destvars[v]->name,
+ var_get_name (src_vars[v]),
+ var_get_name (rank_specs[i].destvars[v]),
rank_specs[i].rfunc == PROPORTION )
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s using %s)"),
rank_specs[i].rfunc == PROPORTION )
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s using %s)"),
- src_vars[v]->name,
- rank_specs[i].destvars[v]->name,
+ var_get_name (src_vars[v]),
+ var_get_name (rank_specs[i].destvars[v]),
fraction_name()
);
else
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s)"),
fraction_name()
);
else
tab_output_text (TAT_PRINTF,
_("%s into %s(%s of %s)"),
- src_vars[v]->name,
- rank_specs[i].destvars[v]->name,
+ var_get_name (src_vars[v]),
+ var_get_name (rank_specs[i].destvars[v]),
-rank_custom_variables (struct dataset *ds, struct cmd_rank *cmd UNUSED, void *aux UNUSED)
+rank_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd UNUSED, void *aux UNUSED)
- if ((token != T_ID || dict_lookup_var (dataset_dict (ds), tokid) == NULL)
- && token != T_ALL)
+ if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)
+ && lex_token (lexer) != T_ALL)
&src_vars, &n_src_vars, 0, terminators);
&src_vars, &n_src_vars, 0, terminators);
- if (!parse_variables (dataset_dict (ds), &group_vars, &n_group_vars,
+ if (!parse_variables (lexer, dataset_dict (ds),
+ &group_vars, &n_group_vars,
-parse_rank_function(struct dictionary *dict, struct cmd_rank *cmd UNUSED, enum RANK_FUNC f)
+parse_rank_function (struct lexer *lexer, struct dictionary *dict, struct cmd_rank *cmd UNUSED, enum RANK_FUNC f)
rank_specs[n_rank_specs - 1].destvars =
xcalloc (sc->crit_cnt, sizeof (struct variable *));
rank_specs[n_rank_specs - 1].destvars =
xcalloc (sc->crit_cnt, sizeof (struct variable *));
- destvar = create_rank_variable (dict, f, src_vars[var_count], tokid);
+ destvar = create_rank_variable (dict, f, src_vars[var_count], lex_tokid (lexer));
-rank_custom_rank(struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_rank (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function (dict, cmd, RANK);
+ return parse_rank_function (lexer, dict, cmd, RANK);
-rank_custom_normal(struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_normal (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function (dict, cmd, NORMAL);
+ return parse_rank_function (lexer, dict, cmd, NORMAL);
-rank_custom_percent(struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_percent (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function (dict, cmd, PERCENT);
+ return parse_rank_function (lexer, dict, cmd, PERCENT);
-rank_custom_rfraction(struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_rfraction (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function (dict, cmd, RFRACTION);
+ return parse_rank_function (lexer, dict, cmd, RFRACTION);
-rank_custom_proportion(struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_proportion (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function (dict, cmd, PROPORTION);
+ return parse_rank_function (lexer, dict, cmd, PROPORTION);
-rank_custom_n (struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_n (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
-rank_custom_savage(struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_savage (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function (dict, cmd, SAVAGE);
+ return parse_rank_function (lexer, dict, cmd, SAVAGE);
-rank_custom_ntiles (struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
+rank_custom_ntiles (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd, void *aux UNUSED )
- return parse_rank_function(dict, cmd, NTILES);
+ return parse_rank_function (lexer, dict, cmd, NTILES);