From: neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 10 May 2000 09:11:06 +0000 (+0000)
Subject:         * cpplex.c (_cpp_lex_line): Maintain PREV_WHITESPACE flag
X-Git-Tag: upstream/4.9.2~101529
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af4ba67c7e00ab003410816938de438817d2c766;p=platform%2Fupstream%2Flinaro-gcc.git

    * cpplex.c (_cpp_lex_line): Maintain PREV_WHITESPACE flag
        when removing escaped newlines.  Reverse sense of test for
        escaped newline.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33816 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea8972b..654951d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed 10 May 09:08:30 2000  Neil Booth  <NeilB@earthling.net>
+
+        * cpplex.c (_cpp_lex_line): Maintain PREV_WHITESPACE flag
+        when removing escaped newlines.  Reverse sense of test for
+        escaped newline.
+
 2000-05-09  Richard Henderson  <rth@cygnus.com>
 
 	* flow.c (find_basic_blocks_1): Do not delete the first
diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 65c4b28..c828eef 100644
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -3010,30 +3010,31 @@ _cpp_lex_line (pfile, list)
 	case '\n':
 	case '\r':
 	  handle_newline (cur, buffer->rlimit, c);
-	  if (PREV_TOKEN_TYPE != CPP_BACKSLASH || !IMMED_TOKEN ())
+	  if (PREV_TOKEN_TYPE == CPP_BACKSLASH && IMMED_TOKEN ())
 	    {
-	      if (PREV_TOKEN_TYPE == CPP_BACKSLASH)
+	      /* Remove the escaped newline.  Then continue to process
+		 any interrupted name or number.  */
+	      cur_token--;
+	      if (IMMED_TOKEN ())
 		{
-		  buffer->cur = cur;
-		  cpp_warning (pfile,
-			       "backslash and newline separated by space");
+		  cur_token--;
+		  if (cur_token->type == CPP_NAME)
+		    goto continue_name;
+		  else if (cur_token->type == CPP_NUMBER)
+		    goto continue_number;
+		  cur_token++;
 		}
-	      PUSH_TOKEN (CPP_VSPACE);
-	      goto out;
+	      /* Remember whitespace setting.  */
+	      flags = cur_token->flags;
+	      break;
 	    }
-	  /* Remove the escaped newline.  Then continue to process
-	     any interrupted name or number.  */
-	  cur_token--;
-	  if (IMMED_TOKEN ())
+	  if (PREV_TOKEN_TYPE == CPP_BACKSLASH)
 	    {
-	      cur_token--;
-	      if (cur_token->type == CPP_NAME)
-		goto continue_name;
-	      else if (cur_token->type == CPP_NUMBER)
-		goto continue_number;
-	      cur_token++;
+	      buffer->cur = cur;
+	      cpp_warning (pfile, "backslash and newline separated by space");
 	    }
-	  break;
+	  PUSH_TOKEN (CPP_VSPACE);
+	  goto out;
 
 	case '-':
 	  if (IMMED_TOKEN () && PREV_TOKEN_TYPE == CPP_MINUS)