From: drh <> Date: Mon, 22 Jul 2024 19:31:47 +0000 (+0000) Subject: Fix undesirable C++-style comments in the parser. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddd2d67fdc98283566cb720949f614174cb93367;p=thirdparty%2Fsqlite.git Fix undesirable C++-style comments in the parser. FossilOrigin-Name: e330596aed7a8a117551890535b317bc4bca557a4ea1b6b86ef4cc275082f13f --- diff --git a/manifest b/manifest index ab08731b18..9540b5a75b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\sabort\sthe\sresolver\searly\sif\sa\sLIMIT\sexpression\sdoes\snot\sresolve,\sas\nthat\scan\sresult\sin\sa\smemory\sleak. -D 2024-07-22T17:09:30.553 +C Fix\sundesirable\sC++-style\scomments\sin\sthe\sparser. +D 2024-07-22T19:31:47.327 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -744,7 +744,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a -F src/parse.y a166e49fbb7ea11f62e7a0a540dcf1faa203a67138132fcadee0760e99eea77d +F src/parse.y 4bd8b449ca520f7362bcd5d48992439dcc297ca2f1f37f0b5ed771ccda9907a5 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319 @@ -2196,8 +2196,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 0a2531c3a3750fd22360595274eb97fa66d17a90502180b7b11adc5b136da5ed -R dec238c5a9346c3f0443bc20a366e7c8 +P ac6dc8c605374fbc955d3ba8c030334c085dda1bc75fdbd7d381da97b3fa341e +R c7a6665496d38985901a72c91a76ec27 U drh -Z 0a42b253973367d8067bc6c0cdb43155 +Z 255f5e9d8dd857bc8746b36351514f4d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1cecd8e021..725fd6a474 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ac6dc8c605374fbc955d3ba8c030334c085dda1bc75fdbd7d381da97b3fa341e +e330596aed7a8a117551890535b317bc4bca557a4ea1b6b86ef4cc275082f13f diff --git a/src/parse.y b/src/parse.y index 0690dd351f..e6071c65d5 100644 --- a/src/parse.y +++ b/src/parse.y @@ -733,12 +733,13 @@ seltablist(A) ::= stl_prefix(A) nm(Y) dbnm(D) LP exprlist(E) RP as(Z) on_using(N A = sqlite3SrcListAppendFromTerm(pParse,A,0,0,&Z,S,&N); } seltablist(A) ::= stl_prefix(A) nm(Y) dbnm(D) LP select(S) RP as(Z) on_using(N). { - // \___________/ - // | - // This must be a single identifier token "LATERAL". We cannot make - // LATERAL a keyword, since there might be legacy databases that - // use "lateral" as a table name and a table name is valid syntax - // in this position. + /* \___________/ + ** | + ** This must be a single identifier token "LATERAL". We cannot make + ** LATERAL a keyword, since there might be legacy databases that + ** use "lateral" as a table name and a table name is valid syntax + ** in this position. + */ SrcList *pSrc = A; if( Y.n!=7 || sqlite3StrNICmp(Y.z,"lateral",7)!=0 || D.z!=0 ){ sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", &Y);