In lemon: omit unused entries from the end of the yyFallback array. (CVS 6754)

FossilOrigin-Name: 9cfbe2ba68470a2850a7d7a64eb088f7b422a3e5

diff --git a/manifest b/manifest
index eed55e26265850603fca91f2661b8fb17e0ded7d..f263a50b64a243bcf56e69742056a9d7d32b8cec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\sthe\sSQLITE_LIMIT_FUNCTION_ARG\slimiter.\s(CVS\s6753)
-D 2009-06-12T12:04:16
+C In\slemon:\somit\sunused\sentries\sfrom\sthe\send\sof\sthe\syyFallback\sarray.\s(CVS\s6754)
+D 2009-06-12T12:50:51
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -714,7 +714,7 @@ F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 405a43d54f1646bfaa7a84b03bb959aef62a3a49
-F tool/lemon.c 1a94e70103e59f20df8f81539a453629df2aa523
+F tool/lemon.c ef864b9566d4e62cc9d0ee4ac937dd1264490d27
 F tool/lempar.c d2fbe360eb398075947ba6de9197f99247d3d5a8
 F tool/mkkeywordhash.c 511a848b2ac7a3d93f36adc1e1086b4c5741224b
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
@@ -734,7 +734,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P bc729bc3e6f6e3570103e646080eb119311b0fa7
-R dcf2433cc76e84aaf0238602ef723d94
+P a17e3317176772446abdc8ebe6fb6f0d3b7ac018
+R 99671adf6d4ab3cc561d188e482f7017
 U drh
-Z c579fe02fd243a6ebb0b2fb7a4beda49
+Z 201c718738a93aa053a9925b7422ae62

diff --git a/manifest.uuid b/manifest.uuid
index 0239aeef6a3b30e95675148c54b3506ce4699c2f..a8fa9862472a2684567c65c051470a84cb8a0fdf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a17e3317176772446abdc8ebe6fb6f0d3b7ac018
\ No newline at end of file
+9cfbe2ba68470a2850a7d7a64eb088f7b422a3e5
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index 661069262c63981bf792ed83a5b9cfff45abb43d..d69efae77844f4b3aa68361b9c893bcb7882aa3d 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -3814,7 +3814,9 @@ int mhflag;     /* Output in makeheaders format if true */
   /* Generate the table of fallback tokens.
   */
   if( lemp->has_fallback ){
-    for(i=0; i<lemp->nterminal; i++){
+    int mx = lemp->nterminal - 1;
+    while( mx>0 && lemp->symbols[mx]->fallback==0 ){ mx--; }
+    for(i=0; i<=mx; i++){
       struct symbol *p = lemp->symbols[i];
       if( p->fallback==0 ){
         fprintf(out, "    0,  /* %10s => nothing */\n", p->name);