Remove an unused non-terminal from the grammar.

FossilOrigin-Name: 3c37c522883ea9f2eec4f0ba5c5141912c003425

diff --git a/manifest b/manifest
index 898e6a7736e782b711e8ebc04f623bedffea914f..a06ddf0f8425e4efef7d31d528f9f341fb179c76 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scomment\stypo\sin\sthe\slempar.c\stemplate\sthat\swas\smissed\sby\sthe\sprior\ncheck-in.
-D 2015-11-09T19:35:18.284
+C Remove\san\sunused\snon-terminal\sfrom\sthe\sgrammar.
+D 2015-11-10T00:02:49.412
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -328,7 +328,7 @@ F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c ed5cff11793b6a4146582aabb29ed8613a6cf89e
 F src/pager.h 7fc069c07f3120ee466ff3d48a9d376974ebffa7
-F src/parse.y 89784cfb2a421e4c2257b3dac86bb79096eaa9b9
+F src/parse.y 56cd095d669ad7cf50599a39525277f37f8148f9
 F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
 F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
 F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
@@ -1402,7 +1402,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0a72991f4e54548f6c3268c5a9cac1c8d6437d26
-R 8fab66a5e8d9eb9e711e67490ab1fb25
+P c4a7e93fca622fd11a6e16161fbd2f39c2575f00
+R 718dc1350ed033f1faf4636e4683af75
 U drh
-Z b603d5d9eb956db724fe6f00475658c3
+Z ed4dab40ca0663dda7ca06a05db43ba5

diff --git a/manifest.uuid b/manifest.uuid
index 58748396f4720b94bbd7ba341d1a2ff0ba5f50b2..7b89cfcfaa6330f0e5734886d9a672783d0fd6da 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c4a7e93fca622fd11a6e16161fbd2f39c2575f00
\ No newline at end of file
+3c37c522883ea9f2eec4f0ba5c5141912c003425
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index 220df636817f79ce8ea68a14cb1597bbc0a2ae49..842bf306e081742b1ef23d4da75800517edda179 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -651,7 +651,6 @@ dbnm(A) ::= DOT nm(X). {A = X;}
 fullname(A) ::= nm(X) dbnm(Y).  {A = sqlite3SrcListAppend(pParse->db,0,&X,&Y);}
 
 %type joinop {int}
-%type joinop2 {int}
 joinop(X) ::= COMMA|JOIN.              { X = JT_INNER; }
 joinop(X) ::= JOIN_KW(A) JOIN.         { X = sqlite3JoinType(pParse,&A,0,0); }
 joinop(X) ::= JOIN_KW(A) nm(B) JOIN.   { X = sqlite3JoinType(pParse,&A,&B,0); }