diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-01-13 10:18:26 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-01-13 12:05:15 +0100 |
| commit | 59420cd7162dee87e098360e3b1a86eff83835e3 (patch) | |
| tree | dd6ba514fd7fb1be393b2cdd48fe0310f344234e | |
| parent | 09aa8a885b40a1edd6e849215fd398438945b62e (diff) | |
| download | bison-59420cd7162dee87e098360e3b1a86eff83835e3.tar.gz | |
maint: avoid "the the"
* djgpp/README.in: s/the the/the/
* src/parse-gram.c (lloc_default): Likewise.
* src/parse-gram.y (lloc_default): Likewise, and remove a
trailing space.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | djgpp/README.in | 2 | ||||
| -rw-r--r-- | src/parse-gram.c | 2 | ||||
| -rw-r--r-- | src/parse-gram.y | 4 |
4 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2012-01-13 Jim Meyering <meyering@redhat.com> + + maint: avoid "the the" + * djgpp/README.in: s/the the/the/ + * src/parse-gram.c (lloc_default): Likewise. + * src/parse-gram.y (lloc_default): Likewise, and remove a + trailing space. + 2012-01-13 Akim Demaille <akim@lrde.epita.fr> maint: factor copyright year. diff --git a/djgpp/README.in b/djgpp/README.in index df29f69b..154c8a29 100644 --- a/djgpp/README.in +++ b/djgpp/README.in @@ -84,7 +84,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. some more work to unpack, if LFN support is not available. If LFN is available then you can extract the source files from the archive with any unzip program and proceed to the paragraph 3.3, below. Any file - name issue will be handled by the the DJGPP configuration files. + name issue will be handled by the DJGPP configuration files. To unpack the source distribution on SFN systems, first, you MUST use the `djunpack' batch file to unzip the package. That is because some file names in the official distributions need to be changed to avoid diff --git a/src/parse-gram.c b/src/parse-gram.c index d20bbf6d..637cc35b 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -3350,7 +3350,7 @@ lloc_default (YYLTYPE const *rhs, int n) loc.start = rhs[n].end; loc.end = rhs[n].end; - /* Ignore empty nonterminals the start of the the right-hand side. + /* Ignore empty nonterminals the start of the right-hand side. Do not bother to ignore them at the end of the right-hand side, since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) diff --git a/src/parse-gram.y b/src/parse-gram.y index 19c2f5b0..01b640df 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -608,7 +608,7 @@ rhs: { grammar_current_rule_symbol_append ($2, @2, $3); } | rhs "{...}" named_ref.opt { grammar_current_rule_action_append ($2, @2, $3, false); } -| rhs "%?{...}" +| rhs "%?{...}" { grammar_current_rule_action_append ($2, @2, NULL, true); } | rhs "%prec" symbol { grammar_current_rule_prec_set ($3, @3); } @@ -729,7 +729,7 @@ lloc_default (YYLTYPE const *rhs, int n) loc.start = rhs[n].end; loc.end = rhs[n].end; - /* Ignore empty nonterminals the start of the the right-hand side. + /* Ignore empty nonterminals the start of the right-hand side. Do not bother to ignore them at the end of the right-hand side, since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) |