Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

quote consistently and make tests pass with new quoting from gnulib

Browse Source 
Updating to gnulib pulled in new quote and quotarg modules,
by which quoting is now done like 'this' rather than `this'.
That change induces many "make check" test failures.  This change
adapts code and tests so that "make check" passes once again.
* src/scan-code.l: Quote like 'this', not like `this'.
* src/scan-gram.l: Likewise.
* src/symtab.c: Likewise.
* tests/actions.at: Adjust tests to match.
* tests/input.at: Likewise.
* tests/named-refs.at: Likewise.
* tests/output.at: Likewise.
* tests/regression.at: Likewise.
* lib/.gitignore: Regenerate.
* m4/.gitignore: Likewise.
(cherry picked from commit ae93e4e4b8)

Conflicts:

	src/scan-code.l
	src/scan-gram.l
	src/symtab.c
	tests/output.at
This commit is contained in:
Jim Meyering
2012-01-16 19:20:50 +01:00
committed by Akim Demaille
parent 14594e38ad
commit 9874f80b2e
10 changed files with 207 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
tests/named-refs.at
View File

@@ -255,16 +255,16 @@ exp:
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
[[test.y:50.51-60: invalid reference: `$<ival>lo9'
[[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: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: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.29-33: invalid reference: '$expo'
test.y:56.3-46: symbol not found in production: expo
]])
AT_CLEANUP
@@ -280,7 +280,7 @@ 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.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
]])
@@ -356,43 +356,43 @@ factor: '(' expr ')' { $$ = $2; }
;
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
[[test.y:24.36-41: invalid reference: `$cond1'
[[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: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: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: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: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: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: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: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: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: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: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: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
]])
@@ -422,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
@@ -450,10 +450,10 @@ 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.25: invalid character in bracketed name: `-'
test.y:11.27: 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
@@ -466,7 +466,7 @@ AT_DATA_GRAMMAR([test.y],
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
@@ -513,37 +513,37 @@ sym_a: 'a';
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: 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.52-61: invalid reference: '$<aa>[sym]'
test.y:28.3-65: symbol not found in production: sym
]])
AT_CLEANUP
@@ -561,11 +561,11 @@ start:
.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.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 `$'
test.y:5.12-18: invalid reference: '@.field'
test.y:5.13: syntax error after '@', expecting integer, letter, '_', '@<:@', or '$'
]])
AT_DATA([[test.y]],
[[
@@ -576,7 +576,7 @@ start:
;
]])
AT_BISON_CHECK([[test.y]], [[0]], [],
[[test.y:4.9: warning: stray `$'
test.y:5.9: warning: stray `@'
[[test.y:4.9: warning: stray '$'
test.y:5.9: warning: stray '@'
]])
AT_CLEANUP