Another attempt to fix error handling in Lemon. This change is a no-op for

SQLite's usage.

FossilOrigin-Name: e1d8ef311cabcb96495a88404991b1416655e4a8

diff --git a/manifest b/manifest
index 9d64eac70043ba0ba99b5c25d8f7b2c18dbd4977..0defcbf521091b70970b38591b675e5efb846fad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\ssqldiff\sprogram,\smake\ssure\sthe\sfirst\sargument\sto\sthe\sdb_prepare()\nutility\sfunction\sis\salways\sa\svalid\sformat\sstring.
-D 2016-07-08T02:14:24.531
+C Another\sattempt\sto\sfix\serror\shandling\sin\sLemon.\s\sThis\schange\sis\sa\sno-op\sfor\nSQLite's\susage.
+D 2016-07-08T19:54:38.723
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -1432,7 +1432,7 @@ F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/lemon.c 09a96bed19955697a5e20c49ad863ec2005815a2
-F tool/lempar.c 072ff9985f36796b95bdc895820f2d77255a7067
+F tool/lempar.c 77c685a612526aae9c0d9b3175176e5bcd3854d0
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1504,7 +1504,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 06cf2680588c8dc4f0cbde275a09cfdcb5943268
-R 0ae6fb283ae848ac01b5c1982f5ece36
+P 8bb8d886ffa948cd7bc66c8c62da76bce233be2e
+R 855944636ee976f5addadf9e5d764c10
 U drh
-Z fc8cced580b536f398169074b70b6b16
+Z 1b9ee21867274cd5ef77d7b4ebcc2052

diff --git a/manifest.uuid b/manifest.uuid
index cad934d3a4ba3edf43c0a7b8b948a5bd0d428321..f05a5cef3cb9145325bb5515958bd35d4d52e8f9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8bb8d886ffa948cd7bc66c8c62da76bce233be2e
\ No newline at end of file
+e1d8ef311cabcb96495a88404991b1416655e4a8
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index d7236efa89c00df9f8601ea52df2895524069e52..5232565f87f6826ba365e0cb4a582b65f878ee3a 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -921,6 +921,9 @@ void Parse(
       yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
       if( yyendofinput ){
         yy_parse_failed(yypParser);
+#ifndef YYNOERRORRECOVERY
+        yypParser->yyerrcnt = -1;
+#endif
       }
       yymajor = YYNOCODE;
 #endif