grammars: fix display of nul character in error message

Reported by Marc Mendiola.
http://lists.gnu.org/archive/html/help-bison/2012-10/msg00017.html

* gnulib: Update to get quote_mem.
* src/scan-gram.l: Use it.
* tests/input.at (Invalid inputs): Additional checks.
* tests/named-refs.at: Likewise.
This commit is contained in:
Akim Demaille
2012-11-01 13:47:12 +01:00
parent baf0bd6145
commit 95066e9208
5 changed files with 28 additions and 13 deletions

View File

@@ -27,7 +27,8 @@ AT_BANNER([[Input Processing.]])
AT_SETUP([Invalid inputs])
AT_DATA([input.y],
[[%%
[[\000\001\002\377?
%%
?
default: 'a' }
%&
@@ -35,17 +36,23 @@ default: 'a' }
%-
%{
]])
AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' input.y || exit 77]])
AT_BISON_CHECK([input.y], [1], [],
[[input.y:2.1: invalid character: '?'
input.y:3.14: invalid character: '}'
input.y:4.1: invalid character: '%'
input.y:4.2: invalid character: '&'
input.y:5.1-17: invalid directive: '%a-does-not-exist'
input.y:6.1: invalid character: '%'
input.y:6.2: invalid character: '-'
input.y:7.1-8.0: missing '%}' at end of file
input.y:7.1-8.0: syntax error, unexpected %{...%}
[[input.y:1.1: invalid character: '\0'
input.y:1.1: invalid character: '\001'
input.y:1.1: invalid character: '\002'
input.y:1.1: invalid character: '\377'
input.y:1.2: invalid character: '?'
input.y:3.1: invalid character: '?'
input.y:4.14: invalid character: '}'
input.y:5.1: invalid character: '%'
input.y:5.2: invalid character: '&'
input.y:6.1-17: invalid directive: '%a-does-not-exist'
input.y:7.1: invalid character: '%'
input.y:7.2: invalid character: '-'
input.y:8.1-9.0: missing '%}' at end of file
input.y:8.1-9.0: syntax error, unexpected %{...%}
]])
AT_CLEANUP

View File

@@ -443,14 +443,19 @@ AT_SETUP([Stray symbols in brackets])
AT_DATA_GRAMMAR([test.y],
[[
%%
start: foo[ /* aaa */ *&-.+ ] bar
start: foo[ /* aaa */ *&-.+\000\001\002\377 ] bar
{ 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, [],
[[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.28: invalid character in bracketed name: '\0'
test.y:11.28: invalid character in bracketed name: '\001'
test.y:11.28: invalid character in bracketed name: '\002'
test.y:11.28: invalid character in bracketed name: '\377'
]])
AT_CLEANUP