Revert Lemon so that it only shows -D options that are actually used. Though

the change to display the options in sorted order is retained.

FossilOrigin-Name: e54eb217c9508c19aee085b111a1323c9009f014ba4db6019918e27002c4ca8c

diff --git a/manifest b/manifest
index 046bf01b74b104cf5d80bf0f33ddb8fff7fc378b..50a39b8487f7a92796647719d94e9cecad1acf5b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\slemon,\sshow\sall\sthe\s-D\soptions\sin\sthe\sgenerated\sheader,\seven\sif\snone\sof\sthem\nare\sused.
-D 2024-06-19T18:46:44.752
+C Revert\sLemon\sso\sthat\sit\sonly\sshows\s-D\soptions\sthat\sare\sactually\sused.\s\sThough\nthe\schange\sto\sdisplay\sthe\soptions\sin\ssorted\sorder\sis\sretained.
+D 2024-06-19T18:54:04.609
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2105,7 +2105,7 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c 11a76a312591ad4d2d11a664960d14791e6a3698490c2330f8f217d37defb29d
+F tool/lemon.c d048516b2c3ad4119b1c1154a73f4f9435b275fea076318959f817effe23b827
 F tool/lempar.c e6b649778e5c027c8365ff01d7ef39297cd7285fa1f881cce31792689541e79f
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
@@ -2194,8 +2194,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P eed76e6698eabe47c6bf9696599ce1c2f7aa428cf60f39d0566fbd0d1f6c4c62
-R 7ee122c11f32e2edad2a0b78a30e5cda
+P 2aa009c38bb207ac59b9bbd6f8e0d7315697b3fd6a01f9431f29a3c7ccad53e7
+R 3281f4b2c4a24316e0e2a5cf40f57c6f
 U drh
-Z 43a86ba5dbf2c4560b6460986e5be6a3
+Z 4a8e9f1737e4d24d9c6b904079fd66cf
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e588a3add11fa20b10ddc1d3eed3bceaf5c32935..fb56f9dd79059242091c200557ef906caf7dc33d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2aa009c38bb207ac59b9bbd6f8e0d7315697b3fd6a01f9431f29a3c7ccad53e7
+e54eb217c9508c19aee085b111a1323c9009f014ba4db6019918e27002c4ca8c

diff --git a/tool/lemon.c b/tool/lemon.c
index 767dab323ad5c449bc94239ef2a3cc4a1d574d04..d92df2a1a7b9748839cdca75c58eb012180c01ef 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -4503,12 +4503,12 @@ void ReportTable(
   fprintf(out, 
      "/* This file is automatically generated by Lemon from input grammar\n"
      "** source file \"%s\"", lemp->filename);  lineno++;
-  if( nDefine==0 ){
+  if( nDefineUsed==0 ){
     fprintf(out, ".\n*/\n"); lineno += 2;
   }else{
     fprintf(out, " with these options:\n**\n"); lineno += 2;
     for(i=0; i<nDefine; i++){
-      /* if( !bDefineUsed[i] ) continue; */
+      if( !bDefineUsed[i] ) continue;
       fprintf(out, "**   -D%s\n", azDefine[i]); lineno++;
     }
     fprintf(out, "*/\n"); lineno++;