Grammar changes: the sclp non-terminal should always be followed by a scanpt.

FossilOrigin-Name: 74a0181fc016fb0b7934188cfcc2ec26c689f0d33cc42453875f4392b7240d3a

diff --git a/manifest b/manifest
index 8e6b14968fb08db876707c0f18e93cc51d1d0509..bc08e70fd1915df08c48bbdacf9b46a4fbe681fe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sparser\stracing\soutput.
-D 2017-12-24T14:14:21.392
+C Grammar\schanges:\s\sthe\ssclp\snon-terminal\sshould\salways\sbe\sfollowed\sby\sa\sscanpt.
+D 2017-12-24T17:01:54.828
 F Makefile.in ceb40bfcb30ebba8e1202b34c56ff7e13e112f9809e2381d99be32c2726058f5
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6480671f7c129e61208d69492b3c71ce4310d49fceac83cfb17f1c081e242b69
@@ -467,7 +467,7 @@ F src/os_win.c 0a4afa35cc8e812000df3ea2f64b476131b39e29e75d8007d0504726e4761de4
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 07cf850241667874fcce9d7d924c814305e499b26c804322e2261247b5921903
 F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
-F src/parse.y 1e29222ba074fea8d84438098e00812071d4cfd34c8620f34accab7cd523a276
+F src/parse.y 2b0653fd44534d941ff5289f372fedfc213e78c4698e28334d073cf4cfd146f2
 F src/pcache.c 7ae91a4557a43d77d449accbfdc68846e6516f8e2eda46e8bbe4536fb669b201
 F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
 F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
@@ -1687,7 +1687,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 3eab7bdc44e0878b83dc86f27058a40c2ffafeacadc566f03693f6dc7e40a504
-R 35c7a29b183ac93da1a9be4e6a82bb63
+P c4951833c2b976223c2393d82fd2606068c71cd19612ca9df4e26debab980e32
+R bc2b2a8774f331c7775262d09dd60c38
 U drh
-Z 121e81b010860ccafac66f3ea34cc3c9
+Z a70d3a97910b6c52f1408e750f661b18

diff --git a/manifest.uuid b/manifest.uuid
index 519f0797758b5bf1a2f055096b3b68c320fed0fd..b5e2fe7f2b3858c7cc02f48192a3a15c1c318492 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c4951833c2b976223c2393d82fd2606068c71cd19612ca9df4e26debab980e32
\ No newline at end of file
+74a0181fc016fb0b7934188cfcc2ec26c689f0d33cc42453875f4392b7240d3a
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index d59426409c0a76ea0454465509e927bc7f672eff..fe2251db4b088d740c36e5bf4fb349041d14f819 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -575,7 +575,7 @@ selcollist(A) ::= sclp(A) scanpt(B) expr(X) scanpt(Z) as(Y).     {
    if( Y.n>0 ) sqlite3ExprListSetName(pParse, A, &Y, 1);
    sqlite3ExprListSetSpan(pParse,A,B,Z);
 }
-selcollist(A) ::= sclp(A) STAR. {
+selcollist(A) ::= sclp(A) scanpt STAR. {
   Expr *p = sqlite3Expr(pParse->db, TK_ASTERISK, 0);
   A = sqlite3ExprListAppend(pParse, A, p);
 }