Enhance LEMON to show precendence of symbols and all rules in the report

that is generated in parallel to the parser.

FossilOrigin-Name: 602fbd8149b53d8f0e9a223cc1aec912e7df03fca35071e8d707776ce225371c

diff --git a/manifest b/manifest
index 60b8475b363553e17e2c2203c9efe8aec3e6cce1..3baba8f82ab774743a258bfce2a60878ff508343 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sthe\ssessions\smodule\scausing\ssqlite3session_apply_strm()\sto\nallocate\senough\smemory\sfor\sthe\sentire\sinput\sbuffer\s-\swhich\sdefeats\sthe\spoint\nof\sa\sstreaming\sinterface.
-D 2018-04-06T16:22:25.544
+C Enhance\sLEMON\sto\sshow\sprecendence\sof\ssymbols\sand\sall\srules\sin\sthe\sreport\nthat\sis\sgenerated\sin\sparallel\sto\sthe\sparser.
+D 2018-04-06T19:12:55.023
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1636,7 +1636,7 @@ F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c 7f7735326ca9c3b48327b241063cee52d35d44e20ebe1b3624a81658052a4d39
+F tool/lemon.c c1a87d15983f96851b253707985dba8783fbe41ba21ba1b76720e06c8a262206
 F tool/lempar.c 468a155e8729cfbccfe1d85bf60d064f1dab76167a51149ec5c7928a2de63953
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
@@ -1717,7 +1717,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 a3b02db74681a215996c5ed110eb0ece5ed24f71a1b131c10e9f33e666af0256
-R 5059e4d4d3f966cfa7e79d77bd6fbafb
-U dan
-Z dbbf8c12c9669496ce9d7e293c2273c3
+P 7594e60935b0b5dcf764476dccdf9b403303818a0419a30bc2c16d58e44f6d04
+R ef1c977dfaed4c346b10d938399c3d50
+U drh
+Z 131d6c9ff99d8e76f2b61b25cec666a3

diff --git a/manifest.uuid b/manifest.uuid
index 04fae7dc930881e578bbf9a67fdb45bfcc1f7e27..065741c9db72213b146371304011dfa08e87011c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7594e60935b0b5dcf764476dccdf9b403303818a0419a30bc2c16d58e44f6d04
\ No newline at end of file
+602fbd8149b53d8f0e9a223cc1aec912e7df03fca35071e8d707776ce225371c
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index 96bbed747386b3f50f65a48a943c02f1bbc6307d..f06a14fb873bcb47ad73f0e8bbc5471ad23d7182 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -3254,6 +3254,7 @@ void ReportOutput(struct lemon *lemp)
   struct state *stp;
   struct config *cfp;
   struct action *ap;
+  struct rule *rp;
   FILE *fp;
 
   fp = file_open(lemp,".out","wb");
@@ -3306,8 +3307,21 @@ void ReportOutput(struct lemon *lemp)
         }
       }
     }
+    if( sp->prec>=0 ) fprintf(fp," (precedence=%d)", sp->prec);
     fprintf(fp, "\n");
   }
+  fprintf(fp, "----------------------------------------------------\n");
+  fprintf(fp, "Rules:\n");
+  for(rp=lemp->rule; rp; rp=rp->next){
+    fprintf(fp, "%4d: ", rp->iRule);
+    rule_print(fp, rp);
+    fprintf(fp,".");
+    if( rp->precsym ){
+      fprintf(fp," [%s precedence=%d]",
+              rp->precsym->name, rp->precsym->prec);
+    }
+    fprintf(fp,"\n");
+  }
   fclose(fp);
   return;
 }