Fix an unreachable branch in sqlite3ParserFallback()

FossilOrigin-Name: e059178b47109caee2c2211b2db6e594c014af636677118a64e10edf01ac017d

diff --git a/manifest b/manifest
index 167921e6c37c93cfcde7e28891819d2cc6f5999b..23b6a28b23c58df9f6076dd3199b59e61bdf127a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\simprovements\sto\sparser\sspeed\sby\senlarging\slookup\stables\sto\seliminate\nthe\sneed\sto\sdo\srange\schecking\son\sthe\sindex\sprior\sto\slookup.
-D 2019-08-28T11:31:11.959
+C Fix\san\sunreachable\sbranch\sin\ssqlite3ParserFallback()
+D 2019-08-28T11:49:45.616
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1757,7 +1757,7 @@ F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c 9ec344d29cbeb03fdc0fce668eedfb7495792170de933adf95cf8d6904a166ad
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
 F tool/lemon.c c9848ef9694689d244a5097238ca1f83df85cc52c80ad149a4cf49595a0ee9c2
-F tool/lempar.c 5d1b20f2e9d7d6e3e1f5e1c11dba455c798bf0097634f5aef7c68a1ae7bc7d86
+F tool/lempar.c eb2841e2a7fd484cf44b1f526b06e7ab0f216d2f41818bf9485e8f38e3d1db19
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1837,7 +1837,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 bafd872398e58766e996963372c7acc03a1e20a6d39a3867ca45d3ea0ed2ac1d
-R 958bf9b2f74079dc6a59cf74943d64b1
+P 47d3e091ae49eb7947af5abef9b5b96b16b86d349e51fe0677795649be6db473
+R eed84f5af5dd0a6ce743afeb00c4b4e4
 U drh
-Z 3fa2b314bcffff2187af5dcc971ba8ee
+Z 0c74ffec3ce3109c0e0f66d709525f70

diff --git a/manifest.uuid b/manifest.uuid
index 2c14daf263ef77a8cca5e3aea88a24021848983f..1d045fd59e3623eccfd06207a004ce0fe1811804 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47d3e091ae49eb7947af5abef9b5b96b16b86d349e51fe0677795649be6db473
\ No newline at end of file
+e059178b47109caee2c2211b2db6e594c014af636677118a64e10edf01ac017d
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index 9d5b19f465b76d6d1226eb36be1ff43005a4e99f..f75ad51c39c708440d52a6a365d65000b2139c73 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -1064,9 +1064,8 @@ void Parse(
 */
 int ParseFallback(int iToken){
 #ifdef YYFALLBACK
-  if( iToken<(int)(sizeof(yyFallback)/sizeof(yyFallback[0])) ){
-    return yyFallback[iToken];
-  }
+  assert( iToken<(int)(sizeof(yyFallback)/sizeof(yyFallback[0])) );
+  return yyFallback[iToken];
 #else
   (void)iToken;
 #endif