Lemon correctly recognizes an empty grammar and errors out.

Fix for a bug reported on the sqlite-users mailing list. (CVS 3226)

FossilOrigin-Name: 55392922686691db3d41525a7f4cb7f976e73467

diff --git a/manifest b/manifest
index c85df4dee044214fb0cdc2d5bfa525e5a79b0c9d..617b03fa3342d3f84e8bae879c1af96919bef0d8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Free\serror\smessage\sstring\sin\sthe\squick\sstart\sexample.\s(CVS\s3225)
-D 2006-06-13T11:27:22
+C Lemon\scorrectly\srecognizes\san\sempty\sgrammar\sand\serrors\sout.\nFix\sfor\sa\sbug\sreported\son\sthe\ssqlite-users\smailing\slist.\s(CVS\s3226)
+D 2006-06-13T13:27:47
 F Makefile.in 56fd6261e83f60724e6dcd764e06ab68cbd53909
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -292,7 +292,7 @@ F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
 F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
 F test/where3.test 3b5ad2c58069e12be2bd86bc5e211a82810521aa
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
-F tool/lemon.c 64aa2436ef7fcc1a6dc49bf205225a542fc05c48
+F tool/lemon.c c0ff92f7d44e108be8499d553f6fd7041487e707
 F tool/lempar.c bd4efbd36f7dab8740408479a47ae48d5ae078a7
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
@@ -363,7 +363,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P dae71de10d0f34a001b8070266d4016baafa6623
-R e7376a83f134c36434881f57eb210665
+P 1273261ba7a21062217e7fbc3447b5dadf53010f
+R 146414985fadd865b1b6e26a67559392
 U drh
-Z 57bb6b23cb2de5c6b49e04e433b0f4dd
+Z f01f64f9187ce173db934fba71a8e2fd

diff --git a/manifest.uuid b/manifest.uuid
index 620ed77714230c1d05aec41dfc7c706a81d8d812..4c540771604ebef8122e696156cd74a1fba92c6b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1273261ba7a21062217e7fbc3447b5dadf53010f
\ No newline at end of file
+55392922686691db3d41525a7f4cb7f976e73467
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index f7c12814bc0174835a64750cb8caad5e19dcc2a3..b2727c82a1783210814f6f9fd836ae5552e9c13a 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -1423,6 +1423,7 @@ char **argv;
     fprintf(stderr,"Exactly one filename argument is required.\n");
     exit(1);
   }
+  memset(&lem, 0, sizeof(lem));
   lem.errorcnt = 0;
 
   /* Initialize the machine */
@@ -1432,23 +1433,13 @@ char **argv;
   lem.argv0 = argv[0];
   lem.filename = OptArg(0);
   lem.basisflag = basisflag;
-  lem.has_fallback = 0;
-  lem.nconflict = 0;
-  lem.name = lem.include = lem.arg = lem.tokentype = lem.start = 0;
-  lem.vartype = 0;
-  lem.stacksize = 0;
-  lem.error = lem.overflow = lem.failure = lem.accept = lem.tokendest =
-     lem.tokenprefix = lem.outname = lem.extracode = 0;
-  lem.vardest = 0;
-  lem.tablesize = 0;
   Symbol_new("$");
   lem.errsym = Symbol_new("error");
-  lem.wildcard = 0;
 
   /* Parse the input file */
   Parse(&lem);
   if( lem.errorcnt ) exit(lem.errorcnt);
-  if( lem.rule==0 ){
+  if( lem.nrule==0 ){
     fprintf(stderr,"Empty grammar.\n");
     exit(1);
   }