From c3bab5f7861d92dfe4bd842627de7db5a167ab74 Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Fri, 6 Jun 2003 15:01:36 +0000
Subject: [PATCH] Patch for Victor Mozgin

Update of ChangeLog & ui.tests for PR 38065.
---
 core/org.eclipse.cdt.core/parser/ChangeLog    |  3 +++
 .../core/parser/tests/ScannerTestCase.java    | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog b/core/org.eclipse.cdt.core/parser/ChangeLog
index 73c3e86aa1c..69baac0a06a 100644
--- a/core/org.eclipse.cdt.core/parser/ChangeLog
+++ b/core/org.eclipse.cdt.core/parser/ChangeLog
@@ -1,3 +1,6 @@
+2003-06-06 Victor Mozgin
+	Fixed Bug 38065 - Scanner skipped backslashes inside the code
+
 2003-06-05 John Camelon
 	Fix Bug 38380  "Include" class public methods fails JUnit tests 
 
diff --git a/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
index 6151cb91738..75ec1cf7b4a 100644
--- a/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
+++ b/core/org.eclipse.cdt.ui.tests/parser/org/eclipse/cdt/core/parser/tests/ScannerTestCase.java
@@ -1356,4 +1356,26 @@ public class ScannerTestCase extends BaseScannerTest
 		validateDefinition("G", "a '\"'");
 		validateDefinition("H", "a '\\'//b'\"/*bo\\o*/\" b");
 	}
+	
+	public void testBug38065() throws Exception
+	{
+		initializeScanner( "Foo\\\nBar" );
+		
+		validateIdentifier("FooBar");
+		validateEOF();
+		
+		try {
+			initializeScanner( "Foo\\Bar" );
+			
+			validateIdentifier("Foo");
+			validateIdentifier("Bar");
+			validateEOF();
+			
+		} catch (ScannerException se) {
+			// if Scanner.throwExceptionOnBadCharacterRead == true
+			// we might end up with valid ScannerException "Invalid character ..."
+			// for '\'
+			assertTrue(se.getMessage().equals("Invalid character '\\' read @ offset 5 of file TEXT"));
+		}
+	}
 }