From 656fb00e9bcb23c99bd83648f617f32d5e7169ee Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Tue, 19 Apr 1994 09:38:00 +0000
Subject: [PATCH] Fix: error recovery sometimes skipped tokens it needed later
 on

---
 util/LLgen/lib/incl |  4 +++-
 util/LLgen/lib/rec  | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/util/LLgen/lib/incl b/util/LLgen/lib/incl
index 636026075..a7b2347f9 100644
--- a/util/LLgen/lib/incl
+++ b/util/LLgen/lib/incl
@@ -10,7 +10,7 @@
 extern int LLsymb;
 
 #define LL_SAFE(x)	/* Nothing */
-#define LL_SSCANDONE(x)	if (LLsymb != x) LLerror(x); else
+#define LL_SSCANDONE(x)	if (LLsymb != x) LLsafeerror(x); else
 #define LL_SCANDONE(x)	if (LLsymb != x) LLerror(x); else
 #define LL_NOSCANDONE(x) LLscan(x)
 #ifdef LL_FASTER
@@ -32,6 +32,7 @@ extern void LLread(void);
 extern int LLskip(void);
 extern int LLnext(int);
 extern void LLerror(int);
+extern void LLsafeerror(int);
 extern void LLnewlevel(unsigned int *);
 extern void LLoldlevel(unsigned int *);
 #ifndef LL_FASTER
@@ -45,6 +46,7 @@ extern LLread();
 extern int LLskip();
 extern int LLnext();
 extern LLerror();
+extern LLsafeerror();
 extern LLnewlevel();
 extern LLoldlevel();
 #ifndef LL_FASTER
diff --git a/util/LLgen/lib/rec b/util/LLgen/lib/rec
index acf8c4484..7802c3f54 100644
--- a/util/LLgen/lib/rec
+++ b/util/LLgen/lib/rec
@@ -97,6 +97,33 @@ LLerror(t)
 	if (LLsymb != t) LLmessage(t);
 }
 
+#if LL_ANSI_C
+void LLsafeerror(int t)
+#else
+LLsafeerror(t)
+	int	t;
+#endif
+{
+	register int i;
+
+	if (t == EOFILE && LLsymb <= 0) return;
+#ifdef LL_NEWMESS
+	if (t == EOFILE) {
+#ifdef LL_USERHOOK
+		static int lst[] = { EOFILE, 0 };
+		if (LLuserhook(EOFILE, lst)) /* nothing */;
+#endif /* LL_USERHOOK */
+		if (LLsymb != EOFILE && LLsymb > 0) {
+			LLmessage(-1);
+			while ((LLsymb = LL_LEXI()) > 0 && LLsymb != EOFILE) 
+				/* nothing */ ;
+		}
+		return;
+	}
+#endif
+	LLmessage(t);
+}
+
 #ifndef LLNOFIRSTS
 #if LL_ANSI_C
 int LLfirst(int x, int d) {
-- 
2.34.1