X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/61bc57e533748127986da6efe8a2f058232e3b7b..62a87154b3bb1af77ee153603972090a600bafce:/tests/named-refs.at?ds=inline

diff --git a/tests/named-refs.at b/tests/named-refs.at
index 70741ad2..62c46211 100644
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -1,6 +1,6 @@
 # Named references test.                           -*- Autotest -*-
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-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
@@ -44,7 +44,7 @@ int yylex (void);
 %token <ival> NUM "number"
 %type  <ival> exp
 
-%nonassoc '='   /* comparison	       */
+%nonassoc '='   /* comparison          */
 %left '-' '+'
 %left '*' '/'
 %precedence NEG /* negation--unary minus */
@@ -215,7 +215,7 @@ int yylex (void);
 %token <ival> NUM "number"
 %type  <ival> exp
 
-%nonassoc '='   /* comparison	       */
+%nonassoc '='   /* comparison          */
 %left '-' '+'
 %left '*' '/'
 %precedence NEG /* negation--unary minus */
@@ -255,14 +255,17 @@ exp:
 ]])
 
 AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:50.51-60: unresolved reference: `$<ival>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: unresolved reference: `$r12'
-test.y:56.29-33: unresolved reference: `$expo'
+[[test.y:50.51-60: invalid reference: '$<ival>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:55.3-53:      symbol not found in production: r12
+test.y:56.29-33: invalid reference: '$expo'
+test.y:56.3-46:      symbol not found in production: expo
 ]])
 AT_CLEANUP
 
@@ -277,9 +280,9 @@ foo: '1'
 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'
+test.y:11.8-10:      warning: refers to: $foo at $1
+test.y:11.12-18:     warning: possibly meant: $[foo.bar] at $2
 ]])
 AT_CLEANUP
 
@@ -353,34 +356,45 @@ factor:     '(' expr ')'  { $$ = $2; }
     ;
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:24.36-41: unresolved reference: `$cond1'
-test.y:26.43-53: invalid reference: `$stmt.field'
-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:27.30-38:   possibly meant: $[stmt.list] at $4
-test.y:30.43-46: 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:32.43-52: invalid reference: `$stmt.list'
-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: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: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:37.40-45:   possibly meant: $[then.1] at $4
-test.y:40.43-55: invalid reference: `$then.1.field'
-test.y:39.40-45:   possibly meant: $[then.1].field at $4
-test.y:42.44-50: invalid reference: `$stmt.x'
-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:43.1-9:   possibly meant: $[if-stmt-a] at $$
-test.y:46.46-54: invalid reference: `$then-a.f'
-test.y:45.41-46:   possibly meant: $[then-a].f at $4
+[[test.y:24.36-41: invalid reference: '$cond1'
+test.y:23.11-24.62:  symbol not found in production: cond1
+test.y:26.43-53: 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:28.43-52: 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:30.43-46: 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:32.43-52: 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:34.43-58: 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:36.43-54: 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:38.43-49: 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:40.43-55: 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:42.44-50: 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:44.13-22: 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:46.46-54: 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
 ]])
 AT_CLEANUP
 
@@ -408,7 +422,7 @@ start: foo[ a d ] bar
   { 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: unexpected identifier in bracketed name: 'd'
 ]])
 AT_CLEANUP
 
@@ -432,13 +446,14 @@ AT_SETUP([Stray symbols in brackets])
 AT_DATA_GRAMMAR([test.y],
 [[
 %%
-start: foo[ /* aaa */ *&-+ ] bar
+start: foo[ /* aaa */ *&-.+ ] bar
   { s = $foo; }
 ]])
 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.26: invalid character in bracketed name: `+'
+[[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: '+'
 ]])
 AT_CLEANUP
 
@@ -448,86 +463,120 @@ AT_SETUP([Redundant words in LHS brackets])
 AT_DATA_GRAMMAR([test.y],
 [[
 %%
-start[a s]: foo
+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: unexpected identifier in bracketed name: 's'
 ]])
 AT_CLEANUP
 
 #######################################################################
 
