maint: reenable sc_m4_quote_check

[bison.git] / tests / java.at

diff --git a/tests/java.at b/tests/java.at
index 5e868dc97665d6df7b09bad574d566704d78e0c7..b3e79e9c2aef8fa9a474f4294d0362f3898682ce 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 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 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


@@ -77,7 +77,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,15 +113,14 @@ 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;
+    return yypos;

   }
 
   public void yyerror (Calc.Location l, String s)
   }
 
   public void yyerror (Calc.Location l, String s)


@@ -129,7 +128,7 @@ AT_LOCATION_IF([[
     if (l == null)
       System.err.println (s);
     else
     if (l == null)
       System.err.println (s);
     else

-      System.err.println (l.begin + ": " + s);
+      System.err.println (l + ": " + s);

   }
 ]], [[
   public void yyerror (String s)
   }
 ]], [[
   public void yyerror (String s)


@@ -146,13 +145,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,36 +175,39 @@ 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;
+  }

 }
 
 ]])
 }
 
 ]])


@@ -219,25 +222,6 @@ m4_define([AT_DATA_JAVA_CALC_Y],
 ])
 
 
 ])
 
 

-
-# 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])
 # ---------------------------------------------------------


@@ -313,19 +297,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


@@ -345,21 +329,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


@@ -428,14 +412,14 @@ start: END {$2};
 class m4_default([$3], [Position]) {}
 ])
 AT_BISON_CHECK([[YYParser.y]])
 class m4_default([$3], [Position]) {}
 ])
 AT_BISON_CHECK([[YYParser.y]])

-AT_CHECK([[grep -q '[mb]4_' YYParser.y]], [1])
+AT_CHECK([[grep '[mb]4_' YYParser.y]], [1], [ignore])

 AT_JAVA_COMPILE([[YYParser.java]])
 ])
 
 
 # AT_CHECK_JAVA_MINIMAL_W_LEXER([1:DIRECTIVES], [2:LEX_THROWS],
 AT_JAVA_COMPILE([[YYParser.java]])
 ])
 
 
 # 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:STYPE],
+#       [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,7 +454,7 @@ 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], [], [m4_default([$2], [1])

 ])
 ])
 
 ])
 ])
 


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


@@ -663,74 +647,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],


@@ -780,9 +764,9 @@ AT_CHECK_JAVA_MINIMAL([[
 %define location_type "MyLoc"
 %define position_type "MyPos"
 %code { class MyPos {} }]], [[$$ = $<java.awt.Color>1;]], [[MyPos]])
 %define location_type "MyLoc"
 %define position_type "MyPos"
 %code { class MyPos {} }]], [[$$ = $<java.awt.Color>1;]], [[MyPos]])

-AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1])
+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"
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %define stype "java.awt.Color"


@@ -792,8 +776,8 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %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]])

-AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1])
+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_CLEANUP
 
 AT_CLEANUP