From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 1 Aug 2022 04:16:24 +0000 (-0700)
Subject: lexer: Support more options in lex_error_expecting_array().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=6b49f657ea3b2bf360ea903a11e30c886f1eec1d

lexer: Support more options in lex_error_expecting_array().
---

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index 1fadf53b30..eb5d7cbd37 100644
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -531,7 +531,19 @@ lex_error_expecting_array (struct lexer *lexer, const char **options, size_t n)
       break;
 
     default:
-      lex_error (lexer, NULL);
+      {
+        struct string s = DS_EMPTY_INITIALIZER;
+        for (size_t i = 0; i < n; i++)
+          {
+            if (i > 0)
+              ds_put_cstr (&s, ", ");
+            ds_put_cstr (&s, options[i]);
+          }
+        lex_error (lexer, _("expecting one of the following: %s"),
+                   ds_cstr (&s));
+        ds_destroy (&s);
+      }
+      break;
     }
 }