news: YYERROR vs variants

[bison.git] / tests / java.at

diff --git a/tests/java.at b/tests/java.at
index 9ea703fed25aad33c2908bc3427b865681c091ba..58998fe71dce8616587b688977d04b556cf23a47 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, 2008, 2009, 2010 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,18 +25,19 @@ 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],
 [m4_if([$1$2$3], $[1]$[2]$[3], [],
        [m4_fatal([$0: Invalid arguments: $@])])dnl
 # 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],
 [m4_if([$1$2$3], $[1]$[2]$[3], [],
        [m4_fatal([$0: Invalid arguments: $@])])dnl

+AT_BISON_OPTION_PUSHDEFS([%language "Java" $4])

 AT_DATA([Calc.y],
 [[/* Infix notation calculator--calc */
 %language "Java"
 %name-prefix "Calc"
 AT_DATA([Calc.y],
 [[/* Infix notation calculator--calc */
 %language "Java"
 %name-prefix "Calc"

-%define parser_class_name "Calc"
+%define parser_class_name {Calc}

 %define public
 
 ]$4[
 %define public
 
 ]$4[


@@ -53,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 */
 %%


@@ -77,7 +78,7 @@ exp:
 | exp '=' exp
   {
     if ($1.intValue () != $3.intValue ())
 | exp '=' exp
   {
     if ($1.intValue () != $3.intValue ())

-      yyerror ("calc: error: " + $1 + " != " + $3);
+      yyerror (]AT_LOCATION_IF([[@$,]])[ "calc: error: " + $1 + " != " + $3);

   }
 | exp '+' exp        { $$ = new Integer ($1.intValue () + $3.intValue ());  }
 | exp '-' exp        { $$ = new Integer ($1.intValue () - $3.intValue ());  }
   }
 | exp '+' exp        { $$ = new Integer ($1.intValue () + $3.intValue ());  }
 | exp '-' exp        { $$ = new Integer ($1.intValue () - $3.intValue ());  }


@@ -113,30 +114,17 @@ class CalcLexer implements Calc.Lexer {
   }
 
 AT_LOCATION_IF([[
   }
 
 AT_LOCATION_IF([[

-  Position yystartpos;
-  Position yyendpos = new Position (1);
+  Position yypos = new Position (1, 0);

 
   public Position getStartPos() {
 
   public Position getStartPos() {

-    return yystartpos;
+    return yypos;

   }
 
   public Position getEndPos() {
   }
 
   public Position getEndPos() {

-    return yyendpos;
-  }
-
-  public void yyerror (Calc.Location l, String s)
-  {
-    if (l == null)
-      System.err.println (s);
-    else
-      System.err.println (l.begin + ": " + s);
-  }
-]], [[
-  public void yyerror (String s)
-  {
-    System.err.println (s);
+    return yypos;

   }
 ]])[
   }
 ]])[

+  ]AT_YYERROR_DEFINE[

 
   Integer yylval;
 
 
   Integer yylval;
 


@@ -146,13 +134,14 @@ AT_LOCATION_IF([[
 
   public int yylex () throws IOException {
     int ttype = st.nextToken ();
 
   public int yylex () throws IOException {
     int ttype = st.nextToken ();

-    ]AT_LOCATION_IF([[yystartpos = yyendpos;]])[
+    ]AT_LOCATION_IF([[yypos = new Position (yypos.lineno (),
+                                            yypos.token () + 1);]])[

     if (ttype == st.TT_EOF)
       return EOF;
 
     else if (ttype == st.TT_EOL)
       {
     if (ttype == st.TT_EOF)
       return EOF;
 
     else if (ttype == st.TT_EOL)
       {

-        ]AT_LOCATION_IF([[yyendpos = new Position (yyendpos.lineno () + 1);]])[
+        ]AT_LOCATION_IF([[yypos = new Position (yypos.lineno () + 1, 0);]])[

         return (int) '\n';
       }
 
         return (int) '\n';
       }
 


@@ -175,73 +164,58 @@ AT_LOCATION_IF([[
 [
 class Position {
   public int line;
 [
 class Position {
   public int line;

+  public int token;

 
   public Position ()
   {
     line = 0;
 
   public Position ()
   {
     line = 0;

+    token = 0;

   }
 
   }
 

-  public Position (int l)
+  public Position (int l, int t)

   {
     line = l;
   {
     line = l;

-  }
-
-  public long getHashCode ()
-  {
-    return line;
+    token = t;

   }
 
   public boolean equals (Position l)
   {
   }
 
   public boolean equals (Position l)
   {

-    return l.line == line;
+    return l.line == line && l.token == token;

   }
 
   public String toString ()
   {
   }
 
   public String toString ()
   {

-    return Integer.toString (line);
+    return Integer.toString (line) + "." + Integer.toString(token);

   }
 
   public int lineno ()
   {
     return line;
   }
   }
 
   public int lineno ()
   {
     return line;
   }

+
+  public int token ()
+  {
+    return token;
+  }

 }
 
 ]])
 }
 
 ]])

+AT_BISON_OPTION_POPDEFS

 ])# _AT_DATA_JAVA_CALC_Y
 
 
 # AT_DATA_CALC_Y([BISON-OPTIONS])
 # -------------------------------
 ])# _AT_DATA_JAVA_CALC_Y
 
 
 # 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])
 ])
 
 

-
-# AT_JAVA_COMPILE(SOURCE)
-# -----------------------
-# Compile SOURCES into Java class files.  Skip the test if java or javac is
-# not installed.
-m4_define([AT_JAVA_COMPILE],
-[AT_KEYWORDS(java)
-AT_CHECK([test -n "$CONF_JAVA" || exit 77
-test -n "$CONF_JAVAC" || exit 77])
-AT_CHECK([$SHELL ../../../javacomp.sh $1],
-         0, [ignore], [ignore])])
-
-
-# AT_JAVA_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE])
-# -----------------------------------------------------------------
-m4_define([AT_JAVA_PARSER_CHECK],
-[AT_CHECK([$5 $SHELL ../../../javaexec.sh $1], [$2], [$3], [$4])])
-
-

 # _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.


@@ -266,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]])


@@ -276,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.


@@ -313,19 +287,19 @@ AT_JAVA_PARSER_CHECK([Calc < input], 0, [], [stderr])
 
 # Some syntax errors.
 _AT_CHECK_JAVA_CALC_ERROR([$1], [0 0],
 
 # Some syntax errors.
 _AT_CHECK_JAVA_CALC_ERROR([$1], [0 0],

-                          [1: syntax error, unexpected number])
+                          [1.2: syntax error, unexpected number])

 _AT_CHECK_JAVA_CALC_ERROR([$1], [1//2],
 _AT_CHECK_JAVA_CALC_ERROR([$1], [1//2],

-                          [1: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])
+                          [1.3: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])

 _AT_CHECK_JAVA_CALC_ERROR([$1], [error],
 _AT_CHECK_JAVA_CALC_ERROR([$1], [error],

-                          [1: syntax error, unexpected $undefined])
+                          [1.1: syntax error, unexpected $undefined])

 _AT_CHECK_JAVA_CALC_ERROR([$1], [1 = 2 = 3],
 _AT_CHECK_JAVA_CALC_ERROR([$1], [1 = 2 = 3],

-                          [1: syntax error, unexpected '='])
+                          [1.4: syntax error, unexpected '='])

 _AT_CHECK_JAVA_CALC_ERROR([$1], [
 +1],
 _AT_CHECK_JAVA_CALC_ERROR([$1], [
 +1],

-                          [2: syntax error, unexpected '+'])
+                          [2.1: syntax error, unexpected '+'])

 # Exercise error messages with EOF: work on an empty file.
 _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
 # Exercise error messages with EOF: work on an empty file.
 _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],

-                          [1: syntax error, unexpected end of input])
+                          [1.1: syntax error, unexpected end of input])

 
 # Exercise the error token: without it, we die at the first error,
 # hence be sure to
 
 # Exercise the error token: without it, we die at the first error,
 # hence be sure to


@@ -336,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


@@ -345,21 +319,21 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
 #
 _AT_CHECK_JAVA_CALC_ERROR([$1],
                           [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
 #
 _AT_CHECK_JAVA_CALC_ERROR([$1],
                           [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],

-[1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
-1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
-1: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
-1: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
-calc: error: 4444 != 1])
+[1.2: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
+1.11: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
+1.14: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.24: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.1-1.27: calc: error: 4444 != 1])

 
 # The same, but this time exercising explicitly triggered syntax errors.
 # POSIX says the lookahead causing the error should not be discarded.
 _AT_CHECK_JAVA_CALC_ERROR([$1], [(!) + (0 0) = 1],
 
 # The same, but this time exercising explicitly triggered syntax errors.
 # POSIX says the lookahead causing the error should not be discarded.
 _AT_CHECK_JAVA_CALC_ERROR([$1], [(!) + (0 0) = 1],

-[1: syntax error, unexpected number
-calc: error: 2222 != 1])
+[1.7: syntax error, unexpected number
+1.1-1.10: calc: error: 2222 != 1])

 _AT_CHECK_JAVA_CALC_ERROR([$1], [(- *) + (0 0) = 1],
 _AT_CHECK_JAVA_CALC_ERROR([$1], [(- *) + (0 0) = 1],

-[1: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
-1: syntax error, unexpected number
-calc: error: 2222 != 1])
+[1.3: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.8: syntax error, unexpected number
+1.1-1.11: calc: error: 2222 != 1])

 AT_BISON_OPTION_POPDEFS
 
 AT_CLEANUP
 AT_BISON_OPTION_POPDEFS
 
 AT_CLEANUP


@@ -368,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],


@@ -434,8 +408,8 @@ 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],
-#      [7:POSITION_TYPE], [8:LOCATION_TYPE])
+#       [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".
 # YYLEX is the body of yylex () which throws LEX_THROW.
 # ---------------------------------------------------------------------
 # Check that a mininal parser with DIRECTIVES and a "%code lexer".
 # YYLEX is the body of yylex () which throws LEX_THROW.


@@ -470,9 +444,8 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER],
 # Check that YYParser.java contains exactly COUNT lines matching ^LINE$
 # with grep.
 m4_define([AT_CHECK_JAVA_GREP],
 # Check that YYParser.java contains exactly COUNT lines matching ^LINE$
 # with grep.
 m4_define([AT_CHECK_JAVA_GREP],

-       [AT_CHECK([grep -c '^$1$' YYParser.java], [], [m4_default([$2], [1])
-])
-])
+[AT_CHECK([grep -c '^$1$' YYParser.java], [ignore], [m4_default([$2], [1])
+])])

 
 
 # ------------------------------------- #
 
 
 # ------------------------------------- #


@@ -487,13 +460,13 @@ 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.tokens.prefix "TOK_"]])
+AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix {TOK_}]])

 AT_CHECK_JAVA_GREP([[.*TOK_END.*]])
 
 AT_CHECK_JAVA_GREP([[.*TOK_END.*]])
 

