Lemon enhancements: (1) Do not allocate space for the 'error' non-terminal

if it is not used. (2) Fix an off-by-one problem so that 'unsigned char' can
be used for symbol numbers if the number of symbols is 256.

FossilOrigin-Name: 3b7801acff91905d0e78e06121ebcf2664f6de5f605699dc8726ec9bcb558eb8

diff --git a/manifest b/manifest
index db3eba976c95a16ccfc3008e5db4c9e9bdb55d98..cab23c4e3b074f172d2fea77609f94a8e824840e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.24.0
-D 2018-04-16T10:41:15.351
+C Lemon\senhancements:\s\s(1)\sDo\snot\sallocate\sspace\sfor\sthe\s'error'\snon-terminal\nif\sit\sis\snot\sused.\s(2)\sFix\san\soff-by-one\sproblem\sso\sthat\s'unsigned\schar'\scan\nbe\sused\sfor\ssymbol\snumbers\sif\sthe\snumber\sof\ssymbols\sis\s256.
+D 2018-04-16T14:31:34.763
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1636,7 +1636,7 @@ F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c c1a87d15983f96851b253707985dba8783fbe41ba21ba1b76720e06c8a262206
+F tool/lemon.c 3b5fb488c6b27e7cc4e3191cc1014af6d6250786dcae02991fb0df0d598fc5df
 F tool/lempar.c 468a155e8729cfbccfe1d85bf60d064f1dab76167a51149ec5c7928a2de63953
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
@@ -1717,7 +1717,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 dba3095feeeb55b5c0ebe33bdd4be8ba1f24478406685d3a042a69d9c380e742
-R 50577be4101ba6800e0ceb3fdb5a7f41
+P f94528e1c70765c8649750b2d9c17f23e81f191554ff56d905a9abe3fb6037b7
+R 18b312f44245c8bb0efcaee081107bdf
 U drh
-Z fd8d37ec919dd409461d7d6bfec613a5
+Z 3fd29baec877178d68467f0290bb20cf

diff --git a/manifest.uuid b/manifest.uuid
index a7a4e35008602b7cb71ed28747f890eeac1dda82..68e356fdbcf71c8917dd741ea856c45fb87eaaa0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f94528e1c70765c8649750b2d9c17f23e81f191554ff56d905a9abe3fb6037b7
\ No newline at end of file
+3b7801acff91905d0e78e06121ebcf2664f6de5f605699dc8726ec9bcb558eb8
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index f06a14fb873bcb47ad73f0e8bbc5471ad23d7182..d42584d107e6f32b1428d8a408d6cfe2c487811c 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -1663,8 +1663,6 @@ int main(int argc, char **argv)
   lem.basisflag = basisflag;
   lem.nolinenosflag = nolinenosflag;
   Symbol_new("$");
-  lem.errsym = Symbol_new("error");
-  lem.errsym->useCnt = 0;
 
   /* Parse the input file */
   Parse(&lem);
@@ -1673,6 +1671,7 @@ int main(int argc, char **argv)
     fprintf(stderr,"Empty grammar.\n");
     exit(1);
   }
+  lem.errsym = Symbol_find("error");
 
   /* Count and index the symbols of the grammar */
   Symbol_new("{default}");
@@ -3994,7 +3993,7 @@ void print_stack_union(
     fprintf(out,"  %s yy%d;\n",types[i],i+1); lineno++;
     free(types[i]);
   }
-  if( lemp->errsym->useCnt ){
+  if( lemp->errsym && lemp->errsym->useCnt ){
     fprintf(out,"  int yy%d;\n",lemp->errsym->dtnum); lineno++;
   }
   free(stddt);
@@ -4144,8 +4143,8 @@ void ReportTable(
 
   /* Generate the defines */
   fprintf(out,"#define YYCODETYPE %s\n",
-    minimum_size_type(0, lemp->nsymbol+1, &szCodeType)); lineno++;
-  fprintf(out,"#define YYNOCODE %d\n",lemp->nsymbol+1);  lineno++;
+    minimum_size_type(0, lemp->nsymbol, &szCodeType)); lineno++;
+  fprintf(out,"#define YYNOCODE %d\n",lemp->nsymbol);  lineno++;
   fprintf(out,"#define YYACTIONTYPE %s\n",
     minimum_size_type(0,lemp->maxAction,&szActionType)); lineno++;
   if( lemp->wildcard ){
@@ -4183,7 +4182,7 @@ void ReportTable(
   if( mhflag ){
     fprintf(out,"#endif\n"); lineno++;
   }
-  if( lemp->errsym->useCnt ){
+  if( lemp->errsym && lemp->errsym->useCnt ){
     fprintf(out,"#define YYERRORSYMBOL %d\n",lemp->errsym->index); lineno++;
     fprintf(out,"#define YYERRSYMDT yy%d\n",lemp->errsym->dtnum); lineno++;
   }