X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcrosstabs.q;h=341a920116865dfae3d6f97766950597b4bcf29f;hb=a45fa3f76f32c391c756b7e4334330458d74a1ab;hp=f75e249e8fdd3bba0363a9a26240aedd30ad16e3;hpb=5933892c21c6166b5714be979116d3aa70219c57;p=pspp

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index f75e249e8f..341a920116 100644
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -406,7 +406,7 @@ crs_custom_tables (struct lexer *lexer, struct dataset *ds,
 	{
 	  if (n_by < 2)
 	    {
-	      lex_error (lexer, _("expecting BY"));
+              lex_force_match (lexer, T_BY);
 	      goto done;
 	    }
 	  else
@@ -482,12 +482,8 @@ crs_custom_variables (struct lexer *lexer, struct dataset *ds,
                                    | PV_NO_DUPLICATE | PV_NO_SCRATCH)))
 	return 0;
 
-      if (lex_token (lexer) != '(')
-	{
-	  lex_error (lexer, "expecting `('");
+      if (!lex_force_match (lexer, '('))
 	  goto lossage;
-	}
-      lex_get (lexer);
 
       if (!lex_force_int (lexer))
 	goto lossage;
@@ -507,12 +503,8 @@ crs_custom_variables (struct lexer *lexer, struct dataset *ds,
 	}
       lex_get (lexer);
 
-      if (lex_token (lexer) != ')')
-	{
-	  lex_error (lexer, "expecting `)'");
-	  goto lossage;
-	}
-      lex_get (lexer);
+      if (!lex_force_match (lexer, ')'))
+        goto lossage;
 
       for (i = orig_nv; i < proc->n_variables; i++)
         {