X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=d73b95e8a2236b25f7172efb57c673e1f8d309c1;hb=d96eac87d7f348b87f9d517b0ab3bd0cbe613284;hp=afb9089986b95b23babeb63e1e4947a1caed4205;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index afb9089986..d73b95e8a2 100644
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -18,8 +18,8 @@
 
 #include <stdlib.h>
 
+#include "data/dataset.h"
 #include "data/dictionary.h"
-#include "data/procedure.h"
 #include "data/variable.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
@@ -79,7 +79,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
      this type. */
   unsigned already_encountered = 0;
 
-  /* What we're gonna do to the active file. */
+  /* What we are going to do to the active dataset. */
   struct var_modification vm;
 
   /* Return code. */
@@ -110,7 +110,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 
 	  if (already_encountered & 1)
 	    {
-	      msg (SE, _("%s subcommand may be given at most once."), "REORDER");
+              lex_sbc_only_once ("REORDER");
 	      goto done;
 	    }
 	  already_encountered |= 1;
@@ -143,7 +143,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 		{
 		  if (!lex_match (lexer, T_LPAREN))
 		    {
-		      msg (SE, _("`(' expected on %s subcommand."), "REORDER");
+                      lex_error_expecting (lexer, "`('", NULL_SENTINEL);
 		      free (v);
 		      goto done;
 		    }
@@ -155,8 +155,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 		    }
 		  if (!lex_match (lexer, T_RPAREN))
 		    {
-		      msg (SE, _("`)' expected following variable names on "
-			   "REORDER subcommand."));
+                      lex_error_expecting (lexer, "`)'", NULL_SENTINEL);
 		      free (v);
 		      goto done;
 		    }
@@ -174,7 +173,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 	{
 	  if (already_encountered & 2)
 	    {
-	      msg (SE, _("%s subcommand may be given at most once."), "RENAME");
+              lex_sbc_only_once ("RENAME");
 	      goto done;
 	    }
 	  already_encountered |= 2;
@@ -187,7 +186,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 
 	      if (!lex_match (lexer, T_LPAREN))
 		{
-		  msg (SE, _("`(' expected on %s subcommand."), "RENAME");
+                  lex_error_expecting (lexer, "`('", NULL_SENTINEL);
 		  goto done;
 		}
 	      if (!parse_variables (lexer, dataset_dict (ds),
@@ -196,12 +195,11 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 		goto done;
 	      if (!lex_match (lexer, T_EQUALS))
 		{
-		  msg (SE, _("`=' expected between lists of new and old variable "
-		       "names on RENAME subcommand."));
+                  lex_error_expecting (lexer, "`='", NULL_SENTINEL);
 		  goto done;
 		}
-	      if (!parse_DATA_LIST_vars (lexer, &vm.new_names,
-					 &prev_nv_1, PV_APPEND))
+	      if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
+                                         &vm.new_names, &prev_nv_1, PV_APPEND))
 		goto done;
 	      if (prev_nv_1 != vm.rename_cnt)
 		{
@@ -216,8 +214,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 		}
 	      if (!lex_match (lexer, T_RPAREN))
 		{
-		  msg (SE, _("`)' expected after variable lists on RENAME "
-		       "subcommand."));
+                  lex_error_expecting (lexer, "`)'", NULL_SENTINEL);
 		  goto done;
 		}
 	    }
@@ -310,7 +307,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
 	break;
       if (lex_token (lexer) != T_SLASH)
 	{
-	  msg (SE, _("`/' or `.' expected."));
+          lex_error_expecting (lexer, "`/'", "`.'", NULL_SENTINEL);
 	  goto done;
 	}
       lex_get (lexer);