| Index: third_party/sqlite/src/doc/lemon.html
|
| diff --git a/third_party/sqlite/src/doc/lemon.html b/third_party/sqlite/src/doc/lemon.html
|
| index 6a4d6dbd2c82aa3e962ec9d54bd5c057a79b8b45..b16e35960ef9e44d390cbb4c7f7eafbc19160ae0 100644
|
| --- a/third_party/sqlite/src/doc/lemon.html
|
| +++ b/third_party/sqlite/src/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
|
|
|