Modify the parse.sql output file from Lemon so that the RULE table contains

a column with the complete text of the rule.

FossilOrigin-Name: 329cbb372d4d77f774f01a87d104c40ef42d713afbe76195b65f5ca205c5ea7b

diff --git a/manifest b/manifest
index 27b1aab5a775fcc7efa8c839011d4e33d67aad10..d1d23aa0ca8364fb77d2011199cb6c0846646fd9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\san\sunreachable\stestcase()\sinto\san\sassert()
-D 2019-12-18T21:22:40.803
+C Modify\sthe\sparse.sql\soutput\sfile\sfrom\sLemon\sso\sthat\sthe\sRULE\stable\scontains\na\scolumn\swith\sthe\scomplete\stext\sof\sthe\srule.
+D 2019-12-19T12:29:31.617
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1771,7 +1771,7 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c 9ec344d29cbeb03fdc0fce668eedfb7495792170de933adf95cf8d6904a166ad
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c 50f9d1896ba141bffca6929317f54f63709d00d3ac82bc5c189d9c9c0a83e832
+F tool/lemon.c ac63a7a2915c2556a855ba2d069cdfc897304cdf9d07a20e2ce470120829acfe
 F tool/lempar.c e8899b28488f060d0ff931539ea6311b16b22dce068c086c788a06d5e8d01ab7
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
@@ -1852,7 +1852,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 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e
-R 32a38e4aaf6284494d646d127a601f97
+P 062e00c4d7e30155299339eaefe6cbe01953894baebf0af6d7ab3295b7436eb7
+R 8d6cf8d0b9d8e79c2a551a0656e77e30
 U drh
-Z f00e4fb5b7f3ab87734a306c50a18bfb
+Z bb2d2b67b4a54af65815a14c2eb7c3ad

diff --git a/manifest.uuid b/manifest.uuid
index 4d9e8740b836a3b543db5e70aae81691c0ea96fc..a002c031fcf600cf1b401f785b212f4e4366bbcb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-062e00c4d7e30155299339eaefe6cbe01953894baebf0af6d7ab3295b7436eb7
\ No newline at end of file
+329cbb372d4d77f774f01a87d104c40ef42d713afbe76195b65f5ca205c5ea7b
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index 0e717e1afadb6af739616eae06786edfbde948ee..bc53b06b9c8e2ee174394d3d811b9648c894aad2 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -4222,7 +4222,8 @@ void ReportTable(
     fprintf(sql,
       "CREATE TABLE rule(\n"
       "  ruleid INTEGER PRIMARY KEY,\n"
-      "  lhs INTEGER REFERENCES symbol(id)\n"
+      "  lhs INTEGER REFERENCES symbol(id),\n"
+      "  txt TEXT\n"
       ");\n"
       "CREATE TABLE rulerhs(\n"
       "  ruleid INTEGER REFERENCES rule(ruleid),\n"
@@ -4232,13 +4233,12 @@ void ReportTable(
     );
     for(i=0, rp=lemp->rule; rp; rp=rp->next, i++){
       assert( i==rp->iRule );
-      fprintf(sql, "-- ");
-      writeRuleText(sql, rp);
-      fprintf(sql, "\n");
       fprintf(sql,
-        "INSERT INTO rule(ruleid,lhs)VALUES(%d,%d);\n",
+        "INSERT INTO rule(ruleid,lhs)VALUES(%d,%d,'",
         rp->iRule, rp->lhs->index
       );
+      writeRuleText(sql, rp);
+      fprintf(sql,"');\n");
       for(j=0; j<rp->nrhs; j++){
         struct symbol *sp = rp->rhs[j];
         if( sp->type!=MULTITERMINAL ){