Merge branch 'maint'

[bison.git] / tests / named-refs.at

diff --git a/tests/named-refs.at b/tests/named-refs.at
index 0b2f4c94ef1641ebf9e6e5b86b284eed402b96ec..8c0fbb90a240474bd2a69d47739ef3966582a35f 100644 (file)
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -19,7 +19,7 @@
 AT_BANNER([[Named references tests.]])
 
 AT_SETUP([Tutorial calculator])
 AT_BANNER([[Named references tests.]])
 
 AT_SETUP([Tutorial calculator])

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([test.y],
 [[
 %{
 AT_DATA_GRAMMAR([test.y],
 [[
 %{


@@ -33,8 +33,8 @@ FILE *input;
 static semantic_value global_result = 0;
 static int global_count = 0;
 static int power (int base, int exponent);
 static semantic_value global_result = 0;
 static int global_count = 0;
 static int power (int base, int exponent);

-static void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[

 %}
 
 %union
 %}
 
 %union


@@ -83,12 +83,7 @@ exp:
 | '-' error          { $$ = 0; YYERROR;     }
 ;
 %%
 | '-' error          { $$ = 0; YYERROR;     }
 ;
 %%

-
-static void yyerror (const char *s)
-{
-  fprintf (stderr, "%s\n", s);
-}
-
+]AT_YYERROR_DEFINE[

 static int get_char (void)
 {
   int res = getc (input);
 static int get_char (void)
 {
   int res = getc (input);


@@ -119,7 +114,8 @@ static int read_signed_integer (void)
   return sign * n;
 }
 
   return sign * n;
 }
 

-int yylex (void)
+static int
+yylex (void)

 {
   int c;
   /* Skip white space.  */
 {
   int c;
   /* Skip white space.  */


@@ -166,10 +162,8 @@ int main (int argc, const char **argv)
     }
   status = yyparse ();
   fclose (input);
     }
   status = yyparse ();
   fclose (input);

-  if (global_result != result)
-    abort ();
-  if (global_count != count)
-    abort ();
+  assert (global_result == result);
+  assert (global_count == count);

   return status;
 }
 ]])
   return status;
 }
 ]])


@@ -190,6 +184,7 @@ AT_DATA([input.txt],
 AT_BISON_CHECK([-o test.c test.y])
 AT_COMPILE([[test]])
 AT_PARSER_CHECK([./test input.txt], 0, [], [stderr])
 AT_BISON_CHECK([-o test.c test.y])
 AT_COMPILE([[test]])
 AT_PARSER_CHECK([./test input.txt], 0, [], [stderr])

+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -198,13 +193,13 @@ AT_CLEANUP
 
 
 AT_SETUP([Undefined and ambiguous references])
 
 
 AT_SETUP([Undefined and ambiguous references])

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([test.y],
 [[
 %{
 static int power (int base, int exponent);
 AT_DATA_GRAMMAR([test.y],
 [[
 %{
 static int power (int base, int exponent);

-static void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[

 %}
 
 %union
 %}
 
 %union


@@ -256,18 +251,19 @@ exp:
 ]])
 
 AT_BISON_CHECK([-o test.c test.y], 1, [],
 ]])
 
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:50.51-60: invalid reference: '$<ival>lo9'
+[[test.y:50.51-60: error: invalid reference: '$<ival>lo9'

 test.y:50.3-68:      symbol not found in production: lo9
 test.y:50.3-68:      symbol not found in production: lo9

-test.y:51.51-60: warning: misleading reference: '$<ival>exp'
-test.y:42.1-3:       warning: refers to: $exp at $$
-test.y:51.7:         warning: possibly meant: $x, hiding $exp at $1
-test.y:51.41:        warning: possibly meant: $r, hiding $exp at $4
-test.y:52.51-52: $l of 'exp' has no declared type
-test.y:55.46-49: invalid reference: '$r12'
+test.y:51.51-60: warning: misleading reference: '$<ival>exp' [-Wother]
+test.y:42.1-3:       refers to: $exp at $$
+test.y:51.7:         possibly meant: $x, hiding $exp at $1
+test.y:51.41:        possibly meant: $r, hiding $exp at $4
+test.y:52.51-52: error: $l of 'exp' has no declared type
+test.y:55.46-49: error: invalid reference: '$r12'

 test.y:55.3-53:      symbol not found in production: r12
 test.y:55.3-53:      symbol not found in production: r12

-test.y:56.29-33: invalid reference: '$expo'
+test.y:56.29-33: error: invalid reference: '$expo'

 test.y:56.3-46:      symbol not found in production: expo
 ]])
 test.y:56.3-46:      symbol not found in production: expo
 ]])

