In the lemon-generated parser, do not report the End-of-input character and

the wildcard character as missed coverage.

FossilOrigin-Name: 3fe964873da16c0e0b1c4f1945f965d4137df7a307acd6a3eb6585ffbaa2afd1

diff --git a/manifest b/manifest
index 784faa63b27466ecf05fd3f43641e268084460db..74d89bf9602da71daf2ea13fa5e37a1f093ce8fd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sLEMON,\sfix\san\soff-by-one\serror\sthat\scan\smake\sthe\slookahead\stable\sone\nbyte\stoo\ssmal.
-D 2017-12-27T15:21:16.478
+C In\sthe\slemon-generated\sparser,\sdo\snot\sreport\sthe\sEnd-of-input\scharacter\sand\nthe\swildcard\scharacter\sas\smissed\scoverage.
+D 2017-12-27T16:13:22.261
 F Makefile.in ceb40bfcb30ebba8e1202b34c56ff7e13e112f9809e2381d99be32c2726058f5
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6480671f7c129e61208d69492b3c71ce4310d49fceac83cfb17f1c081e242b69
@@ -1609,7 +1609,7 @@ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
 F tool/lemon.c 7f7735326ca9c3b48327b241063cee52d35d44e20ebe1b3624a81658052a4d39
-F tool/lempar.c 64e760f7cc21ea7e73513b062a86a3c478dfd1ed41fe9837a6f49958cdb61e03
+F tool/lempar.c 48ca9d9f280762da24d667f423c5421e09a6839d08a7d6a516d009db22974deb
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1687,7 +1687,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 86e30fc284c740b55f75884b67988fe837b28878f586f6ec8850ecf80164e700
-R 4a4c12385039bdde527999ce093c45db
+P 93792bc58a2eccc7e07b14307388350bb376db32c5055b79a44e4fa8ff91d58e
+R 930e0d52d43acba766af53475563b556
 U drh
-Z dbb131aa448f925318d1af4566b5714c
+Z 594a8d4b6a5a5a1f42055bf091b10e50

diff --git a/manifest.uuid b/manifest.uuid
index d4b1dea234fc199ebf45ad7eabba8a1502926dfb..5d9f174839e636248a45bc0cade4aa8db1faf3f5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93792bc58a2eccc7e07b14307388350bb376db32c5055b79a44e4fa8ff91d58e
\ No newline at end of file
+3fe964873da16c0e0b1c4f1945f965d4137df7a307acd6a3eb6585ffbaa2afd1
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index 5404fa5f5f4c6915dcb805e38c5a89af29fcc472..e5dd50cfb7949466cdabbd5d9885fad640970fee 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -475,7 +475,8 @@ int ParseCoverage(FILE *out){
   int i, j;
   int nMissed = 0;
   for(i=0; i<YYNSTATE; i++){
-    for(j=0; j<YYNTOKEN; j++){
+    for(j=1; j<YYNTOKEN; j++){
+      if( j==YYWILDCARD ) continue;
       if( !yycoverage[i][j] ) nMissed++;
       if( out ){
         fprintf(out,"State %d lookahead %s %s\n",