CPreProcessor: skip a newline after a backslash character in string o…

…r char literals

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Units/parser-cpreprocessor.r/skip-newlines-in-literals.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+--fields-C={macrodef}

Units/parser-cpreprocessor.r/skip-newlines-in-literals.d/expected.tags

@@ -0,0 +1,5 @@
+X	input.c	/^#define X /;"	d	file:	macrodef:"abc \\n\\t\tefg"
+Y	input.c	/^#define Y /;"	d	file:	macrodef:"abc"
+A	input.c	/^#define A /;"	d	file:	macrodef:'a'
+B	input.c	/^#define B /;"	d	file:	macrodef:'b'
+C	input.c	/^#define C /;"	d	file:	macrodef:'\\n'

Units/parser-cpreprocessor.r/skip-newlines-in-literals.d/input.c

@@ -0,0 +1,9 @@
+#define X "abc \n\t\
+	efg"
+#define Y "abc"
+
+#define A '\
+a'
+
+#define B 'b'
+#define C '\n'

parsers/cpreprocessor.c

@@ -1332,10 +1332,19 @@ static int skipToEndOfString (bool ignoreBackslash)
 	{
 		if (c == BACKSLASH && ! ignoreBackslash)
 		{
-			vStringPutWithLimit (Cpp.charOrStringContents, c, 1024);
-			c = cppGetcFromUngetBufferOrFile ();  /* throw away next character, too */
-			if (c != EOF)
-				vStringPutWithLimit (Cpp.charOrStringContents, c, 1024);
+			int c0 = cppGetcFromUngetBufferOrFile ();
+			if (c0 == '\n')
+				continue;
+			if (c0 == EOF)
+				break;
+
+			if (vStringPutWithLimit (Cpp.charOrStringContents, c, 1024))
+			{
+				if (vStringPutWithLimit (Cpp.charOrStringContents, c0, 1024))
+					continue;
+				/* delete the last back slash at the end of the vstring. */
+				vStringChop(Cpp.charOrStringContents);
+			}
 		}
 		else if (c == DOUBLE_QUOTE)
 			break;
@@ -1410,10 +1419,19 @@ static int skipToEndOfChar ()
 	    ++count;
 		if (c == BACKSLASH)
 		{
-			vStringPutWithLimit (Cpp.charOrStringContents, c, 10);
-			c = cppGetcFromUngetBufferOrFile ();  /* throw away next character, too */
-			if (c != EOF)
-				vStringPutWithLimit (Cpp.charOrStringContents, c, 10);
+			int c0 = cppGetcFromUngetBufferOrFile ();
+			if (c0 == '\n')
+				continue;
+			if (c0 == EOF)
+				break;
+
+			if (vStringPutWithLimit (Cpp.charOrStringContents, c, 10))
+			{
+				if (vStringPutWithLimit (Cpp.charOrStringContents, c0, 10))
+					continue;
+				/* delete the last back slash at the end of the vstring.*/
+				vStringChop(Cpp.charOrStringContents);
+			}
 		}
 		else if (c == SINGLE_QUOTE)
 			break;