darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR 6714

Browse source 
* rclex.c (handle_quotes): Do not complain about whitespace
        separating quoted strings.
        (rclex_string): Ignore whitespace when looking for a new opening
        quote following a closing quote.
This commit is contained in:
Nick Clifton 2009-07-01 15:52:27 +00:00
parent efde2f2ce4
commit a87a00ea43
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
binutils/ChangeLog
View file

@ -1,3 +1,11 @@
2009-07-01 Nick Clifton <nickc@redhat.com>
PR 6714
* rclex.c (handle_quotes): Do not complain about whitespace
separating quoted strings.
(rclex_string): Ignore whitespace when looking for a new opening
quote following a closing quote.
2009-06-27 H.J. Lu <hongjiu.lu@intel.com> 2009-06-27 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/10321 PR binutils/10321

18
binutils/rclex.c
View file

@ -390,9 +390,9 @@ handle_quotes (rc_uint_type *len)
} }
else else
{ {
rcparse_warning ("unexpected character after '\"'");
++t; ++t;
assert (ISSPACE (*t)); if (! ISSPACE (*t))
rcparse_warning ("unexpected character after '\"'");
while (ISSPACE (*t)) while (ISSPACE (*t))
{ {
if ((*t) == '\n') if ((*t) == '\n')
@ -679,7 +679,7 @@ static void
rclex_string (void) rclex_string (void)
{ {
int c; int c;
while ((c = rclex_peekch ()) != -1) while ((c = rclex_peekch ()) != -1)
{ {
if (c == '\n') if (c == '\n')
@ -693,6 +693,18 @@ rclex_string (void)
} }
else if (rclex_readch () == '"') else if (rclex_readch () == '"')
{ {
/* PR 6714
Skip any whitespace after the end of the double quotes. */
do
{
c = rclex_peekch ();
if (ISSPACE (c))
rclex_readch ();
else
c = -1;
}
while (c != -1);
if (rclex_peekch () == '"') if (rclex_peekch () == '"')
rclex_readch (); rclex_readch ();
else else