summaryrefslogtreecommitdiff
path: root/lang/sql/sqlite/doc/lemon.html
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2015-02-17 17:25:57 +0000
committer <>2015-03-17 16:26:24 +0000
commit780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch)
tree598f8b9fa431b228d29897e798de4ac0c1d3d970 /lang/sql/sqlite/doc/lemon.html
parent7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff)
downloadberkeleydb-master.tar.gz
Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master
Diffstat (limited to 'lang/sql/sqlite/doc/lemon.html')
-rw-r--r--lang/sql/sqlite/doc/lemon.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/sql/sqlite/doc/lemon.html b/lang/sql/sqlite/doc/lemon.html
index 6a4d6dbd..b16e3596 100644
--- a/lang/sql/sqlite/doc/lemon.html
+++ b/lang/sql/sqlite/doc/lemon.html
@@ -282,7 +282,7 @@ tokens) and it honors the same commenting conventions as C and C++.</p>
<p>A terminal symbol (token) is any string of alphanumeric
and underscore characters
that begins with an upper case letter.
-A terminal can contain lower class letters after the first character,
+A terminal can contain lowercase letters after the first character,
but the usual convention is to make terminals all upper case.
A nonterminal, on the other hand, is any string of alphanumeric
and underscore characters than begins with a lower case letter.
@@ -481,7 +481,7 @@ as follows:
<li> If the precedences are the same and the shift token is
right-associative, then resolve in favor of the shift.
No parsing conflict is reported.
-<li> If the precedences are the same the the shift token is
+<li> If the precedences are the same the shift token is
left-associative, then resolve in favor of the reduce.
No parsing conflict is reported.
<li> Otherwise, resolve the conflict by doing the shift and