-AT_CHECK_JAVA_MINIMAL([[%define parser_class_name "ParserClassName"]])
+AT_CHECK_JAVA_MINIMAL([[%define parser_class_name {ParserClassName}]])

 AT_CHECK_JAVA_GREP([[class ParserClassName]])
 
 AT_CHECK_JAVA_GREP([[class ParserClassName]])
 

-AT_CHECK_JAVA_MINIMAL([[%define package "user_java_package"]])
+AT_CHECK_JAVA_MINIMAL([[%define package {user_java_package}]])

 AT_CHECK_JAVA_GREP([[package user_java_package;]])
 
 AT_CLEANUP
 AT_CHECK_JAVA_GREP([[package user_java_package;]])
 
 AT_CLEANUP


@@ -556,7 +529,7 @@ AT_CHECK_JAVA_GREP([[public final strictfp class YYParser]])
 
 # FIXME: Can't do a Java compile because javacomp.sh is configured for 1.3
 AT_CHECK_JAVA_MINIMAL([[
 
 # FIXME: Can't do a Java compile because javacomp.sh is configured for 1.3
 AT_CHECK_JAVA_MINIMAL([[

-%define annotations "/*@Deprecated @SupressWarnings(\"unchecked\") @SupressWarnings({\"unchecked\", \"deprecation\"}) @SupressWarnings(value={\"unchecked\", \"deprecation\"})*/"
+%define annotations {/*@Deprecated @SupressWarnings("unchecked") @SupressWarnings({"unchecked", "deprecation"}) @SupressWarnings(value={"unchecked", "deprecation"})*/}

 %define public]])
 AT_CHECK_JAVA_GREP([[/\*@Deprecated @SupressWarnings("unchecked") @SupressWarnings({"unchecked", "deprecation"}) @SupressWarnings(value={"unchecked", "deprecation"})\*/ public class YYParser]])
 
 %define public]])
 AT_CHECK_JAVA_GREP([[/\*@Deprecated @SupressWarnings("unchecked") @SupressWarnings({"unchecked", "deprecation"}) @SupressWarnings(value={"unchecked", "deprecation"})\*/ public class YYParser]])
 


