commit b352e3edb559020e904d52941b039c5cebb26056
author Chris Lattner <sabre@nondot.org> Tue Nov 21 06:17:10 2006 +0000
committer Chris Lattner <sabre@nondot.org> Tue Nov 21 06:17:10 2006 +0000
tree 595e816cc4b447fda5ffc218aa68d3413bf3db00
parent ad7cdd37b3f99a4d6ea37a71c46aa76a4d1bde54

Change KeepComments/KeepMacroComments modes to be facets of the preprocessor
state, not aspects of the language standard being parsed.

llvm-svn: 39209

clang/Lex/Preprocessor.cpp

diff --git a/clang/Lex/Preprocessor.cpp b/clang/Lex/Preprocessor.cpp
index b122b0a..4af6d31 100644
--- a/clang/Lex/Preprocessor.cpp
+++ b/clang/Lex/Preprocessor.cpp
@@ -58,7 +58,11 @@
   NumFastMacroExpanded = NumTokenPaste = NumFastTokenPaste = 0;
   MaxIncludeStackDepth = 0; 
   NumSkipped = 0;
-    
+
+  // Default to discarding comments.
+  KeepComments = false;
+  KeepMacroComments = false;
+  
   // Macro expansion is enabled.
   DisableMacroExpansion = false;
   InMacroArgs = false;
@@ -686,7 +690,7 @@
           return 0;
         }
         // Otherwise, continue to add the tokens to this variable argument.
-      } else if (Tok.getKind() == tok::comment && !Features.KeepMacroComments) {
+      } else if (Tok.getKind() == tok::comment && !KeepMacroComments) {
         // If this is a comment token in the argument list and we're just in
         // -C mode (not -CC mode), discard the comment.
         continue;
@@ -1175,7 +1179,7 @@
     if (Tok.getKind() != tok::identifier) {
       CurLexer->ParsingPreprocessorDirective = false;
       // Restore comment saving mode.
-      CurLexer->KeepCommentMode = Features.KeepComments;
+      CurLexer->KeepCommentMode = KeepComments;
       continue;
     }
 
@@ -1190,7 +1194,7 @@
         FirstChar != 'i' && FirstChar != 'e') {
       CurLexer->ParsingPreprocessorDirective = false;
       // Restore comment saving mode.
-      CurLexer->KeepCommentMode = Features.KeepComments;
+      CurLexer->KeepCommentMode = KeepComments;
       continue;
     }
     
@@ -1211,7 +1215,7 @@
       if (IdLen >= 20) {
         CurLexer->ParsingPreprocessorDirective = false;
         // Restore comment saving mode.
-        CurLexer->KeepCommentMode = Features.KeepComments;
+        CurLexer->KeepCommentMode = KeepComments;
         continue;
       }
       memcpy(Directive, &DirectiveStr[0], IdLen);
@@ -1292,7 +1296,7 @@
     
     CurLexer->ParsingPreprocessorDirective = false;
     // Restore comment saving mode.
-    CurLexer->KeepCommentMode = Features.KeepComments;
+    CurLexer->KeepCommentMode = KeepComments;
   }
 
   // Finally, if we are out of the conditional (saw an #endif or ran off the end
@@ -1710,7 +1714,7 @@
   
   // If we are supposed to keep comments in #defines, reenable comment saving
   // mode.
-  CurLexer->KeepCommentMode = Features.KeepMacroComments;
+  CurLexer->KeepCommentMode = KeepMacroComments;
   
   // Create the new macro.
   MacroInfo *MI = new MacroInfo(MacroNameTok.getLocation());