[PATCH] D38578: [preamble] Also record the "skipping" state of the preprocessor

[Ilya Biryukov via Phabricator via cfe-commits]

ilya-biryukov accepted this revision.
ilya-biryukov added a comment.
This revision is now accepted and ready to land.

LGTM. Only a few code style-related comments.



================
Comment at: include/clang/Lex/Preprocessor.h:102
+    bool ReachedEOFWhileSkipping;
+    SourceLocation HashToken;
+    SourceLocation IfTokenLoc;
----------------
Maybe rename to `HashTokenLoc` for consistencty with `IfTokenLoc`?


================
Comment at: include/clang/Lex/Preprocessor.h:333
 
+    PreambleSkipInfo SkipInfo;
+
----------------
Maybe move closer to other fields to avoid mixing data and functions?


================
Comment at: include/clang/Lex/Preprocessor.h:1859
   /// the caller can lex the first valid token.
-  void SkipExcludedConditionalBlock(const Token &HashToken,
+  void SkipExcludedConditionalBlock(SourceLocation HashToken,
                                     SourceLocation IfTokenLoc,
----------------
Maybe rename to `HashTokenLoc` for consistencty with `IfTokenLoc`?


================
Comment at: lib/Lex/PPDirectives.cpp:353
 /// the caller can lex the first valid token.
-void Preprocessor::SkipExcludedConditionalBlock(const Token &HashToken,
+void Preprocessor::SkipExcludedConditionalBlock(SourceLocation HashToken,
                                                 SourceLocation IfTokenLoc,
----------------
Maybe rename to `HashTokenLoc` for consistencty with `IfTokenLoc`?


https://reviews.llvm.org/D38578