diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-10-16 15:26:55 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-10-16 15:26:55 +0200 |
| commit | 8ea6525e3a092b76256fbed7d6edbb0a1861aee1 (patch) | |
| tree | b116d2f559746be12133f296d2613009cab5285e /tests/java.at | |
| parent | f3bc338643cf15f345fa3a63811bd92869a42b89 (diff) | |
| parent | 7287be84f10886ea3c38ac86da1d6642822b671e (diff) | |
| download | bison-8ea6525e3a092b76256fbed7d6edbb0a1861aee1.tar.gz | |
Merge branch 'maint'
* origin/maint:
java: use api.location.type and api.position.type
Conflicts:
NEWS
data/java.m4
doc/bison.texi
tests/java.at
Diffstat (limited to 'tests/java.at')
| -rw-r--r-- | tests/java.at | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/java.at b/tests/java.at index 5b0c1528..1c9bd50d 100644 --- a/tests/java.at +++ b/tests/java.at @@ -752,7 +752,7 @@ AT_CHECK_JAVA_MINIMAL([[ %define stype "java.awt.Color" %type<java.awt.Color> start; %define api.location.type "MyLoc" -%define position_type "MyPos" +%define api.position.type "MyPos" %code { class MyPos {} }]], [[$$ = $<java.awt.Color>1;]], [[MyPos]]) AT_CHECK([[grep 'java.awt.Color' YYParser.java]], [0], [ignore]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore]) @@ -762,7 +762,7 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[ %define stype "java.awt.Color" %type<java.awt.Color> start; %define api.location.type "MyLoc" -%define position_type "MyPos" +%define api.position.type "MyPos" %code { class MyPos {} }]], [], [[return EOF;]], [], [[$$ = $<java.awt.Color>1;]], [[java.awt.Color]], [[MyPos]], [[MyLoc]]) |