From b8a762827cbf969c2b1d56393ee5d316ed6080a0 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 27 Nov 2018 14:03:11 +0000
Subject: [PATCH] Fix to the error handling logic in the Lemon parser template.
  This does not affect SQLite since SQLite does not use that part of the Lemon
 parser template.

FossilOrigin-Name: c6dfc59eb12a02d35b708b5d94239377c79f688fa572f72bad51a157b1bf599c
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 tool/lempar.c |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 2f0d8609eb..657aacc736 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\s"#ifndef\sSQLITE_DISABLE_FTS4_DEFERRED"\sblock\saround\sfunction\nfts3EvalDeferredPhrase()\sin\sfts3\sin\sorder\sto\ssilence\sa\scompiler\swarning.
-D 2018-11-27T09:57:10.404
+C Fix\sto\sthe\serror\shandling\slogic\sin\sthe\sLemon\sparser\stemplate.\s\sThis\sdoes\nnot\saffect\sSQLite\ssince\sSQLite\sdoes\snot\suse\sthat\spart\sof\sthe\sLemon\sparser\ntemplate.
+D 2018-11-27T14:03:11.052
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 15f0851eb3754e37de848d5f8ab24146cf677b44ac38353a2c23e39c999aa422
@@ -1698,7 +1698,7 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
 F tool/lemon.c 60d1e1eb0f7ebae709f68f1472d77fbf291c5345cd98ff417219da7e74fd09e9
-F tool/lempar.c 6020ce61dd7a536a3866952eb1e616c7e8b14b8f623368ed5a98f0639cedf048
+F tool/lempar.c 7af7e9fffbbbb7a30e60d0f1692ba2730ac23847705c3b09eefd68c010b5755b
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1778,7 +1778,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6e1330545e7b74fe5f1f20751a3425e2788441485fc07fcb7626e448c72027ce
-R 959d5966da7a7259a58c205629600a77
-U dan
-Z f1a869b59099a5dff51ceb79f0ae01ba
+P 6f4b0d0494446d46ac22b17650a25b025995cc545cac8fbc4776cf9dd388bcd8
+R 342594cf6238112e53e9e7ed351aeaf5
+U drh
+Z 367fb09364f4bfdf7228e4b27799d518
diff --git a/manifest.uuid b/manifest.uuid
index 2f6be2f3de..8786169df1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f4b0d0494446d46ac22b17650a25b025995cc545cac8fbc4776cf9dd388bcd8
\ No newline at end of file
+c6dfc59eb12a02d35b708b5d94239377c79f688fa572f72bad51a157b1bf599c
\ No newline at end of file
diff --git a/tool/lempar.c b/tool/lempar.c
index 2ebc67ee5f..6a39603be7 100644
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -987,10 +987,9 @@ void Parse(
         yymajor = YYNOCODE;
       }else{
         while( yypParser->yytos >= yypParser->yystack
-            && yymx != YYERRORSYMBOL
             && (yyact = yy_find_reduce_action(
                         yypParser->yytos->stateno,
-                        YYERRORSYMBOL)) >= YY_MIN_REDUCE
+                        YYERRORSYMBOL)) > YY_MAX_SHIFTREDUCE
         ){
           yy_pop_parser_stack(yypParser);
         }
-- 
2.47.2