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

change more quotes in source, and adjust tests to match

Browse Source 
Run this command to change each `%s' to '%s' in source directories:
  git grep -l '`%s'\' src djgpp data \
    |xargs perl -pi -e '$q="'\''";s/`%s$q/$q%s$q/g'
* data/bison.m4: Affected per the above.
* djgpp/subpipe.c: Likewise.
* src/files.c: Likewise.
* src/getargs.c: Likewise.
* src/muscle-tab.c: Likewise.
* src/reader.c: Likewise.
* tests/glr-regression.at: Adjust to match.
* tests/input.at: Likewise.
* tests/push.at: Likewise.
* tests/skeletons.at: Likewise.
(cherry picked from commit 4aa9d1ff9c)

Conflicts:

	src/getargs.c
	src/muscle-tab.c
	src/reader.c
	tests/input.at
This commit is contained in:
Jim Meyering
2012-01-16 19:36:41 +01:00
committed by Akim Demaille
parent 9874f80b2e
commit abf3f74b21
10 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/glr-regression.at
View File

@@ -1781,9 +1781,9 @@ main (void)
]])
AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],
[glr-regr18.y:26.18-24: result type clash on merge function `merge': <type2> != <type1>
[glr-regr18.y:26.18-24: result type clash on merge function 'merge': <type2> != <type1>
glr-regr18.y:25.18-24: previous declaration
glr-regr18.y:27.13-19: result type clash on merge function `merge': <type3> != <type2>
glr-regr18.y:27.13-19: result type clash on merge function 'merge': <type3> != <type2>
glr-regr18.y:26.18-24: previous declaration
])

86
tests/input.at
View File

@@ -837,10 +837,10 @@ AT_DATA([input-c.y],
start: ;
]])
AT_BISON_CHECK([[input-c.y]], [[1]], [],
[[input-c.y:1.7: %code qualifier `q' is not used
input-c.y:2.7-9: %code qualifier `bad' is not used
input-c.y:3.7-9: %code qualifier `bad' is not used
input-c.y:4.7-12: %code qualifier `format' is not used
[[input-c.y:1.7: %code qualifier 'q' is not used
input-c.y:2.7-9: %code qualifier 'bad' is not used
input-c.y:3.7-9: %code qualifier 'bad' is not used
input-c.y:4.7-12: %code qualifier 'format' is not used
]])
AT_DATA([input-c-glr.y],
@@ -851,9 +851,9 @@ AT_DATA([input-c-glr.y],
start: ;
]])
AT_BISON_CHECK([[input-c-glr.y]], [[1]], [],
[[input-c-glr.y:1.7: %code qualifier `q' is not used
input-c-glr.y:2.7-9: %code qualifier `bad' is not used
input-c-glr.y:3.8-10: %code qualifier `bad' is not used
[[input-c-glr.y:1.7: %code qualifier 'q' is not used
input-c-glr.y:2.7-9: %code qualifier 'bad' is not used
input-c-glr.y:3.8-10: %code qualifier 'bad' is not used
]])
AT_DATA([input-c++.y],
@@ -864,9 +864,9 @@ AT_DATA([input-c++.y],
start: ;
]])
AT_BISON_CHECK([[input-c++.y]], [[1]], [],
[[input-c++.y:1.7: %code qualifier `q' is not used
input-c++.y:2.7-9: %code qualifier `bad' is not used
input-c++.y:3.8: %code qualifier `q' is not used
[[input-c++.y:1.7: %code qualifier 'q' is not used
input-c++.y:2.7-9: %code qualifier 'bad' is not used
input-c++.y:3.8: %code qualifier 'q' is not used
]])
AT_DATA([input-c++-glr.y],
@@ -877,9 +877,9 @@ AT_DATA([input-c++-glr.y],
start: ;
]])
AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [],
[[input-c++-glr.y:1.7-9: %code qualifier `bad' is not used
input-c++-glr.y:2.7: %code qualifier `q' is not used
input-c++-glr.y:3.7: %code qualifier `q' is not used
[[input-c++-glr.y:1.7-9: %code qualifier 'bad' is not used
input-c++-glr.y:2.7: %code qualifier 'q' is not used
input-c++-glr.y:3.7: %code qualifier 'q' is not used
]])
AT_DATA([special-char-@@.y],
@@ -890,9 +890,9 @@ AT_DATA([special-char-@@.y],
start: ;
]])
AT_BISON_CHECK([[special-char-@@.y]], [[1]], [],
[[special-char-@@.y:1.7-9: %code qualifier `bad' is not used
special-char-@@.y:2.7: %code qualifier `q' is not used
special-char-@@.y:3.7: %code qualifier `q' is not used
[[special-char-@@.y:1.7-9: %code qualifier 'bad' is not used
special-char-@@.y:2.7: %code qualifier 'q' is not used
special-char-@@.y:3.7: %code qualifier 'q' is not used
]])
AT_DATA([special-char-@:>@.y],
@@ -903,9 +903,9 @@ AT_DATA([special-char-@:>@.y],
start: ;
]])
AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [],
[[special-char-@:>@.y:1.7-9: %code qualifier `bad' is not used
special-char-@:>@.y:2.7: %code qualifier `q' is not used
special-char-@:>@.y:3.7: %code qualifier `q' is not used
[[special-char-@:>@.y:1.7-9: %code qualifier 'bad' is not used
special-char-@:>@.y:2.7: %code qualifier 'q' is not used
special-char-@:>@.y:3.7: %code qualifier 'q' is not used
]])
AT_CLEANUP
@@ -928,9 +928,9 @@ start: ;
]])
AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
[[input-redefined.y:2.9-11: %define variable `var' redefined
[[input-redefined.y:2.9-11: %define variable 'var' redefined
input-redefined.y:1.9-11: previous definition
input-redefined.y:3.10-12: %define variable `var' redefined
input-redefined.y:3.10-12: %define variable 'var' redefined
input-redefined.y:2.9-11: previous definition
]])
@@ -941,7 +941,7 @@ start: ;
]])
AT_BISON_CHECK([[input-unused.y]], [[1]], [],
[[input-unused.y:1.9-11: %define variable `var' is not used
[[input-unused.y:1.9-11: %define variable 'var' is not used
]])
AT_CLEANUP
@@ -985,7 +985,7 @@ AT_DATA([[input-dg.y]],
start: ;
]])
AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
[[input-dg.y:1.9-11: %define variable `var' redefined
[[input-dg.y:1.9-11: %define variable 'var' redefined
<command line>:2: previous definition
]])
@@ -994,8 +994,8 @@ AT_DATA([[input-unused.y]],
start: ;
]])
AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],
[[<command line>:2: %define variable `unused-d' is not used
<command line>:3: %define variable `unused-f' is not used
[[<command line>:2: %define variable 'unused-d' is not used
<command line>:3: %define variable 'unused-f' is not used
]])
AT_CLEANUP
@@ -1015,7 +1015,7 @@ start: ;
]])
AT_BISON_CHECK([[Input.y]], [1], [],
[[Input.y:2.9-14: invalid value for %define Boolean variable `public'
[[Input.y:2.9-14: invalid value for %define Boolean variable 'public'
]])
AT_CLEANUP
@@ -1033,10 +1033,10 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [[]],
[[input.y:1.9-29: invalid value for %define variable `lr.default-reductions': `bogus'
input.y:1.9-29: accepted value: `most'
input.y:1.9-29: accepted value: `consistent'
input.y:1.9-29: accepted value: `accepting'
[[input.y:1.9-29: invalid value for %define variable 'lr.default-reductions': 'bogus'
input.y:1.9-29: accepted value: 'most'
input.y:1.9-29: accepted value: 'consistent'
input.y:1.9-29: accepted value: 'accepting'
]])
# Back-end.
@@ -1046,10 +1046,10 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither'
input.y:1.9-21: accepted value: `pull'
input.y:1.9-21: accepted value: `push'
input.y:1.9-21: accepted value: `both'
[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
input.y:1.9-21: accepted value: 'pull'
input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both'
]])
AT_CLEANUP
@@ -1069,10 +1069,10 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither'
input.y:1.9-21: accepted value: `pull'
input.y:1.9-21: accepted value: `push'
input.y:1.9-21: accepted value: `both'
[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
input.y:1.9-21: accepted value: 'pull'
input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both'
]])
AT_DATA([[input.y]],
@@ -1081,7 +1081,7 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-34: invalid value for %define Boolean variable `lr.keep-unreachable-states'
[[input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states'
]])
AT_DATA([[input.y]],
@@ -1090,7 +1090,7 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [],
[[input.y:1.9-15: %define variable `foo_bar' is not used
[[input.y:1.9-15: %define variable 'foo_bar' is not used
]])
AT_CLEANUP
@@ -1115,7 +1115,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [],
[[input.y:1.9-16: %define variable `api.pure' is not used
[[input.y:1.9-16: %define variable 'api.pure' is not used
]])
])
@@ -1300,11 +1300,11 @@ start: ;
# parse.lac.* options are useless if LAC isn't actually activated.
AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]],
[[1]], [],
[[<command line>:2: %define variable `parse.lac.es-capacity-initial' is not used
[[<command line>:2: %define variable 'parse.lac.es-capacity-initial' is not used
]])
AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
[[1]], [],
[[<command line>:2: %define variable `parse.lac.memory-trace' is not used
[[<command line>:2: %define variable 'parse.lac.memory-trace' is not used
]])
AT_CLEANUP

2
tests/push.at
View File

@@ -163,7 +163,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [],
[[input.y:2.9-21: %define variable `api.push-pull' is not used
[[input.y:2.9-21: %define variable 'api.push-pull' is not used
]])
AT_CLEANUP

6
tests/skeletons.at
View File

@@ -160,7 +160,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [[]],
[[<skeleton default value>: invalid value for %define Boolean variable `foo'
[[<skeleton default value>: invalid value for %define Boolean variable 'foo'
]])
AT_CLEANUP
@@ -228,7 +228,7 @@ start: ;
]])
AT_BISON_CHECK([[input3.y]], [[1]], [[]],
[[input3.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_loc
[[input3.y: fatal error: undefined %define variable 'bogus' passed to b4_percent_define_get_loc
]])
AT_DATA([[skel4.c]],
@@ -242,7 +242,7 @@ start: ;
]])
AT_BISON_CHECK([[input4.y]], [[1]], [[]],
[[input4.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_syncline
[[input4.y: fatal error: undefined %define variable 'bogus' passed to b4_percent_define_get_syncline
]])
AT_CLEANUP