From: drh Date: Fri, 27 May 2016 01:07:18 +0000 (+0000) Subject: Fix the Lemon-generated parser so that it compiles with -DYYSTACKDEPTH=0. X-Git-Tag: version-3.14.0~129 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baf254aef9bc88bc152f99422939c7482e83e1c6;p=thirdparty%2Fsqlite.git Fix the Lemon-generated parser so that it compiles with -DYYSTACKDEPTH=0. It does compile now, but there are subtle issues still. FossilOrigin-Name: 28d439f816d2fa5263e1c4ddecf3bf1ac2dd6549 --- diff --git a/manifest b/manifest index 88f7d0cd56..cfe2236da5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\snew\sOP_SeekRowid\sopcode,\sthat\scombines\sthe\sfunctions\sof\sOP_MustBeInt\nand\sOP_NotExists.\s\sThis\smakes\sthe\scode\sslightly\ssmaller\sand\sfaster. -D 2016-05-26T20:56:38.450 +C Fix\sthe\sLemon-generated\sparser\sso\sthat\sit\scompiles\swith\s-DYYSTACKDEPTH=0.\nIt\sdoes\scompile\snow,\sbut\sthere\sare\ssubtle\sissues\sstill. +D 2016-05-27T01:07:18.565 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -1423,7 +1423,7 @@ F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce F tool/lemon.c 09a96bed19955697a5e20c49ad863ec2005815a2 -F tool/lempar.c 1f69ad7531e39612915570a3d2c67a3cc1e9bbf0 +F tool/lempar.c 7689ddc408a54f9c23e7f9e17e597752b71fa537 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca @@ -1495,7 +1495,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 2a41f098b2f0523b3d7e6eba6ae91cc0d30752df -R 810bd747b437c6e4e76eef1099520866 +P ffe80a1bfa014943a614fc6993c1749b9bfec4c1 +R 8a7f49776364e838d9d2230beef644f3 U drh -Z 73ea989f24641ac606e6e6c2f5b60872 +Z 81291c1e83b5b57f970177cd78c139d0 diff --git a/manifest.uuid b/manifest.uuid index 9a103ac06c..c2da443b16 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ffe80a1bfa014943a614fc6993c1749b9bfec4c1 \ No newline at end of file +28d439f816d2fa5263e1c4ddecf3bf1ac2dd6549 \ No newline at end of file diff --git a/tool/lempar.c b/tool/lempar.c index 91f3549f31..e96d6c9e7f 100644 --- a/tool/lempar.c +++ b/tool/lempar.c @@ -582,7 +582,7 @@ static void yy_shift( #else if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){ yyGrowStack(yypParser); - if( yypParser->yytos>=&yypParser->yystach[yypParser->yystksz] ){ + if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){ yyStackOverflow(yypParser); return; }