#include <data/case.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/range-parser.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
static trns_proc_func count_trns_proc;
static trns_free_func count_trns_free;
-static bool parse_numeric_criteria (struct pool *, struct criteria *);
-static bool parse_string_criteria (struct pool *, struct criteria *);
+static bool parse_numeric_criteria (struct lexer *, struct pool *, struct criteria *);
+static bool parse_string_criteria (struct lexer *, struct pool *, struct criteria *);
\f
int
-cmd_count (void)
+cmd_count (struct lexer *lexer, struct dataset *ds)
{
struct dst_var *dv; /* Destination var being parsed. */
struct count_trns *trns; /* Transformation. */
dv->crit = NULL;
/* Get destination variable, or at least its name. */
- if (!lex_force_id ())
+ if (!lex_force_id (lexer))
goto fail;
- dv->var = dict_lookup_var (default_dict, tokid);
+ dv->var = dict_lookup_var (dataset_dict (ds), lex_tokid (lexer));
if (dv->var != NULL)
{
- if (dv->var->type == ALPHA)
+ if (var_is_alpha (dv->var))
{
msg (SE, _("Destination cannot be a string variable."));
goto fail;
}
}
else
- dv->name = pool_strdup (trns->pool, tokid);
+ dv->name = pool_strdup (trns->pool, lex_tokid (lexer));
- lex_get ();
- if (!lex_force_match ('='))
+ lex_get (lexer);
+ if (!lex_force_match (lexer, '='))
goto fail;
crit = dv->crit = pool_alloc (trns->pool, sizeof *crit);
crit->next = NULL;
crit->vars = NULL;
- if (!parse_variables (default_dict, &crit->vars, &crit->var_cnt,
+ if (!parse_variables (lexer, dataset_dict (ds), &crit->vars, &crit->var_cnt,
PV_DUPLICATE | PV_SAME_TYPE))
goto fail;
pool_register (trns->pool, free, crit->vars);
- if (!lex_force_match ('('))
+ if (!lex_force_match (lexer, '('))
goto fail;
crit->value_cnt = 0;
- if (crit->vars[0]->type == NUMERIC)
- ok = parse_numeric_criteria (trns->pool, crit);
+ if (var_is_numeric (crit->vars[0]))
+ ok = parse_numeric_criteria (lexer, trns->pool, crit);
else
- ok = parse_string_criteria (trns->pool, crit);
+ ok = parse_string_criteria (lexer, trns->pool, crit);
if (!ok)
goto fail;
- if (token == '/' || token == '.')
+ if (lex_token (lexer) == '/' || lex_token (lexer) == '.')
break;
crit = crit->next = pool_alloc (trns->pool, sizeof *crit);
}
- if (token == '.')
+ if (lex_token (lexer) == '.')
break;
- if (!lex_force_match ('/'))
+ if (!lex_force_match (lexer, '/'))
goto fail;
dv = dv->next = pool_alloc (trns->pool, sizeof *dv);
}
{
/* It's valid, though motivationally questionable, to count to
the same dest var more than once. */
- dv->var = dict_lookup_var (default_dict, dv->name);
+ dv->var = dict_lookup_var (dataset_dict (ds), dv->name);
if (dv->var == NULL)
- dv->var = dict_create_var_assert (default_dict, dv->name, 0);
+ dv->var = dict_create_var_assert (dataset_dict (ds), dv->name, 0);
}
- add_transformation (count_trns_proc, count_trns_free, trns);
+ add_transformation (ds, count_trns_proc, count_trns_free, trns);
return CMD_SUCCESS;
fail:
/* Parses a set of numeric criterion values. Returns success. */
static bool
-parse_numeric_criteria (struct pool *pool, struct criteria *crit)
+parse_numeric_criteria (struct lexer *lexer, struct pool *pool, struct criteria *crit)
{
size_t allocated = 0;
{
double low, high;
- if (lex_match_id ("SYSMIS"))
+ if (lex_match_id (lexer, "SYSMIS"))
crit->count_system_missing = true;
- else if (lex_match_id ("MISSING"))
+ else if (lex_match_id (lexer, "MISSING"))
crit->count_user_missing = true;
- else if (parse_num_range (&low, &high, NULL))
+ else if (parse_num_range (lexer, &low, &high, NULL))
{
struct num_value *cur;
else
return false;
- lex_match (',');
- if (lex_match (')'))
+ lex_match (lexer, ',');
+ if (lex_match (lexer, ')'))
break;
}
return true;
/* Parses a set of string criteria values. Returns success. */
static bool
-parse_string_criteria (struct pool *pool, struct criteria *crit)
+parse_string_criteria (struct lexer *lexer, struct pool *pool, struct criteria *crit)
{
int len = 0;
size_t allocated = 0;
size_t i;
for (i = 0; i < crit->var_cnt; i++)
- if (crit->vars[i]->width > len)
- len = crit->vars[i]->width;
+ if (var_get_width (crit->vars[i]) > len)
+ len = var_get_width (crit->vars[i]);
crit->values.str = NULL;
for (;;)
&allocated,
sizeof *crit->values.str);
- if (!lex_force_string ())
+ if (!lex_force_string (lexer))
return false;
cur = &crit->values.str[crit->value_cnt++];
*cur = pool_alloc (pool, len + 1);
- str_copy_rpad (*cur, len + 1, ds_c_str (&tokstr));
- lex_get ();
+ str_copy_rpad (*cur, len + 1, ds_cstr (lex_tokstr (lexer)));
+ lex_get (lexer);
- lex_match (',');
- if (lex_match (')'))
+ lex_match (lexer, ',');
+ if (lex_match (lexer, ')'))
break;
}
if (x == SYSMIS)
counter += crit->count_system_missing;
else if (crit->count_user_missing
- && mv_is_num_user_missing (&crit->vars[i]->miss, x))
+ && var_is_num_user_missing (crit->vars[i], x))
counter++;
else
{
char **v;
for (v = crit->values.str; v < crit->values.str + crit->value_cnt; v++)
if (!memcmp (case_str (c, crit->vars[i]->fv), *v,
- crit->vars[i]->width))
+ var_get_width (crit->vars[i])))
{
counter++;
break;
/* Performs the COUNT transformation T on case C. */
static int
count_trns_proc (void *trns_, struct ccase *c,
- int case_num UNUSED)
+ casenumber case_num UNUSED)
{
struct count_trns *trns = trns_;
struct dst_var *dv;
counter = 0;
for (crit = dv->crit; crit; crit = crit->next)
- if (crit->vars[0]->type == NUMERIC)
+ if (var_is_numeric (crit->vars[0]))
counter += count_numeric (crit, c);
else
counter += count_string (crit, c);