Encapsulated the static data of procedure.[ch] into a single object, to be

[pspp-builds.git] / src / language / dictionary / rename-variables.c

diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c
index eedc84d4c2543f0871c96c1ad3357a3b21d2b0a4..89827c93c54d023ed317b57b7d825c4f512c12ed 100644 (file)
--- a/src/language/dictionary/rename-variables.c
+++ b/src/language/dictionary/rename-variables.c
@@ -22,10 +22,11 @@
 #include <stdlib.h>
 
 #include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
 #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/hash.h>
 #include <libpspp/message.h>
@@ -46,7 +47,7 @@ cmd_rename_variables (void)
 
   int status = CMD_CASCADING_FAILURE;
 
-  if (proc_make_temporary_transformations_permanent ())
+  if (proc_make_temporary_transformations_permanent (current_dataset))
     msg (SE, _("RENAME VARS may not be used after TEMPORARY.  "
                "Temporary transformations will be made permanent."));
 
@@ -60,7 +61,7 @@ cmd_rename_variables (void)
          msg (SE, _("`(' expected."));
          goto lossage;
        }
-      if (!parse_variables (default_dict, &rename_vars, &rename_cnt,
+      if (!parse_variables (dataset_dict (current_dataset), &rename_vars, &rename_cnt,
                            PV_APPEND | PV_NO_DUPLICATE))
        goto lossage;
       if (!lex_match ('='))
@@ -92,7 +93,7 @@ cmd_rename_variables (void)
     }
   while (token != '.');
 
-  if (!dict_rename_vars (default_dict,
+  if (!dict_rename_vars (dataset_dict (current_dataset),
                          rename_vars, rename_new_names, rename_cnt,
                          &err_name)) 
     {