From: drh <drh@noemail.net>
Date: Mon, 11 May 2009 18:22:30 +0000 (+0000)
Subject: Enhance the parser to allow nested parentheses in the module argument of
X-Git-Tag: version-3.6.15~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aaac8b4e1bcd9d7e61d30ceb2ff0169c9e11a951;p=thirdparty%2Fsqlite.git

Enhance the parser to allow nested parentheses in the module argument of
a CREATE VIRTUAL TABLE statement. (CVS 6625)

FossilOrigin-Name: 93772bd7f56a5158eb46a992ba932f4695cb219f
---

diff --git a/manifest b/manifest
index 91ffc21f29..4fe50d4bc5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\san\salways-true\scondition\sin\shash.c\sinto\san\sassert().\s(CVS\s6624)
-D 2009-05-09T23:29:12
+C Enhance\sthe\sparser\sto\sallow\snested\sparentheses\sin\sthe\smodule\sargument\sof\na\sCREATE\sVIRTUAL\sTABLE\sstatement.\s(CVS\s6625)
+D 2009-05-11T18:22:31
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -148,7 +148,7 @@ F src/os_unix.c e55d977c516ed880a2f83f0610b019efd9f8bc06
 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
 F src/pager.c e7171336ffb0f8adc41e55b63dbb2bc5a616a1ae
 F src/pager.h 73f481a308a873ccd626d97331c081db3b53e2e5
-F src/parse.y a0e8b8e5d646a6352098fccc9d3325b4234a05b9
+F src/parse.y ba2fa210be4b17001e0a16d5e73a8141939b1987
 F src/pcache.c 395f752a13574120bd7513a400ba02a265aaa76d
 F src/pcache.h 9b927ccc5a538e31b4c3bc7eec4f976db42a1324
 F src/pcache1.c a6138ee57da3259149ca5254e0156d9b624db850
@@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 38df91c2edebee22d02b5f84260ee9e5e14db48e
-R 32e092e7dc953c9fbb0f589e2f5e3cb3
+P 4237299935b8bf8c346aacba021113224813bcb9
+R 1225b5a79e6cc1b94c2e3a763a216c4a
 U drh
-Z 7d43c43fd9901e26747295890c55279b
+Z 956880f802a30c9fa51b8f0d5897cb04
diff --git a/manifest.uuid b/manifest.uuid
index 79e2880e6d..1b443e483f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4237299935b8bf8c346aacba021113224813bcb9
\ No newline at end of file
+93772bd7f56a5158eb46a992ba932f4695cb219f
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index 26017bdcbc..43124abb40 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.275 2009/05/01 21:13:37 drh Exp $
+** @(#) $Id: parse.y,v 1.276 2009/05/11 18:22:31 drh Exp $
 */
 
 // All token codes are small integers with #defines that begin with "TK_"
@@ -1201,5 +1201,6 @@ vtabargtoken ::= ANY(X).            {sqlite3VtabArgExtend(pParse,&X);}
 vtabargtoken ::= lp anylist RP(X).  {sqlite3VtabArgExtend(pParse,&X);}
 lp ::= LP(X).                       {sqlite3VtabArgExtend(pParse,&X);}
 anylist ::= .
-anylist ::= anylist ANY(X).         {sqlite3VtabArgExtend(pParse,&X);}
+anylist ::= anylist LP anylist RP.
+anylist ::= anylist ANY.
 %endif  SQLITE_OMIT_VIRTUALTABLE