lexer: New function lex_error_expecting().

[pspp-builds.git] / src / language / utilities / set.q

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index bb52fe341480c0106d03af8ebd6ae855dcff9f21..8b892c7fb6bfdb092207a6950ca0fb7a01055c6d 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -150,6 +150,13 @@ cmd_set (struct lexer *lexer, struct dataset *ds)
     settings_set_include (cmd.inc == STC_ON);
   if (cmd.sbc_mxerrs)
     settings_set_max_messages (MSG_S_ERROR, cmd.n_mxerrs[0]);
+  if (cmd.sbc_mxloops)
+    {
+      if (cmd.n_mxloops[0] >= 1)
+        settings_set_mxloops (cmd.n_mxloops[0]);
+      else
+        msg (SE, _("%s must be at least 1."), "MXLOOPS");
+    }
   if (cmd.sbc_mxwarns)
     settings_set_max_messages (MSG_S_WARNING, cmd.n_mxwarns[0]);
   if (cmd.sbc_rib)
@@ -178,8 +185,12 @@ cmd_set (struct lexer *lexer, struct dataset *ds)
     msg (SW, _("%s is obsolete."), "BLOCK");
   if (cmd.sbc_boxstring)
     msg (SW, _("%s is obsolete."), "BOXSTRING");
+  if (cmd.sbc_cpi)
+    msg (SW, _("%s is obsolete."), "CPI");
   if (cmd.sbc_histogram)
     msg (SW, _("%s is obsolete."), "HISTOGRAM");
+  if (cmd.sbc_lpi)
+    msg (SW, _("%s is obsolete."), "LPI");
   if (cmd.sbc_menus)
     msg (SW, _("%s is obsolete."), "MENUS");
   if (cmd.sbc_xsort)
@@ -320,7 +331,7 @@ stc_custom_tnumbers (struct lexer *lexer,
     }
   else
     {
-      lex_error (lexer, _("expecting VALUES, LABELS or BOTH"));
+      lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH", NULL_SENTINEL);
       return 0;
     }