+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 #######################################################################
 AT_CLEANUP
 
 #######################################################################


@@ -281,9 +277,9 @@ foo: '1'
 foo.bar: '2'
 ]])
 AT_BISON_CHECK([-o test.c test.y], 0, [],
 foo.bar: '2'
 ]])
 AT_BISON_CHECK([-o test.c test.y], 0, [],

-[[test.y:11.22-29: warning: misleading reference: '$foo.bar'
-test.y:11.8-10:      warning: refers to: $foo at $1
-test.y:11.12-18:     warning: possibly meant: $[foo.bar] at $2
+[[test.y:11.22-29: warning: misleading reference: '$foo.bar' [-Wother]
+test.y:11.8-10:      refers to: $foo at $1
+test.y:11.12-18:     possibly meant: $[foo.bar] at $2

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -357,43 +353,43 @@ factor:     '(' expr ')'  { $$ = $2; }
     ;
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
     ;
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:24.36-41: invalid reference: '$cond1'
+[[test.y:24.36-41: error: invalid reference: '$cond1'

 test.y:23.11-24.62:  symbol not found in production: cond1
 test.y:23.11-24.62:  symbol not found in production: cond1

-test.y:26.43-53: invalid reference: '$stmt.field'
+test.y:26.43-53: error: invalid reference: '$stmt.field'

 test.y:25.11-26.60:  symbol not found in production: stmt
 test.y:25.35-38:     possibly meant: $then.field, hiding $stmt.field at $4
 test.y:25.11-26.60:  symbol not found in production: stmt
 test.y:25.35-38:     possibly meant: $then.field, hiding $stmt.field at $4

-test.y:28.43-52: invalid reference: '$stmt.list'
+test.y:28.43-52: error: invalid reference: '$stmt.list'

 test.y:27.11-28.59:  symbol not found in production: stmt
 test.y:27.30-38:     possibly meant: $[stmt.list] at $4
 test.y:27.11-28.59:  symbol not found in production: stmt
 test.y:27.30-38:     possibly meant: $[stmt.list] at $4

-test.y:30.43-46: ambiguous reference: '$xyz'
+test.y:30.43-46: error: ambiguous reference: '$xyz'

 test.y:29.35-37:     refers to: $xyz at $4
 test.y:29.50-52:     refers to: $xyz at $6
 test.y:29.35-37:     refers to: $xyz at $4
 test.y:29.50-52:     refers to: $xyz at $6

-test.y:32.43-52: invalid reference: '$stmt.list'
+test.y:32.43-52: error: invalid reference: '$stmt.list'

 test.y:31.11-32.63:  symbol not found in production: stmt
 test.y:31.40-43:     possibly meant: $then, hiding $[stmt.list] at $4
 test.y:31.61-64:     possibly meant: $else, hiding $[stmt.list] at $6
 test.y:31.11-32.63:  symbol not found in production: stmt
 test.y:31.40-43:     possibly meant: $then, hiding $[stmt.list] at $4
 test.y:31.61-64:     possibly meant: $else, hiding $[stmt.list] at $6

-test.y:34.43-58: invalid reference: '$stmt.list.field'
+test.y:34.43-58: error: invalid reference: '$stmt.list.field'

 test.y:33.11-34.69:  symbol not found in production: stmt
 test.y:33.40-43:     possibly meant: $then.field, hiding $[stmt.list].field at $4
 test.y:33.61-64:     possibly meant: $else.field, hiding $[stmt.list].field at $6
 test.y:33.11-34.69:  symbol not found in production: stmt
 test.y:33.40-43:     possibly meant: $then.field, hiding $[stmt.list].field at $4
 test.y:33.61-64:     possibly meant: $else.field, hiding $[stmt.list].field at $6

-test.y:36.43-54: invalid reference: '$[stmt.list]'
+test.y:36.43-54: error: invalid reference: '$[stmt.list]'

 test.y:35.11-36.71:  symbol not found in production: stmt.list
 test.y:35.40-43:     possibly meant: $then, hiding $[stmt.list] at $4
 test.y:35.61-64:     possibly meant: $else, hiding $[stmt.list] at $6
 test.y:35.11-36.71:  symbol not found in production: stmt.list
 test.y:35.40-43:     possibly meant: $then, hiding $[stmt.list] at $4
 test.y:35.61-64:     possibly meant: $else, hiding $[stmt.list] at $6

-test.y:38.43-49: invalid reference: '$then.1'
+test.y:38.43-49: error: invalid reference: '$then.1'

 test.y:37.11-38.60:  symbol not found in production: then
 test.y:37.40-45:     possibly meant: $[then.1] at $4
 test.y:37.11-38.60:  symbol not found in production: then
 test.y:37.40-45:     possibly meant: $[then.1] at $4

-test.y:40.43-55: invalid reference: '$then.1.field'
+test.y:40.43-55: error: invalid reference: '$then.1.field'

 test.y:39.11-40.66:  symbol not found in production: then
 test.y:39.40-45:     possibly meant: $[then.1].field at $4
 test.y:39.11-40.66:  symbol not found in production: then
 test.y:39.40-45:     possibly meant: $[then.1].field at $4

-test.y:42.44-50: invalid reference: '$stmt.x'
+test.y:42.44-50: error: invalid reference: '$stmt.x'

 test.y:41.12-42.57:  symbol not found in production: stmt
 test.y:41.36-41:     possibly meant: $[stmt.x].x, hiding $stmt.x at $4
 test.y:41.36-41:     possibly meant: $[stmt.x] at $4
 test.y:41.12-42.57:  symbol not found in production: stmt
 test.y:41.36-41:     possibly meant: $[stmt.x].x, hiding $stmt.x at $4
 test.y:41.36-41:     possibly meant: $[stmt.x] at $4

-test.y:44.13-22: invalid reference: '$if-stmt-a'
+test.y:44.13-22: error: invalid reference: '$if-stmt-a'

 test.y:43.12-44.59:  symbol not found in production: if
 test.y:43.1-9:       possibly meant: $[if-stmt-a] at $$
 test.y:43.12-44.59:  symbol not found in production: if
 test.y:43.1-9:       possibly meant: $[if-stmt-a] at $$

-test.y:46.46-54: invalid reference: '$then-a.f'
+test.y:46.46-54: error: invalid reference: '$then-a.f'

 test.y:45.12-46.65:  symbol not found in production: then
 test.y:45.41-46:     possibly meant: $[then-a].f at $4
 ]])
 test.y:45.12-46.65:  symbol not found in production: then
 test.y:45.41-46:     possibly meant: $[then-a].f at $4
 ]])


@@ -409,7 +405,7 @@ start: foo[] bar
   { s = $foo; }
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
   { s = $foo; }
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:11.12: an identifier expected
+[[test.y:11.12: error: an identifier expected

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -423,7 +419,7 @@ start: foo[ a d ] bar
   { s = $foo; }
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
   { s = $foo; }
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:11.15: unexpected identifier in bracketed name: 'd'
+[[test.y:11.15: error: unexpected identifier in bracketed name: 'd'

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -437,7 +433,7 @@ start: foo[/* comment */] bar
   { s = $foo; }
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
   { s = $foo; }
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:11.25: an identifier expected
+[[test.y:11.25: error: an identifier expected

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -447,14 +443,19 @@ AT_SETUP([Stray symbols in brackets])
 AT_DATA_GRAMMAR([test.y],
 [[
 %%
 AT_DATA_GRAMMAR([test.y],
 [[
 %%

-start: foo[ /* aaa */ *&-.+ ] bar
+start: foo[ /* aaa */ *&-.+\000\001\002\377 ] bar

   { s = $foo; }
 ]])
   { s = $foo; }
 ]])

+AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' test.y || exit 77]])

 AT_BISON_CHECK([-o test.c test.y], 1, [],
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:11.23: invalid character in bracketed name: '*'
-test.y:11.24: invalid character in bracketed name: '&'
-test.y:11.25: invalid character in bracketed name: '-'
-test.y:11.27: invalid character in bracketed name: '+'
+[[test.y:11.23: error: invalid character in bracketed name: '*'
+test.y:11.24: error: invalid character in bracketed name: '&'
+test.y:11.25: error: invalid character in bracketed name: '-'
+test.y:11.27: error: invalid character in bracketed name: '+'
+test.y:11.28: error: invalid character in bracketed name: '\0'
+test.y:11.28: error: invalid character in bracketed name: '\001'
+test.y:11.28: error: invalid character in bracketed name: '\002'
+test.y:11.28: error: invalid character in bracketed name: '\377'

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -467,7 +468,7 @@ AT_DATA_GRAMMAR([test.y],
 start[a s]: foo;
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
 start[a s]: foo;
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:11.9: unexpected identifier in bracketed name: 's'
+[[test.y:11.9: error: unexpected identifier in bracketed name: 's'

 ]])
 AT_CLEANUP
 
 ]])
 AT_CLEANUP
 


@@ -514,37 +515,37 @@ sym_a: 'a';
 sym_b: 'b';
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
 sym_b: 'b';
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],

-[[test.y:12.22-31: invalid reference: '$sym.field'
+[[test.y:12.22-31: error: invalid reference: '$sym.field'

 test.y:12.3-35:      symbol not found in production: sym
 test.y:12.3-35:      symbol not found in production: sym

-test.y:13.22-35: invalid reference: '$<aa>sym.field'
+test.y:13.22-35: error: invalid reference: '$<aa>sym.field'

 test.y:13.3-39:      symbol not found in production: sym
 test.y:13.3-39:      symbol not found in production: sym

-test.y:14.22-33: invalid reference: '$[sym.field]'
+test.y:14.22-33: error: invalid reference: '$[sym.field]'

 test.y:14.3-37:      symbol not found in production: sym.field
 test.y:14.3-37:      symbol not found in production: sym.field

-test.y:15.22-37: invalid reference: '$<aa>[sym.field]'
+test.y:15.22-37: error: invalid reference: '$<aa>[sym.field]'

 test.y:15.3-41:      symbol not found in production: sym.field
 test.y:15.3-41:      symbol not found in production: sym.field

-test.y:16.22-25: invalid reference: '$sym'
+test.y:16.22-25: error: invalid reference: '$sym'

 test.y:16.3-29:      symbol not found in production: sym
 test.y:16.3-29:      symbol not found in production: sym

-test.y:17.22-29: invalid reference: '$<aa>sym'
+test.y:17.22-29: error: invalid reference: '$<aa>sym'

 test.y:17.3-33:      symbol not found in production: sym
 test.y:17.3-33:      symbol not found in production: sym

-test.y:18.22-27: invalid reference: '$[sym]'
+test.y:18.22-27: error: invalid reference: '$[sym]'

 test.y:18.3-65:      symbol not found in production before $3: sym
 test.y:18.3-65:      symbol not found in production before $3: sym

-test.y:18.52-61: invalid reference: '$<aa>[sym]'
+test.y:18.52-61: error: invalid reference: '$<aa>[sym]'

 test.y:18.3-65:      symbol not found in production: sym
 test.y:18.3-65:      symbol not found in production: sym

-test.y:22.22-31: invalid reference: '$sym-field'
+test.y:22.22-31: error: invalid reference: '$sym-field'

 test.y:22.3-35:      symbol not found in production: sym
 test.y:22.3-35:      symbol not found in production: sym

-test.y:23.22-35: invalid reference: '$<aa>sym-field'
+test.y:23.22-35: error: invalid reference: '$<aa>sym-field'

 test.y:23.3-39:      symbol not found in production: sym
 test.y:23.3-39:      symbol not found in production: sym

-test.y:24.22-33: invalid reference: '$[sym-field]'
+test.y:24.22-33: error: invalid reference: '$[sym-field]'

 test.y:24.3-37:      symbol not found in production: sym-field
 test.y:24.3-37:      symbol not found in production: sym-field

-test.y:25.22-37: invalid reference: '$<aa>[sym-field]'
+test.y:25.22-37: error: invalid reference: '$<aa>[sym-field]'

 test.y:25.3-41:      symbol not found in production: sym-field
 test.y:25.3-41:      symbol not found in production: sym-field

-test.y:26.22-25: invalid reference: '$sym'
+test.y:26.22-25: error: invalid reference: '$sym'

 test.y:26.3-29:      symbol not found in production: sym
 test.y:26.3-29:      symbol not found in production: sym

-test.y:27.22-29: invalid reference: '$<aa>sym'
+test.y:27.22-29: error: invalid reference: '$<aa>sym'

 test.y:27.3-33:      symbol not found in production: sym
 test.y:27.3-33:      symbol not found in production: sym

-test.y:28.22-27: invalid reference: '$[sym]'
+test.y:28.22-27: error: invalid reference: '$[sym]'

 test.y:28.3-65:      symbol not found in production before $3: sym
 test.y:28.3-65:      symbol not found in production before $3: sym

-test.y:28.52-61: invalid reference: '$<aa>[sym]'
+test.y:28.52-61: error: invalid reference: '$<aa>[sym]'

 test.y:28.3-65:      symbol not found in production: sym
 ]])
 AT_CLEANUP
 test.y:28.3-65:      symbol not found in production: sym
 ]])
 AT_CLEANUP


@@ -562,10 +563,10 @@ start:
 .field: ;
 ]])
 AT_BISON_CHECK([[test.y]], [[1]], [],
 .field: ;
 ]])
 AT_BISON_CHECK([[test.y]], [[1]], [],

-[[test.y:4.12-18: invalid reference: '$.field'
+[[test.y:4.12-18: error: invalid reference: '$.field'

 test.y:4.13:        syntax error after '$', expecting integer, letter, '_', '@<:@', or '$'
 test.y:4.3-8:       possibly meant: $[.field] at $1
 test.y:4.13:        syntax error after '$', expecting integer, letter, '_', '@<:@', or '$'
 test.y:4.3-8:       possibly meant: $[.field] at $1

-test.y:5.12-18: invalid reference: '@.field'
+test.y:5.12-18: error: invalid reference: '@.field'

 test.y:5.13:        syntax error after '@', expecting integer, letter, '_', '@<:@', or '$'
 ]])
 AT_DATA([[test.y]],
 test.y:5.13:        syntax error after '@', expecting integer, letter, '_', '@<:@', or '$'
 ]])
 AT_DATA([[test.y]],


@@ -577,7 +578,7 @@ start:
 ;
 ]])
 AT_BISON_CHECK([[test.y]], [[0]], [],
 ;
 ]])
 AT_BISON_CHECK([[test.y]], [[0]], [],

-[[test.y:4.9: warning: stray '$'
-test.y:5.9: warning: stray '@'
+[[test.y:4.9: warning: stray '$' [-Wother]
+test.y:5.9: warning: stray '@' [-Wother]

 ]])
 AT_CLEANUP
 ]])
 AT_CLEANUP