diff options
Diffstat (limited to 'include/clang/Lex/Lexer.h')
| -rw-r--r-- | include/clang/Lex/Lexer.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/include/clang/Lex/Lexer.h b/include/clang/Lex/Lexer.h index 624151ef877b0..a9b10b6273204 100644 --- a/include/clang/Lex/Lexer.h +++ b/include/clang/Lex/Lexer.h @@ -139,7 +139,7 @@ public: /// with the specified preprocessor managing the lexing process. This lexer /// assumes that the associated file buffer and Preprocessor objects will /// outlive it, so it doesn't take ownership of either of them. - Lexer(FileID FID, const llvm::MemoryBuffer *InputBuffer, Preprocessor &PP); + Lexer(FileID FID, const llvm::MemoryBuffer *InputFile, Preprocessor &PP); /// Lexer constructor - Create a new raw lexer object. This object is only /// suitable for calls to 'LexFromRawLexer'. This lexer assumes that the @@ -150,7 +150,7 @@ public: /// Lexer constructor - Create a new raw lexer object. This object is only /// suitable for calls to 'LexFromRawLexer'. This lexer assumes that the /// text range will outlive it, so it doesn't take ownership of it. - Lexer(FileID FID, const llvm::MemoryBuffer *InputBuffer, + Lexer(FileID FID, const llvm::MemoryBuffer *FromFile, const SourceManager &SM, const LangOptions &LangOpts); Lexer(const Lexer &) = delete; @@ -310,8 +310,8 @@ public: /// location. static StringRef getSpelling(SourceLocation loc, SmallVectorImpl<char> &buffer, - const SourceManager &SourceMgr, - const LangOptions &LangOpts, + const SourceManager &SM, + const LangOptions &options, bool *invalid = nullptr); /// MeasureTokenLength - Relex the token at the specified location and return @@ -339,7 +339,7 @@ public: /// Get the physical length (including trigraphs and escaped newlines) of the /// first \p Characters characters of the token starting at TokStart. static unsigned getTokenPrefixLength(SourceLocation TokStart, - unsigned Characters, + unsigned CharNo, const SourceManager &SM, const LangOptions &LangOpts); @@ -711,20 +711,22 @@ private: bool isHexaLiteral(const char *Start, const LangOptions &LangOpts); + void codeCompleteIncludedFile(const char *PathStart, + const char *CompletionPoint, bool IsAngled); /// Read a universal character name. /// - /// \param CurPtr The position in the source buffer after the initial '\'. - /// If the UCN is syntactically well-formed (but not necessarily - /// valid), this parameter will be updated to point to the - /// character after the UCN. + /// \param StartPtr The position in the source buffer after the initial '\'. + /// If the UCN is syntactically well-formed (but not + /// necessarily valid), this parameter will be updated to + /// point to the character after the UCN. /// \param SlashLoc The position in the source buffer of the '\'. - /// \param Tok The token being formed. Pass \c nullptr to suppress diagnostics - /// and handle token formation in the caller. + /// \param Result The token being formed. Pass \c nullptr to suppress + /// diagnostics and handle token formation in the caller. /// /// \return The Unicode codepoint specified by the UCN, or 0 if the UCN is /// invalid. - uint32_t tryReadUCN(const char *&CurPtr, const char *SlashLoc, Token *Tok); + uint32_t tryReadUCN(const char *&StartPtr, const char *SlashLoc, Token *Result); /// Try to consume a UCN as part of an identifier at the current /// location. |