Fix a bug in the parser table compression algorithm of lemon. (CVS 1249)

FossilOrigin-Name: 8d3e924975681a871e0eeac3b6a62cffdb947ac7

diff --git a/manifest b/manifest
index 5ca22d344cfbd0b88746f69d13c6030d98d497d2..1a427a899b92c6a70381131c5b7cb6b525bbfee3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sthat\soccurs\sif\syou\scall\ssqlite_interrupt()\son\sa\squery\nusing\saggregate\sfunctions\swhere\sthe\saggregate\sfunction\sreturns\sa\sstring\nlonger\sthan\s32\scharacters.\s(CVS\s1248)
-D 2004-02-18T16:57:23
+C Fix\sa\sbug\sin\sthe\sparser\stable\scompression\salgorithm\sof\slemon.\s(CVS\s1249)
+D 2004-02-19T18:41:53
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -147,7 +147,7 @@ F test/version.test 92adee5d98cf6e3eb0d1cf5186952e8114931bf6
 F test/view.test 1ee12c6f8f4791a2c0655120d5562a49400cfe53
 F test/where.test cb3a2ed062ce4b5f08aff2d08027c6a46d68c47b
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
-F tool/lemon.c e37dcb5b8cdb16f4ac98338134bf8d8cd28e399f
+F tool/lemon.c 0bd764091cd818717ee62193015873d73ca87e09
 F tool/lempar.c 0b5e7a58634e0d448929b8e85f7981c2aa708d57
 F tool/memleak.awk b744b6109566206c746d826f6ecdba34662216bc
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
@@ -186,7 +186,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 062ecc1368d6bb6d15da31e8d6f5953e8f5628b9
-R 4707d2271ed24781339bd9c9a8a6f215
+P 2c1e74e58a702fd2be954467a12e69a33b252831
+R 5f3caba9f5c70827c1b24157eff71fd5
 U drh
-Z 2d66e4ab4824193ca7a53544a03df80f
+Z 79840b805b40a8de29ae5e58e39914fc

diff --git a/manifest.uuid b/manifest.uuid
index 450fb8da107e4c0668beaf43431313fb99f94a88..5e658d06bba6b267ee288a04927d97a901d74013 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2c1e74e58a702fd2be954467a12e69a33b252831
\ No newline at end of file
+8d3e924975681a871e0eeac3b6a62cffdb947ac7
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index 490410661598d56afc204835948ad06e8a084902..156e6b901064ce5d0da39043959e44a988d31d8b 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -491,7 +491,7 @@ int acttab_insert(acttab *p){
   ** in the worst case.  The worst case occurs if the transaction set
   ** must be appended to the current action table
   */
-  n = p->mxLookahead - p->mnLookahead + 1;
+  n = p->mxLookahead + 1;
   if( p->nAction + n >= p->nActionAlloc ){
     int oldAlloc = p->nActionAlloc;
     p->nActionAlloc = p->nAction + n + p->nActionAlloc + 20;
@@ -514,7 +514,7 @@ int acttab_insert(acttab *p){
   **
   ** i is the index in p->aAction[] where p->mnLookahead is inserted.
   */
-  for(i=0; i<p->nAction; i++){
+  for(i=0; i<p->nAction+p->mnLookahead; i++){
     if( p->aAction[i].lookahead<0 ){
       for(j=0; j<p->nLookahead; j++){
         k = p->aLookahead[j].lookahead - p->mnLookahead + i;