diff options
| -rw-r--r-- | clang-tools-extra/clangd/JSONExpr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang-tools-extra/clangd/JSONExpr.cpp b/clang-tools-extra/clangd/JSONExpr.cpp index f28dcffab6a..48c149bbb65 100644 --- a/clang-tools-extra/clangd/JSONExpr.cpp +++ b/clang-tools-extra/clangd/JSONExpr.cpp @@ -94,8 +94,8 @@ public: } Error takeError() { - assert(Error); - return std::move(*Error); + assert(Err); + return std::move(*Err); } private: @@ -104,7 +104,7 @@ private: ++P; } - // On invalid syntax, parseX() functions return false and and set Error. + // On invalid syntax, parseX() functions return false and and set Err. bool parseNumber(char First, double &Out); bool parseString(std::string &Out); bool parseUnicode(std::string &Out); @@ -119,7 +119,7 @@ private: } static void encodeUtf8(uint32_t Rune, std::string &Out); - Optional<Error> Error; + Optional<Error> Err; const char *Start, *P, *End; }; @@ -365,7 +365,7 @@ bool Parser::parseError(const char *Msg) { StartOfLine = X + 1; } } - Error.emplace( + Err.emplace( llvm::make_unique<ParseError>(Msg, Line, P - StartOfLine, P - Start)); return false; } |
