cpplib.c (macroexpand): Correct off-by-one error in handling of escapes.

* cpplib.c (macroexpand): Correct off-by-one error in handling
        of escapes.

From-SVN: r22827
This commit is contained in:
Zack Weinberg 1998-10-05 00:03:35 +00:00 committed by Jeff Law
parent 861556b4d9
commit 4284b774e6
2 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,8 @@
Mon Oct 5 01:01:42 1998 Zack Weinberg <zack@rabi.phys.columbia.edu>
* cpplib.c (macroexpand): Correct off-by-one error in handling
of escapes.
Sun Oct 4 23:58:30 1998 Richard Henderson <rth@cygnus.com>
* combine.c (expand_field_assignment): Don't do bitwise operations

View file

@ -2888,8 +2888,8 @@ macroexpand (pfile, hp)
/* If whitespace is preceded by an odd number
of `@' signs, the last `@' was a whitespace
marker; drop it too. */
while (p2 != p1 && p2[-1] == '@') p2--;
if ((l1 - 1 - p2) & 1)
while (p2 != p1 && p2[0] == '@') p2--;
if ((l1 - p2) & 1)
l1--;
break;
}
@ -2899,8 +2899,8 @@ macroexpand (pfile, hp)
/* If a `-' is preceded by an odd number of
`@' signs then it and the last `@' are
a no-reexpansion marker. */
while (p2 != p1 && p2[-1] == '@') p2--;
if ((l1 - 1 - p2) & 1)
while (p2 != p1 && p2[0] == '@') p2--;
if ((l1 - p2) & 1)
l1 -= 2;
else
break;