Fix a bug in lemon. The code in which the error appears might well be

unreachable.  The changes does not effect the code that is generated for
the SQLite parser.  Ticket #2164. (CVS 3591)

FossilOrigin-Name: f4ee5d83e177e7ed9f180454c01d46a395a5715d

diff --git a/manifest b/manifest
index b48f45755ba00a5035b19bc115fdac18a0459074..b7944618fee6a1a28cac886024e49bf3cad63391 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sAreFileApisANSI()\scall\sa\smacro\swith\sa\svalue\sof\s1\son\swince.\nTicket\s#2163.\s(CVS\s3590)
-D 2007-01-10T18:56:15
+C Fix\sa\sbug\sin\slemon.\s\sThe\scode\sin\swhich\sthe\serror\sappears\smight\swell\sbe\nunreachable.\s\sThe\schanges\sdoes\snot\seffect\sthe\scode\sthat\sis\sgenerated\sfor\nthe\sSQLite\sparser.\s\sTicket\s#2164.\s(CVS\s3591)
+D 2007-01-12T23:09:23
 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -353,7 +353,7 @@ F test/where.test 8dcc1b1a6f17b6bad2dc6a9917eafe62d4ea57eb
 F test/where2.test 61d5b20d9bedc8788a773bbdc5b2ef887725928e
 F test/where3.test 0a30fe9808b0fa01c46d0fcf4fac0bf6cf75bb30
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
-F tool/lemon.c c200a81e346853c2902d5c43de8274af627a72bb
+F tool/lemon.c 29d1bd8db8d5fbb1c577358632a96d716a435324
 F tool/lempar.c 0a2a5cf96a98a64a5594625ad8fbdbe41dbaca50
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
@@ -424,7 +424,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 85b5d446b03cd0eb06a41a755f97295c98991a75
-R e51c4680d21481e757ca41421fcdfd90
+P a72c950cdbb7ad14572ccdf9b94ceac8ea0a2588
+R a1da9ce500d2686501613055e18f40fb
 U drh
-Z f7c290e18aa4f98f5d2793ce60fd109d
+Z cff8f63e04aa969446fdc95d5a9c4056

diff --git a/manifest.uuid b/manifest.uuid
index 6ac152d10baa0f8ec8fa3b13c7ec17ad16120f5c..573e59e0cfb1319b59bafba471316af6edd4105b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a72c950cdbb7ad14572ccdf9b94ceac8ea0a2588
\ No newline at end of file
+f4ee5d83e177e7ed9f180454c01d46a395a5715d
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index dbb00c14d80ac83b532cf78574402efb96a8c020..84d462a0770dce4d9dad35bd8ee1cfa9515b7968 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -3625,7 +3625,7 @@ int mhflag;     /* Output in makeheaders format if true */
   n = acttab_size(pActtab);
   for(i=j=0; i<n; i++){
     int action = acttab_yyaction(pActtab, i);
-    if( action<0 ) action = lemp->nsymbol + lemp->nrule + 2;
+    if( action<0 ) action = lemp->nstate + lemp->nrule + 2;
     if( j==0 ) fprintf(out," /* %5d */ ", i);
     fprintf(out, " %4d,", action);
     if( j==9 || i==n-1 ){