From 92395c59ffb9bd55efe146d2233dc7ae6e8ad4f9 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 4 Jul 2017 12:50:00 +0000 Subject: [PATCH] Fix a problem in the lempar.c Lemon template for YYSTACKDEPTH<=0 introduced by check-in [36e54cd8b1fb37] FossilOrigin-Name: 268a40f44cea6c3f561b7f54c90d631877be44292911424bac24f72c5ee87d60 --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/lempar.c | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index d65b1d2f76..1d1923f6df 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scompiler\swarnings\sin\sLSM1,\sespecially\sin\sthe\stest\slogic. -D 2017-07-03T21:09:28.601 +C Fix\sa\sproblem\sin\sthe\slempar.c\sLemon\stemplate\sfor\sYYSTACKDEPTH<=0\sintroduced\nby\scheck-in\s[36e54cd8b1fb37] +D 2017-07-04T12:50:00.595 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a @@ -1554,7 +1554,7 @@ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f F tool/lemon.c 5a04dff28578a67415cea5bf981b893c50cebfdd4388fb21254d1892525edfd8 -F tool/lempar.c f0dc07c2838febff4c34244651a6932fceb523065e6fe79bacfaa93019cc8cca +F tool/lempar.c 10579a61dc2290182725e7abdefe311dd8b521a8f7f0aabbfc571e9012a09eaf F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca @@ -1628,7 +1628,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 b2c2487928becbea5a932895d153709c98a057a3c71c2600e165478562e9f7c5 -R bcb7ebe8efca15287f517b1401472d17 +P 9bd3be92b8add7bd0d7bc4b0742b2dd227ebb8d67a839b78f26f2b06b47490f2 +R 6123d7ea6d11ea29ab25a0b4d8aef3db U drh -Z 118d9f2944646b21169b67bb250f000b +Z c46d7ca565a10ec21d2e001f5aa7a07c diff --git a/manifest.uuid b/manifest.uuid index f7336f8269..a2107d93a6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9bd3be92b8add7bd0d7bc4b0742b2dd227ebb8d67a839b78f26f2b06b47490f2 \ No newline at end of file +268a40f44cea6c3f561b7f54c90d631877be44292911424bac24f72c5ee87d60 \ No newline at end of file diff --git a/tool/lempar.c b/tool/lempar.c index 4a98d23700..03e30bd164 100644 --- a/tool/lempar.c +++ b/tool/lempar.c @@ -339,7 +339,9 @@ void ParseInit(void *yypParser){ pParser->yytos = pParser->yystack; pParser->yystack[0].stateno = 0; pParser->yystack[0].major = 0; +#if YYSTACKDEPTH>0 pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1]; +#endif } #ifndef Parse_ENGINEALWAYSONSTACK