Declare the Lemon-generated parser object as itself. (Duh)

FossilOrigin-Name: c8000e94cca59dabf83d6cb75b40441aaf793d29880582dc4baa17246449b5fe

diff --git a/manifest b/manifest
index a6d06256d5c9455362f7a64ce428dbd40ea148ec..eee647a65b002583b15ab6902693a576fc2e3d6a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sfor\sthe\snext\sdevelopment\scycle.
-D 2017-03-30T16:51:35.655
+C Declare\sthe\sLemon-generated\sparser\sobject\sas\sitself.\s\s(Duh)
+D 2017-03-30T17:13:37.978
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -461,7 +461,7 @@ F src/test_windirent.c 17f91f5f2aa1bb7328abb49414c363b5d2a9d3ff
 F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
-F src/tokenize.c d62a8f879807d100e681a039778ca1bcb018b6a0fc3c1b4173549ee61ee4b5cf
+F src/tokenize.c de2ec4fed5aa9770791be7528a08597a77a36b2ffbbeb0c2cb6951e80357730b
 F src/treeview.c 84d0ac737e1231702679f0289180021e19c5cc186ec413e8dcb704a887c76ec8
 F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
 F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
@@ -1569,7 +1569,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 1279de0b70cabf39899d92ece8852a780fd800bf3154971537b3427e5bd3ca50
-R 8c59842ddd3a3383c068f53bcfd4477a
+P 9e550ccc29f317422dae3a4bb89a78b839330825fecd40a01d1a2acc719cef79
+R 288166ae6bc74f6b9a15fa169ea78182
 U drh
-Z 6ac757072538aac0ef24b8822be39d2a
+Z 81f3770fca5082b63e34ff795f3d141f

diff --git a/manifest.uuid b/manifest.uuid
index 4c50a4ed46be4d5dfe666ce058cf8ff2bebe4044..5037f5012961842a577a1911641234cd45573a48 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e550ccc29f317422dae3a4bb89a78b839330825fecd40a01d1a2acc719cef79
\ No newline at end of file
+c8000e94cca59dabf83d6cb75b40441aaf793d29880582dc4baa17246449b5fe
\ No newline at end of file

diff --git a/src/tokenize.c b/src/tokenize.c
index 60df70c3c45541105f9b42fc6c4c65a31d2a638a..7f5f2989875375d50c1da7b8c302d2a6f61fd1a2 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -482,8 +482,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   sqlite3 *db = pParse->db;       /* The database connection */
   int mxSqlLen;                   /* Max length of an SQL string */
 #ifdef sqlite3Parser_ENGINEALWAYSONSTACK
-  /* Space to hold the Lemon-generated Parser object */
-  sqlite3_uint64 zSpace[(sizeof(yyParser)+7)/sizeof(sqlite_uint64)];
+  yyParser sEngine;    /* Space to hold the Lemon-generated Parser object */
 #endif
 
   assert( zSql!=0 );
@@ -496,7 +495,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   assert( pzErrMsg!=0 );
   /* sqlite3ParserTrace(stdout, "parser: "); */
 #ifdef sqlite3Parser_ENGINEALWAYSONSTACK
-  pEngine = zSpace;
+  pEngine = &sEngine;
   sqlite3ParserInit(pEngine);
 #else
   pEngine = sqlite3ParserAlloc(sqlite3Malloc);