muscle: factor conditionals on defined %define variables

[bison.git] / tests / java.at

diff --git a/tests/java.at b/tests/java.at
index 1c9bd50d3cf70485cd2a1d23fc92672fb4a036ac..3f729260fb20e22ddaf082aed34012ee123de685 100644 (file)
--- a/tests/java.at
+++ b/tests/java.at
@@ -1,6 +1,6 @@
 # Java tests for simple calculator.           -*- Autotest -*-
 
 # Java tests for simple calculator.           -*- Autotest -*-
 

-# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007-2013 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -25,8 +25,8 @@ AT_BANNER([[Java Calculator.]])
 
 # _AT_DATA_JAVA_CALC_Y($1, $2, $3, [BISON-DIRECTIVES])
 # ----------------------------------------------------
 
 # _AT_DATA_JAVA_CALC_Y($1, $2, $3, [BISON-DIRECTIVES])
 # ----------------------------------------------------

-# Produce `calc.y'.  Don't call this macro directly, because it contains
-# some occurrences of `$1' etc. which will be interpreted by m4.  So
+# Produce 'calc.y'.  Don't call this macro directly, because it contains
+# some occurrences of '$1' etc. which will be interpreted by m4.  So

 # you should call it with $1, $2, and $3 as arguments, which is what
 # AT_DATA_JAVA_CALC_Y does.
 m4_define([_AT_DATA_JAVA_CALC_Y],
 # you should call it with $1, $2, and $3 as arguments, which is what
 # AT_DATA_JAVA_CALC_Y does.
 m4_define([_AT_DATA_JAVA_CALC_Y],


@@ -54,11 +54,11 @@ AT_DATA([Calc.y],
 %token <Integer> NUM "number"
 %type  <Integer> exp
 
 %token <Integer> NUM "number"
 %type  <Integer> exp
 

-%nonassoc '=' /* comparison            */
+%nonassoc '='       /* comparison            */

 %left '-' '+'
 %left '*' '/'
 %left '-' '+'
 %left '*' '/'

-%left NEG     /* negation--unary minus */
-%right '^'    /* exponentiation        */
+%precedence NEG     /* negation--unary minus */
+%right '^'          /* exponentiation        */

 
 /* Grammar follows */
 %%
 
 /* Grammar follows */
 %%


@@ -206,7 +206,7 @@ AT_BISON_OPTION_POPDEFS
 
 # AT_DATA_CALC_Y([BISON-OPTIONS])
 # -------------------------------
 
 # AT_DATA_CALC_Y([BISON-OPTIONS])
 # -------------------------------

-# Produce `calc.y'.
+# Produce 'calc.y'.

 m4_define([AT_DATA_JAVA_CALC_Y],
 [_AT_DATA_JAVA_CALC_Y($[1], $[2], $[3], [$1])
 ])
 m4_define([AT_DATA_JAVA_CALC_Y],
 [_AT_DATA_JAVA_CALC_Y($[1], $[2], $[3], [$1])
 ])


@@ -215,7 +215,7 @@ m4_define([AT_DATA_JAVA_CALC_Y],
 # _AT_CHECK_JAVA_CALC_ERROR(BISON-OPTIONS, INPUT,
 #                           [VERBOSE-AND-LOCATED-ERROR-MESSAGE])
 # --------------------------------------------------------------
 # _AT_CHECK_JAVA_CALC_ERROR(BISON-OPTIONS, INPUT,
 #                           [VERBOSE-AND-LOCATED-ERROR-MESSAGE])
 # --------------------------------------------------------------

-# Run `calc' on INPUT, and expect a `syntax error' message.
+# Run 'calc' on INPUT, and expect a 'syntax error' message.

 #
 # If INPUT starts with a slash, it is used as absolute input file name,
 # otherwise as contents.
 #
 # If INPUT starts with a slash, it is used as absolute input file name,
 # otherwise as contents.


@@ -240,7 +240,7 @@ AT_DATA([[expout]],
 AT_YYERROR_SEES_LOC_IF([],
 [[sed 's/^[-0-9.]*: //' expout >at-expout
 mv at-expout expout]])
 AT_YYERROR_SEES_LOC_IF([],
 [[sed 's/^[-0-9.]*: //' expout >at-expout
 mv at-expout expout]])

-# 3. If error-verbose is not used, strip the`, unexpected....' part.
+# 3. If error-verbose is not used, strip the', unexpected....' part.

 m4_bmatch([$1], [%error-verbose], [],
 [[sed 's/syntax error, .*$/syntax error/' expout >at-expout
 mv at-expout expout]])
 m4_bmatch([$1], [%error-verbose], [],
 [[sed 's/syntax error, .*$/syntax error/' expout >at-expout
 mv at-expout expout]])


@@ -250,7 +250,7 @@ AT_CHECK([cat stderr], 0, [expout])
 
 # _AT_CHECK_JAVA_CALC([BISON-DIRECTIVES], [BISON-CODE])
 # -----------------------------------------------------
 
 # _AT_CHECK_JAVA_CALC([BISON-DIRECTIVES], [BISON-CODE])
 # -----------------------------------------------------

-# Start a testing chunk which compiles `calc' grammar with
+# Start a testing chunk which compiles 'calc' grammar with

 # BISON-DIRECTIVES, and performs several tests over the parser.
 m4_define([_AT_CHECK_JAVA_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.
 # BISON-DIRECTIVES, and performs several tests over the parser.
 m4_define([_AT_CHECK_JAVA_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.


@@ -310,7 +310,7 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
 #   - (* * *): nothing to pop, a lot to discard
 #   - (1 + 2 * *): some to pop and discard
 #
 #   - (* * *): nothing to pop, a lot to discard
 #   - (1 + 2 * *): some to pop and discard
 #

-# - test the action associated to `error'
+# - test the action associated to 'error'

 #
 # - check the lookahead that triggers an error is not discarded
 #   when we enter error recovery.  Below, the lookahead causing the
 #
 # - check the lookahead that triggers an error is not discarded
 #   when we enter error recovery.  Below, the lookahead causing the


@@ -342,7 +342,7 @@ AT_CLEANUP
 
 # AT_CHECK_JAVA_CALC([BISON-DIRECTIVES])
 # --------------------------------------
 
 # AT_CHECK_JAVA_CALC([BISON-DIRECTIVES])
 # --------------------------------------

-# Start a testing chunk which compiles `calc' grammar with
+# Start a testing chunk which compiles 'calc' grammar with

 # BISON-DIRECTIVES, and performs several tests over the parser.
 # Run the test with and without %error-verbose.
 m4_define([AT_CHECK_JAVA_CALC],
 # BISON-DIRECTIVES, and performs several tests over the parser.
 # Run the test with and without %error-verbose.
 m4_define([AT_CHECK_JAVA_CALC],


@@ -408,7 +408,7 @@ AT_JAVA_COMPILE([[YYParser.java]])
 
 
 # AT_CHECK_JAVA_MINIMAL_W_LEXER([1:DIRECTIVES], [2:LEX_THROWS],
 
 
 # AT_CHECK_JAVA_MINIMAL_W_LEXER([1:DIRECTIVES], [2:LEX_THROWS],

-#       [3:YYLEX_ACTION], [4:LEXER_BODY], [5:PARSER_ACTION], [6:STYPE],
+#       [3:YYLEX_ACTION], [4:LEXER_BODY], [5:PARSER_ACTION], [6:VALUE_TYPE],

 #       [7:POSITION_TYPE], [8:LOCATION_TYPE])
 # ---------------------------------------------------------------------
 # Check that a mininal parser with DIRECTIVES and a "%code lexer".
 #       [7:POSITION_TYPE], [8:LOCATION_TYPE])
 # ---------------------------------------------------------------------
 # Check that a mininal parser with DIRECTIVES and a "%code lexer".


@@ -461,7 +461,7 @@ AT_CHECK_JAVA_GREP([[class YYParser]])
 AT_CHECK_JAVA_MINIMAL([[%name-prefix "Prefix"]])
 AT_CHECK_JAVA_GREP([[class PrefixParser]])
 
 AT_CHECK_JAVA_MINIMAL([[%name-prefix "Prefix"]])
 AT_CHECK_JAVA_GREP([[class PrefixParser]])
 

-AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix "TOK_"]])
+AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix {TOK_}]])

 AT_CHECK_JAVA_GREP([[.*TOK_END.*]])
 
 AT_CHECK_JAVA_MINIMAL([[%define parser_class_name "ParserClassName"]])
 AT_CHECK_JAVA_GREP([[.*TOK_END.*]])
 
 AT_CHECK_JAVA_MINIMAL([[%define parser_class_name "ParserClassName"]])


@@ -742,14 +742,14 @@ AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedExcepti
 AT_CLEANUP
 
 
 AT_CLEANUP
 
 

-# --------------------------------------------- #
-# Java stype, position_class and location_class #
-# --------------------------------------------- #
+# ------------------------------------------ #
+# Java value, position, and location types.  #
+# ------------------------------------------ #

 
 

-AT_SETUP([Java stype, position_class and location_class])
+AT_SETUP([Java value, position, and location types])

 
 AT_CHECK_JAVA_MINIMAL([[
 
 AT_CHECK_JAVA_MINIMAL([[

-%define stype "java.awt.Color"
+%define api.value.type "java.awt.Color"

 %type<java.awt.Color> start;
 %define api.location.type "MyLoc"
 %define api.position.type "MyPos"
 %type<java.awt.Color> start;
 %define api.location.type "MyLoc"
 %define api.position.type "MyPos"


@@ -759,7 +759,7 @@ AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore])
 AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[

-%define stype "java.awt.Color"
+%define api.value.type "java.awt.Color"

 %type<java.awt.Color> start;
 %define api.location.type "MyLoc"
 %define api.position.type "MyPos"
 %type<java.awt.Color> start;
 %define api.location.type "MyLoc"
 %define api.position.type "MyPos"