From: drh <drh@noemail.net>
Date: Mon, 20 Feb 2017 14:30:17 +0000 (+0000)
Subject: Small grammar simplification.
X-Git-Tag: version-3.18.0~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e84b377a911ae9fb882dcf9eba23f90b59a849c;p=thirdparty%2Fsqlite.git

Small grammar simplification.

FossilOrigin-Name: 0d8a868acd74fb1d076f23fda58b841bb7e6900b
---

diff --git a/manifest b/manifest
index 44763338e4..ab58b869fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_BUG_COMPATIBLE_20160819\scompile-time\soption\sto\somit\sthe\serror\nmessage\swhen\san\sunrecognized\sargument\sis\sprovided\sto\sthe\sVACUUM\scommand.
-D 2017-02-18T13:47:11.181
+C Small\sgrammar\ssimplification.
+D 2017-02-20T14:30:17.816
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -383,7 +383,7 @@ F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
-F src/parse.y 591704fce84f814d9a3642774c1f011d38f4149c
+F src/parse.y af8830094f4aecb91cb69721f3601ad10c36abc4
 F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
@@ -1556,7 +1556,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 8cc9d74c176a78aeebfbb39198c21b5dd547ff52
-R 57839b570efd132c834489fe34d93e5e
+P 491814272dce7e937b4734fcbc2ad69e12377b56
+R b4cf79fa4c0fd30460236bc8c090e993
 U drh
-Z 38cfd439ab0cfeae01cbf1d291727475
+Z 32b02aa6638f1e40c7df4614e1f90d4a
diff --git a/manifest.uuid b/manifest.uuid
index 557d9a7e8b..c411ab59d6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-491814272dce7e937b4734fcbc2ad69e12377b56
\ No newline at end of file
+0d8a868acd74fb1d076f23fda58b841bb7e6900b
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index 9cada2a1be..0949e97d16 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1000,7 +1000,7 @@ expr(A) ::= expr(A) STAR|SLASH|REM(OP) expr(Y).
                                         {spanBinaryExpr(pParse,@OP,&A,&Y);}
 expr(A) ::= expr(A) CONCAT(OP) expr(Y). {spanBinaryExpr(pParse,@OP,&A,&Y);}
 %type likeop {Token}
-likeop(A) ::= LIKE_KW|MATCH(X).     {A=X;/*A-overwrites-X*/}
+likeop(A) ::= LIKE_KW|MATCH(A).
 likeop(A) ::= NOT LIKE_KW|MATCH(X). {A=X; A.n|=0x80000000; /*A-overwrite-X*/}
 expr(A) ::= expr(A) likeop(OP) expr(Y).  [LIKE_KW]  {
   ExprList *pList;