+# Bison used to free twice the named ref for "a", since a single copy
+# was used in two rules.
+AT_SETUP([Factored LHS])
+AT_DATA_GRAMMAR([test.y],
+[[
+%%
+start[a]: "foo" | "bar";
+]])
+AT_BISON_CHECK([-o test.c test.y])
+AT_CLEANUP
+
+#######################################################################
+
 AT_SETUP([Unresolved references])
 AT_DATA_GRAMMAR([test.y],
 [[
 %%
 stat:
-sym_a sym_b
-{ func($sym.field); }
-|
-sym_a sym_b
-{ func($<aa>sym.field); }
-|
-sym_a sym_b
-{ func($[sym.field]); }
-|
-sym_a sym_b
-{ func($<aa>[sym.field]); }
-|
-sym_a sym_b
-{ func($sym); }
-|
-sym_a sym_b
-{ func($<aa>sym); }
-|
-sym_a sym_b
-{ func($[sym]); }
-sym_a sym_b
-{ func($<aa>[sym]); }
+  sym_a sym_b { func($sym.field); }
+| sym_a sym_b { func($<aa>sym.field); }
+| sym_a sym_b { func($[sym.field]); }
+| sym_a sym_b { func($<aa>[sym.field]); }
+| sym_a sym_b { func($sym); }
+| sym_a sym_b { func($<aa>sym); }
+| sym_a sym_b { func($[sym]); } sym_a sym_b { func($<aa>[sym]); }
 ;
+
 stat1:
-sym_a sym_b
-{ func($sym-field); }
-|
-sym_a sym_b
-{ func($<aa>sym-field); }
-|
-sym_a sym_b
-{ func($[sym-field]); }
-|
-sym_a sym_b
-{ func($<aa>[sym-field]); }
-|
-sym_a sym_b
-{ func($sym); }
-|
-sym_a sym_b
-{ func($<aa>sym); }
-|
-sym_a sym_b
-{ func($[sym]); }
-sym_a sym_b
-{ func($<aa>[sym]); }
+  sym_a sym_b { func($sym-field); }
+| sym_a sym_b { func($<aa>sym-field); }
+| sym_a sym_b { func($[sym-field]); }
+| sym_a sym_b { func($<aa>[sym-field]); }
+| sym_a sym_b { func($sym); }
+| sym_a sym_b { func($<aa>sym); }
+| sym_a sym_b { func($[sym]); } sym_a sym_b { func($<aa>[sym]); }
 ;
-sym_a : 'a';
-sym_b : 'b';
+
+sym_a: 'a';
+sym_b: 'b';
 ]])
 AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:13.8-11: unresolved reference: `$sym'
-test.y:16.8-15: unresolved reference: `$<aa>sym'
-test.y:19.8-19: unresolved reference: `$[sym.field]'
-test.y:22.8-23: unresolved reference: `$<aa>[sym.field]'
-test.y:25.8-11: unresolved reference: `$sym'
-test.y:28.8-15: unresolved reference: `$<aa>sym'
-test.y:31.8-13: unresolved reference: `$[sym]'
-test.y:33.8-17: unresolved reference: `$<aa>[sym]'
-test.y:37.8-11: unresolved reference: `$sym'
-test.y:40.8-15: unresolved reference: `$<aa>sym'
-test.y:43.8-19: unresolved reference: `$[sym-field]'
-test.y:46.8-23: unresolved reference: `$<aa>[sym-field]'
-test.y:49.8-11: unresolved reference: `$sym'
-test.y:52.8-15: unresolved reference: `$<aa>sym'
-test.y:55.8-13: unresolved reference: `$[sym]'
-test.y:57.8-17: unresolved reference: `$<aa>[sym]'
+[[test.y:12.22-31: invalid reference: '$sym.field'
+test.y:12.3-35:      symbol not found in production: sym
+test.y:13.22-35: invalid reference: '$<aa>sym.field'
+test.y:13.3-39:      symbol not found in production: sym
+test.y:14.22-33: invalid reference: '$[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.3-41:      symbol not found in production: sym.field
+test.y:16.22-25: invalid reference: '$sym'
+test.y:16.3-29:      symbol not found in production: sym
+test.y:17.22-29: invalid reference: '$<aa>sym'
+test.y:17.3-33:      symbol not found in production: sym
+test.y:18.22-27: invalid reference: '$[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.3-65:      symbol not found in production: sym
+test.y:22.22-31: invalid reference: '$sym-field'
+test.y:22.3-35:      symbol not found in production: sym
+test.y:23.22-35: invalid reference: '$<aa>sym-field'
+test.y:23.3-39:      symbol not found in production: sym
+test.y:24.22-33: invalid reference: '$[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.3-41:      symbol not found in production: sym-field
+test.y:26.22-25: invalid reference: '$sym'
+test.y:26.3-29:      symbol not found in production: sym
+test.y:27.22-29: invalid reference: '$<aa>sym'
+test.y:27.3-33:      symbol not found in production: sym
+test.y:28.22-27: invalid reference: '$[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.3-65:      symbol not found in production: sym
+]])
+AT_CLEANUP
+
+#######################################################################
+
+AT_SETUP([[$ or @ followed by . or -]])
+AT_DATA([[test.y]],
+[[
+%%
+start:
+  .field { $.field; }
+| 'a'    { @.field; }
+;
+.field: ;
+]])
+AT_BISON_CHECK([[test.y]], [[1]], [],
+[[test.y:4.12-18: 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:5.12-18: invalid reference: '@.field'
+test.y:5.13:        syntax error after '@', expecting integer, letter, '_', '@<:@', or '$'
+]])
+AT_DATA([[test.y]],
+[[
+%%
+start:
+  'a' { $-field; }
+| 'b' { @-field; }
+;
+]])
+AT_BISON_CHECK([[test.y]], [[0]], [],
+[[test.y:4.9: warning: stray '$'
+test.y:5.9: warning: stray '@'
 ]])
 AT_CLEANUP