diff options
author | Akim Demaille <akim@lrde.epita.fr> | 2012-06-05 14:06:08 +0200 |
---|---|---|
committer | Akim Demaille <akim@lrde.epita.fr> | 2012-06-05 14:07:43 +0200 |
commit | 527187137ac6314b86246bca71cb996203b4fa10 (patch) | |
tree | c21844210f2145922cb75739bdadbe487ae4c6d9 /tests/existing.at | |
parent | 398c298c8814ff5cc9c1fafc9cfaa26e331b4f79 (diff) | |
parent | dfaac272423687b604f5eb7c801cddadc231804c (diff) | |
download | bison-527187137ac6314b86246bca71cb996203b4fa10.tar.gz |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
version 2.5.1
NEWS: prepare for 2.5.1.
maint: update release procedure
maint: fix comment typos
maint: post-release administrivia
Conflicts:
NEWS
Diffstat (limited to 'tests/existing.at')
-rw-r--r-- | tests/existing.at | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/existing.at b/tests/existing.at index 61a50d00..2891f80b 100644 --- a/tests/existing.at +++ b/tests/existing.at @@ -1478,7 +1478,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]], %token RAND %token SRAND %token COPY -%token THRU +%token THROUGH %token TOP %token BOTTOM %token UPPER @@ -1604,12 +1604,12 @@ placeless_element: {} DELIMITED | COPY TEXT - | COPY TEXT THRU + | COPY TEXT THROUGH {} DELIMITED {} until - | COPY THRU + | COPY THROUGH {} DELIMITED {} |