commit ff96dd0301af133735afcea0085fd67e5b10c7ad
author Chris Lattner <sabre@nondot.org> Wed May 13 06:10:29 2009 +0000
committer Chris Lattner <sabre@nondot.org> Wed May 13 06:10:29 2009 +0000
tree 7a8a2c346d9de9bacff9f6c95cab5cffe21c90f2
parent c898a68998ba5ea8cc0c0bc315500202671f7db7

Fix rdar://6880630 - # in _Pragma does not start a preprocessor directive.

llvm-svn: 71643

clang/lib/Lex/Lexer.cpp

diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index 3f78be6..c2ffd6d 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -1631,7 +1631,7 @@
         // it's actually the start of a preprocessing directive.  Callback to
         // the preprocessor to handle it.
         // FIXME: -fpreprocessed mode??
-        if (Result.isAtStartOfLine() && !LexingRawMode) {
+        if (Result.isAtStartOfLine() && !LexingRawMode && !Is_PragmaLexer) {
           FormTokenWithChars(Result, CurPtr, tok::hash);
           PP->HandleDirective(Result);
           
@@ -1762,7 +1762,7 @@
       // it's actually the start of a preprocessing directive.  Callback to
       // the preprocessor to handle it.
       // FIXME: -fpreprocessed mode??
-      if (Result.isAtStartOfLine() && !LexingRawMode) {
+      if (Result.isAtStartOfLine() && !LexingRawMode && !Is_PragmaLexer) {
         FormTokenWithChars(Result, CurPtr, tok::hash);
         PP->HandleDirective(Result);