2000-02-13 Neil Booth <NeilB@earthling.net>
* cppfiles.c (read_and_prescan): When emitting deferred
newlines, test speccase[] again instead of checking each
possible whitespace character in turn. When we encounter \r,
look behind for \n first, then ahead.
From-SVN: r31963
+2000-02-13 Neil Booth <NeilB@earthling.net>
+
+ * cppfiles.c (read_and_prescan): When emitting deferred
+ newlines, test speccase[] again instead of checking each
+ possible whitespace character in turn. When we encounter \r,
+ look behind for \n first, then ahead.
+
2000-02-13 Zack Weinberg <zack@wolery.cumb.org>
* cse.c (cse_altered): New internal flag.
memcpy (op, ip, span);
op += span;
ip += span;
- if (*ip == '\n' || *ip == '\t'
- || *ip == ' ' || *ip == ' ')
+ /* If ip[0] is SPECCASE_EMPTY, we have hit white space.
+ Dump out the remaining deferred \-newlines. */
+ if (speccase[ip[0]] == SPECCASE_EMPTY)
while (deferred_newlines)
deferred_newlines--, *op++ = '\r';
span = 0;
goto read_next;
case SPECCASE_CR: /* \r */
- if (*ip == '\n')
+ if (ip[-2] == '\n')
+ continue;
+ else if (*ip == '\n')
ip++;
else if (*ip == '\0')
{
*--ibase = '\r';
goto read_next;
}
- else if (ip[-2] == '\n')
- continue;
*op++ = '\n';
break;