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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99d6003dec94540b48e0fcaaa881200372d43d72..21b8fc43275ac654cfa3b8707f1a715b2689eeab 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index a00fb89e395c671fa391688f75d8ade61e4ad678..592cb6b9201a395442d23eb2944a61dbcd986740 100644 (file)
--- 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;