@@ -569,15 +542,15 @@ AT_CLEANUP
 
 AT_SETUP([Java parser class extends and implements])
 
 
 AT_SETUP([Java parser class extends and implements])
 

-AT_CHECK_JAVA_MINIMAL([[%define extends "Thread"]])
+AT_CHECK_JAVA_MINIMAL([[%define extends {Thread}]])

 AT_CHECK_JAVA_GREP([[class YYParser extends Thread]])
 
 AT_CHECK_JAVA_GREP([[class YYParser extends Thread]])
 

-AT_CHECK_JAVA_MINIMAL([[%define implements "Cloneable"]])
+AT_CHECK_JAVA_MINIMAL([[%define implements {Cloneable}]])

 AT_CHECK_JAVA_GREP([[class YYParser implements Cloneable]])
 
 AT_CHECK_JAVA_MINIMAL([[
 AT_CHECK_JAVA_GREP([[class YYParser implements Cloneable]])
 
 AT_CHECK_JAVA_MINIMAL([[

-%define extends "Thread"
-%define implements "Cloneable"]])
+%define extends {Thread}
+%define implements {Cloneable}]])

 AT_CHECK_JAVA_GREP([[class YYParser extends Thread implements Cloneable]])
 
 AT_CLEANUP
 AT_CHECK_JAVA_GREP([[class YYParser extends Thread implements Cloneable]])
 
 AT_CLEANUP


