diff options
| author | Neil Booth <neilb@earthling.net> | 2000-02-14 06:31:20 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-02-14 06:31:20 +0000 |
| commit | 67b8719a740421cb528d9266ac5a0782d15a8fdf (patch) | |
| tree | 6aac817dd3ae37c2f473a8346e2224e721a5a4bf /gcc/cppfiles.c | |
| parent | 4eadede7c1f74d804d54f1f5d4257d53c91fe6c1 (diff) | |
| download | gcc-67b8719a740421cb528d9266ac5a0782d15a8fdf.zip gcc-67b8719a740421cb528d9266ac5a0782d15a8fdf.tar.gz gcc-67b8719a740421cb528d9266ac5a0782d15a8fdf.tar.bz2 | |
cppfiles.c (read_and_prescan): When emitting deferred newlines...
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
Diffstat (limited to 'gcc/cppfiles.c')
| -rw-r--r-- | gcc/cppfiles.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index a00fb89..592cb6b 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -904,8 +904,9 @@ read_and_prescan (pfile, fp, desc, len) 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; @@ -924,15 +925,15 @@ read_and_prescan (pfile, fp, desc, len) 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; |