Bug 375739: #ifdef nested in macro-expansion.

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorBugsTests.java

@@ -263,6 +263,22 @@ public class PreprocessorBugsTests extends PreprocessorTestsBase {
 		validateProblemCount(2);  // the inclusions
 	}
 	
+	//	#define UNFOLD(v,x) v:x
+	//	UNFOLD("A",
+	//		#ifdef X
+	//			"B")
+	//        #else
+	//            "C") /* parse error in this line */
+	//        #endif
+	public void testDirectiveInExpansion_Bug375739() throws Exception {
+		initializeScanner();
+		validateString("A");
+		validateToken(IToken.tCOLON);
+		validateString("C");
+		validateEOF();
+		validateProblemCount(0);  
+	}
+
 	// #if 0xe000
 	// ok
 	// #endif

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerContext.java

@@ -224,7 +224,7 @@ final class ScannerContext {
 			cond.fTakeElse= false;
 			newState= cond.fInitialState;
 		} else if (withinExpansion) {
-			newState= CodeState.eParseInactive;
+			newState= CodeState.eSkipInactive;
 		} else {
 			newState= fInactiveState;
 		}