X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsort-criteria.c;h=36466cd410f9bfdb89a2db6588fbbe6ba3c6a21d;hb=3f3b74c2dd0e8468e11b0bb22366f6081ba0d459;hp=b8bdbd06f85b658808e7cfd6126a9350b845ab00;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/language/stats/sort-criteria.c b/src/language/stats/sort-criteria.c
index b8bdbd06f8..36466cd410 100644
--- a/src/language/stats/sort-criteria.c
+++ b/src/language/stats/sort-criteria.c
@@ -42,9 +42,9 @@ parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
                      const struct variable ***vars, bool *saw_direction)
 {
   const struct variable **local_vars = NULL;
-  size_t var_cnt = 0;
+  size_t n_vars = 0;
 
-  if (vars == NULL) 
+  if (vars == NULL)
     vars = &local_vars;
   *vars = NULL;
 
@@ -53,12 +53,12 @@ parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
 
   do
     {
-      size_t prev_var_cnt = var_cnt;
+      size_t prev_n_vars = n_vars;
       enum subcase_direction direction;
       size_t i;
 
       /* Variables. */
-      if (!parse_variables_const (lexer, dict, vars, &var_cnt,
+      if (!parse_variables_const (lexer, dict, vars, &n_vars,
                                   PV_APPEND | PV_NO_SCRATCH))
         goto error;
 
@@ -71,26 +71,23 @@ parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
             direction = SC_ASCEND;
           else
 	    {
-	      msg (SE, _("`A' or `D' expected inside parentheses."));
-              goto error;
-	    }
-	  if (!lex_match (lexer, T_RPAREN))
-	    {
-	      msg (SE, _("`)' expected."));
+              lex_error_expecting (lexer, "A", "D");
               goto error;
 	    }
+	  if (!lex_force_match (lexer, T_RPAREN))
+            goto error;
           if (saw_direction != NULL)
             *saw_direction = true;
 	}
       else
         direction = SC_ASCEND;
 
-      for (i = prev_var_cnt; i < var_cnt; i++) 
+      for (i = prev_n_vars; i < n_vars; i++)
         {
           const struct variable *var = (*vars)[i];
           if (!subcase_add_var (ordering, var, direction))
             msg (SW, _("Variable %s specified twice in sort criteria."),
-                 var_get_name (var)); 
+                 var_get_name (var));
         }
     }
   while (lex_token (lexer) == T_ID