#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
};
static void destroy_flip_pgm (struct flip_pgm *);
-static struct case_sink *flip_sink_create (struct flip_pgm *);
+static struct case_sink *flip_sink_create (struct dictionary *d, struct flip_pgm *);
static struct case_source *flip_source_create (struct flip_pgm *);
static bool flip_file (struct flip_pgm *);
-static int build_dictionary (struct flip_pgm *);
+static int build_dictionary (struct dictionary *, struct flip_pgm *);
static const struct case_source_class flip_source_class;
static const struct case_sink_class flip_sink_class;
/* Parses and executes FLIP. */
int
-cmd_flip (void)
+cmd_flip (struct lexer *lexer, struct dataset *ds)
{
struct flip_pgm *flip;
struct case_sink *sink;
+ struct dictionary *dict = dataset_dict (ds);
bool ok;
- if (proc_make_temporary_transformations_permanent ())
+ if (proc_make_temporary_transformations_permanent (ds))
msg (SW, _("FLIP ignores TEMPORARY. "
"Temporary transformations will be made permanent."));
flip = pool_create_container (struct flip_pgm, pool);
flip->var = NULL;
- flip->idx_to_fv = dict_get_compacted_idx_to_fv (default_dict);
+ flip->idx_to_fv = dict_get_compacted_idx_to_fv (dict);
pool_register (flip->pool, free, flip->idx_to_fv);
flip->var_cnt = 0;
flip->case_cnt = 0;
flip->new_names_tail = NULL;
flip->file = NULL;
- lex_match ('/');
- if (lex_match_id ("VARIABLES"))
+ lex_match (lexer, '/');
+ if (lex_match_id (lexer, "VARIABLES"))
{
- lex_match ('=');
- if (!parse_variables (default_dict, &flip->var, &flip->var_cnt,
+ lex_match (lexer, '=');
+ if (!parse_variables (lexer, dict, &flip->var, &flip->var_cnt,
PV_NO_DUPLICATE))
goto error;
- lex_match ('/');
+ lex_match (lexer, '/');
}
else
- dict_get_vars (default_dict, &flip->var, &flip->var_cnt, 1u << DC_SYSTEM);
+ dict_get_vars (dict, &flip->var, &flip->var_cnt, 1u << DC_SYSTEM);
pool_register (flip->pool, free, flip->var);
- lex_match ('/');
- if (lex_match_id ("NEWNAMES"))
+ lex_match (lexer, '/');
+ if (lex_match_id (lexer, "NEWNAMES"))
{
- lex_match ('=');
- flip->new_names = parse_variable ();
+ lex_match (lexer, '=');
+ flip->new_names = parse_variable (lexer, dict);
if (!flip->new_names)
goto error;
}
else
- flip->new_names = dict_lookup_var (default_dict, "CASE_LBL");
+ flip->new_names = dict_lookup_var (dict, "CASE_LBL");
if (flip->new_names)
{
/* Read the active file into a flip_sink. */
flip->case_cnt = 0;
- proc_make_temporary_transformations_permanent ();
- sink = flip_sink_create (flip);
+ proc_make_temporary_transformations_permanent (ds);
+ sink = flip_sink_create (dict, flip);
if (sink == NULL)
goto error;
- proc_set_sink (sink);
+ proc_set_sink (ds, sink);
flip->new_names_tail = NULL;
- ok = procedure (NULL, NULL);
+ ok = procedure (ds,NULL, NULL);
/* Flip the data we read. */
if (!flip_file (flip))
{
- discard_variables ();
+ discard_variables (ds);
goto error;
}
/* Flip the dictionary. */
- dict_clear (default_dict);
- if (!build_dictionary (flip))
+ dict_clear (dict);
+ if (!build_dictionary (dict, flip))
{
- discard_variables ();
+ discard_variables (ds);
goto error;
}
- flip->case_size = dict_get_case_size (default_dict);
+ flip->case_size = dict_get_case_size (dict);
/* Set up flipped data for reading. */
- proc_set_source (flip_source_create (flip));
+ proc_set_source (ds, flip_source_create (flip));
- return ok ? lex_end_of_command () : CMD_CASCADING_FAILURE;
+ return ok ? lex_end_of_command (lexer) : CMD_CASCADING_FAILURE;
error:
destroy_flip_pgm (flip);
/* Make a new variable with base name NAME, which is bowdlerized and
mangled until acceptable, and returns success. */
static int
-make_new_var (char name[])
+make_new_var (struct dictionary *dict, char name[])
{
char *cp;
*cp = '\0';
str_uppercase (name);
- if (dict_create_var (default_dict, name, 0))
+ if (dict_create_var (dict, name, 0))
return 1;
/* Add numeric extensions until acceptable. */
memcpy (n, name, ofs);
sprintf (&n[ofs], "%d", i);
- if (dict_create_var (default_dict, n, 0))
+ if (dict_create_var (dict, n, 0))
return 1;
}
}
/* Make a new dictionary for all the new variable names. */
static int
-build_dictionary (struct flip_pgm *flip)
+build_dictionary (struct dictionary *dict, struct flip_pgm *flip)
{
- dict_create_var_assert (default_dict, "CASE_LBL", 8);
+ dict_create_var_assert (dict, "CASE_LBL", 8);
if (flip->new_names_head == NULL)
{
char s[SHORT_NAME_LEN + 1];
sprintf (s, "VAR%03d", i);
- v = dict_create_var_assert (default_dict, s, 0);
+ v = dict_create_var_assert (dict, s, 0);
}
}
else
struct varname *v;
for (v = flip->new_names_head; v; v = v->next)
- if (!make_new_var (v->name))
+ if (!make_new_var (dict, v->name))
return 0;
}
/* Creates a flip sink based on FLIP. */
static struct case_sink *
-flip_sink_create (struct flip_pgm *flip)
+flip_sink_create (struct dictionary *dict, struct flip_pgm *flip)
{
size_t i;
flip->case_cnt = 1;
- return create_case_sink (&flip_sink_class, default_dict, flip);
+ return create_case_sink (&flip_sink_class, dict, flip);
}
/* Writes case C to the FLIP sink.
else if (feof (flip->file))
msg (SE, _("Unexpected end of file reading FLIP temporary file."));
else
- abort ();
+ NOT_REACHED ();
ok = false;
break;
}