@@ -663,74 +636,74 @@ AT_CLEANUP
 
 AT_SETUP([Java throws specifications])
 
 
 AT_SETUP([Java throws specifications])
 

-# %define throws       - 0 1 2
-# %define lex-throws   - 0 1 2
-# %code lexer            0 1
+# %define throws        - 0 1 2
+# %define lex-throws    - 0 1 2
+# %code lexer             0 1

 
 m4_define([AT_JT_lex_throws_define], [m4_case(AT_JT_lex_throws,
 
 m4_define([AT_JT_lex_throws_define], [m4_case(AT_JT_lex_throws,

-       -1, [],
-        0, [[%define lex_throws ""]],
-        1, [[%define lex_throws "InterruptedException"]],
-        2, [[%define lex_throws "InterruptedException, IllegalAccessException"]])])
+        -1, [],
+         0, [[%define lex_throws {}]],
+         1, [[%define lex_throws {InterruptedException}]],
+         2, [[%define lex_throws {InterruptedException, IllegalAccessException}]])])

 
 m4_define([AT_JT_yylex_throws], [m4_case(AT_JT_lex_throws,
 
 m4_define([AT_JT_yylex_throws], [m4_case(AT_JT_lex_throws,

-       -1, [[ throws java.io.IOException]],
-        0, [],
-        1, [[ throws InterruptedException]],
-        2, [[ throws InterruptedException, IllegalAccessException]])])
+        -1, [[ throws java.io.IOException]],
+         0, [],
+         1, [[ throws InterruptedException]],
+         2, [[ throws InterruptedException, IllegalAccessException]])])

 
 m4_define([AT_JT_yylex_action], [m4_case(AT_JT_lex_throws,
 
 m4_define([AT_JT_yylex_action], [m4_case(AT_JT_lex_throws,

-       -1, [[throw new java.io.IOException();]],
-        0, [[return EOF;]],
-        1, [[throw new InterruptedException();]],
-        2, [[throw new IllegalAccessException();]])])
+        -1, [[throw new java.io.IOException();]],
+         0, [[return EOF;]],
+         1, [[throw new InterruptedException();]],
+         2, [[throw new IllegalAccessException();]])])

 
 
 m4_define([AT_JT_throws_define], [m4_case(AT_JT_throws,
 
 
 m4_define([AT_JT_throws_define], [m4_case(AT_JT_throws,

-       -1, [],
-        0, [[%define throws ""]],
-        1, [[%define throws "ClassNotFoundException"]],
-        2, [[%define throws "ClassNotFoundException, InstantiationException"]])])
+        -1, [],
+         0, [[%define throws {}]],
+         1, [[%define throws {ClassNotFoundException}]],
+         2, [[%define throws {ClassNotFoundException, InstantiationException}]])])

 
 m4_define([AT_JT_yyaction_throws], [m4_case(AT_JT_throws,
 
 m4_define([AT_JT_yyaction_throws], [m4_case(AT_JT_throws,

-       -1, [],
-        0, [],
-        1, [[ throws ClassNotFoundException]],
-        2, [[ throws ClassNotFoundException, InstantiationException]])])
+        -1, [],
+         0, [],
+         1, [[ throws ClassNotFoundException]],
+         2, [[ throws ClassNotFoundException, InstantiationException]])])

 
 m4_define([AT_JT_parse_throws_2], [m4_case(AT_JT_throws,
 
 m4_define([AT_JT_parse_throws_2], [m4_case(AT_JT_throws,

-       -1, [],
-        0, [],
-        1, [[, ClassNotFoundException]],
-        2, [[, ClassNotFoundException, InstantiationException]])])
+        -1, [],
+         0, [],
+         1, [[, ClassNotFoundException]],
+         2, [[, ClassNotFoundException, InstantiationException]])])

 
 m4_define([AT_JT_parse_throws],
 
 m4_define([AT_JT_parse_throws],

-       [m4_if(m4_quote(AT_JT_yylex_throws), [],
-               [AT_JT_yyaction_throws],
-               [AT_JT_yylex_throws[]AT_JT_parse_throws_2])])
+        [m4_if(m4_quote(AT_JT_yylex_throws), [],
+                [AT_JT_yyaction_throws],
+                [AT_JT_yylex_throws[]AT_JT_parse_throws_2])])

 
 m4_define([AT_JT_initial_action], [m4_case(AT_JT_throws,
 
 m4_define([AT_JT_initial_action], [m4_case(AT_JT_throws,

-       -1, [],
-        0, [],
-        1, [[%initial-action {if (true) throw new ClassNotFoundException();}]],
-        2, [[%initial-action {if (true) throw new InstantiationException();}]])])
+        -1, [],
+         0, [],
+         1, [[%initial-action {if (true) throw new ClassNotFoundException();}]],
+         2, [[%initial-action {if (true) throw new InstantiationException();}]])])

 
 m4_define([AT_JT_parse_action], [m4_case(AT_JT_throws,
 
 m4_define([AT_JT_parse_action], [m4_case(AT_JT_throws,

-       -1, [],
-        0, [],
-        1, [[throw new ClassNotFoundException();]],
-        2, [[throw new ClassNotFoundException();]])])
+        -1, [],
+         0, [],
+         1, [[throw new ClassNotFoundException();]],
+         2, [[throw new ClassNotFoundException();]])])

 
 m4_for([AT_JT_lexer], 0, 1, 1,
   [m4_for([AT_JT_lex_throws], -1, 2, 1,
     [m4_for([AT_JT_throws], -1, 2, 1,
       [m4_if(AT_JT_lexer, 0,
 
 m4_for([AT_JT_lexer], 0, 1, 1,
   [m4_for([AT_JT_lex_throws], -1, 2, 1,
     [m4_for([AT_JT_throws], -1, 2, 1,
       [m4_if(AT_JT_lexer, 0,

-       [AT_CHECK_JAVA_MINIMAL([
+        [AT_CHECK_JAVA_MINIMAL([

 AT_JT_throws_define
 AT_JT_lex_throws_define
 AT_JT_initial_action],
 [AT_JT_parse_action])],
 AT_JT_throws_define
 AT_JT_lex_throws_define
 AT_JT_initial_action],
 [AT_JT_parse_action])],

-       [AT_CHECK_JAVA_MINIMAL_W_LEXER([
+        [AT_CHECK_JAVA_MINIMAL_W_LEXER([

 AT_JT_throws_define
 AT_JT_lex_throws_define
 AT_JT_initial_action],
 AT_JT_throws_define
 AT_JT_lex_throws_define
 AT_JT_initial_action],


@@ -752,43 +725,48 @@ AT_CLEANUP
 
 AT_SETUP([Java constructor init and init_throws])
 
 
 AT_SETUP([Java constructor init and init_throws])
 

+m4_pushdef([AT_Witness],
+[super("Test Thread"); if (true) throw new InterruptedException();])
+

 AT_CHECK_JAVA_MINIMAL([[
 AT_CHECK_JAVA_MINIMAL([[

-%define extends "Thread"
-%code init { super("Test Thread"); if (true) throw new InterruptedException(); }
-%define init_throws "InterruptedException"
+%define extends {Thread}
+%code init { ]AT_Witness[ }
+%define init_throws {InterruptedException}

 %lex-param {int lex_param}]])
 %lex-param {int lex_param}]])

-AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedException();' YYParser.java]])
+AT_CHECK([[grep ']AT_Witness[' YYParser.java]], 0, [ignore])

 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[

-%define extends "Thread"
-%code init { super("Test Thread"); if (true) throw new InterruptedException(); }
-%define init_throws "InterruptedException"]], [], [[return EOF;]])
-AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedException();' YYParser.java]])
+%define extends {Thread}
+%code init { ]AT_Witness[ }
+%define init_throws {InterruptedException}]], [], [[return EOF;]])
+AT_CHECK([[grep ']AT_Witness[' YYParser.java]], 0, [ignore])
+
+m4_popdef([AT_Witness])

 
 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;
 %type<java.awt.Color> start;

-%define location_type "MyLoc"
-%define position_type "MyPos"
+%define api.location.type {MyLoc}
+%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])
 AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %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])
 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;
 %type<java.awt.Color> start;

-%define location_type "MyLoc"
-%define position_type "MyPos"
+%define api.location.type {MyLoc}
+%define api.position.type {MyPos}

 %code { class MyPos {} }]], [], [[return EOF;]], [],
 [[$$ = $<java.awt.Color>1;]],
 [[java.awt.Color]], [[MyPos]], [[MyLoc]])
 %code { class MyPos {} }]], [], [[return EOF;]], [],
 [[$$ = $<java.awt.Color>1;]],
 [[java.awt.Color]], [[MyPos]], [[MyLoc]])


@@ -797,3 +775,69 @@ AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore])
 AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CLEANUP
 AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CLEANUP

+
+
+# ----------------------------------------------- #
+# Java syntax error handling without error token. #
+# ----------------------------------------------- #
+
+AT_SETUP([Java syntax error handling without error token])
+
+AT_DATA([[YYParser.y]], [[%language "Java"
+
+%lex-param { String s }
+
+%code imports {
+  import java.io.IOException;
+}
+
+%code lexer {
+  String Input;
+  int Position;
+
+  public YYLexer (String s)
+  {
+    Input    = s;
+    Position = 0;
+  }
+
+  public void yyerror (String s)
+  {
+    System.err.println (s);
+  }
+
+  public Object getLVal ()
+  {
+    return null;
+  }
+
+  public int yylex () throws IOException
+  {
+    if (Position >= Input.length ())
+      return EOF;
+    else
+      return Input.charAt (Position++);
+  }
+}
+
+%code {
+  public static void main (String args []) throws IOException
+  {
+    YYParser p = new YYParser (args [0]);
+    p.parse ();
+  }
+}
+%%
+input:
+  'a' 'a'
+;
+]])
+AT_BISON_CHECK([[YYParser.y]])
+AT_JAVA_COMPILE([[YYParser.java]])
+AT_JAVA_PARSER_CHECK([[YYParser aa]], [[0]], [[]], [[]])
+AT_JAVA_PARSER_CHECK([[YYParser ab]], [[0]], [[]], [[syntax error
+]])
+AT_JAVA_PARSER_CHECK([[YYParser ba]], [[0]], [[]], [[syntax error
+]])
+
+AT_CLEANUP