diff options
Diffstat (limited to 'include/clang/Lex/Lexer.h')
| -rw-r--r-- | include/clang/Lex/Lexer.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/clang/Lex/Lexer.h b/include/clang/Lex/Lexer.h index 52bf194883df3..fc65b1fc54494 100644 --- a/include/clang/Lex/Lexer.h +++ b/include/clang/Lex/Lexer.h @@ -38,8 +38,8 @@ class Lexer : public PreprocessorLexer { const char *BufferEnd; // End of the buffer. SourceLocation FileLoc; // Location for start of file. LangOptions Features; // Features enabled by this language (cache). - bool Is_PragmaLexer; // True if lexer for _Pragma handling. - bool IsEofCodeCompletion; // True if EOF is treated as a code-completion. + bool Is_PragmaLexer : 1; // True if lexer for _Pragma handling. + bool IsInConflictMarker : 1; // True if in a VCS conflict marker '<<<<<<<' //===--------------------------------------------------------------------===// // Context-specific lexing flags set by the preprocessor. @@ -180,15 +180,6 @@ public: ExtendedTokenMode = Mode ? 1 : 0; } - /// \brief Specify that end-of-file is to be considered a code-completion - /// token. - /// - /// When in this mode, the end-of-file token will be immediately preceded - /// by a code-completion token. - void SetEofIsCodeCompletion(bool Val = true) { - IsEofCodeCompletion = Val; - } - const char *getBufferStart() const { return BufferStart; } /// ReadToEndOfLine - Read the rest of the current preprocessor line as an @@ -379,6 +370,9 @@ private: bool SkipBCPLComment (Token &Result, const char *CurPtr); bool SkipBlockComment (Token &Result, const char *CurPtr); bool SaveBCPLComment (Token &Result, const char *CurPtr); + + bool IsStartOfConflictMarker(const char *CurPtr); + bool HandleEndOfConflictMarker(const char *CurPtr); }; |