On Thu, 23 Jul 2009, Eric Blake wrote: > Joel E. Denny <jdenny <at> clemson.edu> writes: > > > /* Characters. We don't check there is only one. */ > > > > Is there some good reason why we shouldn't check? If not, then I'd like > > to push the following patch (written against branch-2.5) to master and > > branch-2.5. Any objections? > > None from me.
Thanks. I'll wait a few more days before pushing in case anyone else thinks of a reason why this change is undesirable. > > In the new test group, I wish I could check the case where a character > > literal ends at eof without a newline. However, the documentation for > > AT_DATA demands that the file contents end with an "end of line", so I'm > > not sure what to do. I might write the Autoconf people later if no one > > around here already knows how to work around this limitation. > > That's an inherent limitation of AT_DATA (since it is implemented using a > shell > here-doc); the only way around it is to manually use printf or $ECHO_N to > concatenate data to the end of the desired file. > > I've been meaning to add a new macro to autotest to allow more flexibility in > generating files (no trailing newline, and/or allowing shell expansions) but > it > will not be in time for autoconf 2.64. Feel free to ping the autoconf list, > so > that I'll have a reminder email. I've extended the test group according to these suggestions. The revised patch is below. >From 6c859bc1ab7d5de2b7d822c65ff4eb5c4411ff38 Mon Sep 17 00:00:00 2001 From: Joel E. Denny <[email protected]> Date: Thu, 23 Jul 2009 13:29:22 -0400 Subject: [PATCH] Warn about character literals not of length one. * NEWS (2.5): Document. * src/scan-gram.l (INITIAL): Remove comment that we don't check the length. (SC_ESCAPED_CHARACTER): Warn if length is wrong. * tests/input.at (Bad character literals): New test group. diff --git a/NEWS b/NEWS index 7d401ad..e723542 100644 --- a/NEWS +++ b/NEWS @@ -98,6 +98,18 @@ Bison News about a missing semicolon where it did not before. Future releases of Bison will cease to append semicolons entirely. +** Character literals not of length one. + + Previously, Bison quietly converted all character literals to length + one. For example, without warning, Bison interpreted the operators in + the following grammar to be the same token: + + exp: exp '++' + | exp '+' exp + ; + + Bison now warns when a character literal is not of length one. + * Changes in version 2.4.2 (????-??-??): ** %code is now a permanent feature. diff --git a/src/scan-gram.l b/src/scan-gram.l index 60813bb..7017dbb 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -250,7 +250,7 @@ splice (\\[ \f\t\v]*\n)* complain_at (*loc, _("invalid identifier: %s"), quote (yytext)); } - /* Characters. We don't check there is only one. */ + /* Characters. */ "'" STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER; /* Strings. */ @@ -465,24 +465,38 @@ splice (\\[ \f\t\v]*\n)* <SC_ESCAPED_CHARACTER> { "'"|"\n" { - if (yytext[0] == '\n') - unexpected_newline (token_start, "'"); STRING_GROW; STRING_FINISH; loc->start = token_start; val->character = last_string[1]; + { + size_t length = strlen (last_string); + if (strlen (last_string) < 3) + warn_at (*loc, _("empty character literal")); + else if (strlen (last_string) > 3) + warn_at (*loc, _("extra characters in character literal")); + } + if (yytext[0] == '\n') + unexpected_newline (token_start, "'"); STRING_FREE; BEGIN INITIAL; return CHAR; } <<EOF>> { - unexpected_eof (token_start, "'"); STRING_FINISH; loc->start = token_start; - if (strlen (last_string) > 1) - val->character = last_string[1]; - else - val->character = last_string[0]; + { + size_t length = strlen (last_string); + if (length < 2) + warn_at (*loc, _("empty character literal")); + else if (length > 2) + warn_at (*loc, _("extra characters in character literal")); + if (length > 1) + val->character = last_string[1]; + else + val->character = last_string[0]; + } + unexpected_eof (token_start, "'"); STRING_FREE; BEGIN INITIAL; return CHAR; diff --git a/tests/input.at b/tests/input.at index f62a68d..4d5d0bb 100644 --- a/tests/input.at +++ b/tests/input.at @@ -1162,3 +1162,65 @@ AT_CHECK_NAMESPACE_ERROR([[::]], [[namespace reference has a trailing "::"]]) AT_CLEANUP + +## ------------------------ ## +## Bad character literals. ## +## ------------------------ ## + +# Bison used to accept character literals that were empty or contained +# too many characters. + +# FIXME: $ECHO_N and $ECHO_C are not very portable according to the +# Autoconf manual. Switch to AS_ECHO_N when Autoconf 2.64 is released? +# Even better, AT_DATA or some variant of AT_DATA may eventually permit +# a trailing newline. See the threads starting at +# <http://lists.gnu.org/archive/html/bison-patches/2009-07/msg00019.html>. + +AT_SETUP([[Bad character literals]]) + +AT_DATA([empty.y], +[[%% +start: ''; +start: ' +]]) +echo $ECHO_N "start: '$ECHO_C" >> empty.y + +AT_BISON_CHECK([empty.y], [1], [], +[[empty.y:2.8-9: warning: empty character literal +empty.y:3.8-4.0: warning: empty character literal +empty.y:3.8-4.0: missing `'' at end of line +empty.y:4.8: warning: empty character literal +empty.y:4.8: missing `'' at end of file +]]) + +AT_DATA([two.y], +[[%% +start: 'ab'; +start: 'ab +]]) +echo $ECHO_N "start: 'ab$ECHO_C" >> two.y + +AT_BISON_CHECK([two.y], [1], [], +[[two.y:2.8-11: warning: extra characters in character literal +two.y:3.8-4.0: warning: extra characters in character literal +two.y:3.8-4.0: missing `'' at end of line +two.y:4.8-10: warning: extra characters in character literal +two.y:4.8-10: missing `'' at end of file +]]) + +AT_DATA([three.y], +[[%% +start: 'abc'; +start: 'abc +]]) +echo $ECHO_N "start: 'abc$ECHO_C" >> three.y + +AT_BISON_CHECK([three.y], [1], [], +[[three.y:2.8-12: warning: extra characters in character literal +three.y:3.8-4.0: warning: extra characters in character literal +three.y:3.8-4.0: missing `'' at end of line +three.y:4.8-11: warning: extra characters in character literal +three.y:4.8-11: missing `'' at end of file +]]) + +AT_CLEANUP -- 1.5.4.3
