Update gnulib.

[bison.git] / tests / java.at

diff --git a/tests/java.at b/tests/java.at
index 8ea47831f0f9dcde6dd0c4ab672813dd0ef4122d..0e3122b2b845205666dde995effef0a862d8e3c4 100644 (file)
--- a/tests/java.at
+++ b/tests/java.at
@@ -134,7 +134,7 @@ AT_LOCATION_IF([[
 ]], [[
   public void yyerror (String s)
   {
 ]], [[
   public void yyerror (String s)
   {

-    System.err.println (s); 
+    System.err.println (s);

   }
 ]])[
 
   }
 ]])[
 


@@ -343,7 +343,7 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
 #   first error is ")", which is needed to recover from the error and
 #   produce the "0" that triggers the "0 != 1" error.
 #
 #   first error is ")", which is needed to recover from the error and
 #   produce the "0" that triggers the "0 != 1" error.
 #

-_AT_CHECK_JAVA_CALC_ERROR([$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 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
 [1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
 1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'


@@ -459,7 +459,7 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER],
   {
     $3
   }
   {
     $3
   }

-  
+

   $4
 }], [$5], [$7])])
 
   $4
 }], [$5], [$7])])
 


@@ -591,7 +591,7 @@ AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer) *]])
 AT_CHECK_JAVA_MINIMAL([[%parse-param {int parse_param1}]])
 AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1) *]])
 AT_CHECK_JAVA_MINIMAL([[%parse-param {int parse_param1}]])
 AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1) *]])

-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param1 = parse_param1;]])
+AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]])

 
 AT_CHECK_JAVA_MINIMAL([[
 %parse-param {int parse_param1}
 
 AT_CHECK_JAVA_MINIMAL([[
 %parse-param {int parse_param1}


@@ -599,8 +599,8 @@ AT_CHECK_JAVA_MINIMAL([[
 AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]])

-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param1 = parse_param1;]])
-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param2 = parse_param2;]])
+AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]])
+AT_CHECK_JAVA_GREP([[ *this.parse_param2 = parse_param2;]])

 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([], [], [[return EOF;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser () *]])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([], [], [[return EOF;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser () *]])


@@ -611,7 +611,7 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[%parse-param {int parse_param1}]],
 AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1) *]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1) *]])
 AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1) *]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1) *]])

-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param1 = parse_param1;]], [2])
+AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]], [2])

 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %parse-param {int parse_param1}
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %parse-param {int parse_param1}


@@ -621,8 +621,8 @@ AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]])
 AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]])

-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param1 = parse_param1;]], [2])
-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param2 = parse_param2;]], [2])
+AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]], [2])
+AT_CHECK_JAVA_GREP([[ *this.parse_param2 = parse_param2;]], [2])

 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[%lex-param {char lex_param1}]],
     [], [[return EOF;]], [[YYLexer (char lex_param1) {}]])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[%lex-param {char lex_param1}]],
     [], [[return EOF;]], [[YYLexer (char lex_param1) {}]])


@@ -647,8 +647,8 @@ AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1, *short lex_param2, *int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[.* = new YYLexer *(lex_param1, *lex_param2);]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1, *short lex_param2, *int parse_param1, *long parse_param2) *]])
 AT_CHECK_JAVA_GREP([[.* = new YYLexer *(lex_param1, *lex_param2);]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]])

-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param1 = parse_param1;]], [2])
-AT_CHECK_JAVA_GREP([[[     ]*this.parse_param2 = parse_param2;]], [2])
+AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]], [2])
+AT_CHECK_JAVA_GREP([[ *this.parse_param2 = parse_param2;]], [2])

 
 AT_CLEANUP
 
 
 AT_CLEANUP