gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang-formatting

Browse Source
This commit is contained in:
Philippe Canal 2019-09-06 11:55:58 -05:00 committed by SFT
parent 8b906da196
commit bd472f9b0a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cling/Utils/ParserStateRAII.h
View File

@ -47,9 +47,7 @@ namespace cling {
ParserStateRAII(clang::Parser& p, bool skipToEOF);
~ParserStateRAII();
void SetSkipToEOF(bool newvalue) {
SkipToEOF = newvalue;
}
void SetSkipToEOF(bool newvalue) { SkipToEOF = newvalue; }
};
} // end namespace cling

22
lib/Interpreter/LookupHelper.cpp
View File

@ -39,10 +39,10 @@ namespace cling {
LookupHelper& m_LH;
llvm::SaveAndRestore<bool> SaveIsRecursivelyRunning;
// Save and restore the state of the Parser and lexer.
// Note: ROOT::Internal::ParsingStateRAII also save and restore the state of Sema,
// including pending instantiation for example. It is not clear whether we need
// to do so here too or whether we need to also see the "on-going" semantic information ...
// For now, we leave Sema untouched.
// Note: ROOT::Internal::ParsingStateRAII also save and restore the state of
// Sema, including pending instantiation for example. It is not clear
// whether we need to do so here too or whether we need to also see the
// "on-going" semantic information ... For now, we leave Sema untouched.
clang::Preprocessor::CleanupAndRestoreCacheRAII fCleanupRAII;
clang::Parser::ParserCurTokRestoreRAII fSavedCurToken;
ParserStateRAII ResetParserState;
@ -52,11 +52,11 @@ namespace cling {
StartParsingRAII(LookupHelper& LH, llvm::StringRef code,
llvm::StringRef bufferName,
LookupHelper::DiagSetting diagOnOff)
: m_LH(LH), SaveIsRecursivelyRunning(LH.IsRecursivelyRunning)
, fCleanupRAII(LH.m_Parser.get()->getPreprocessor())
, fSavedCurToken(*LH.m_Parser.get())
, ResetParserState(*LH.m_Parser.get(), !LH.IsRecursivelyRunning /*skipToEOF*/)
{
: m_LH(LH), SaveIsRecursivelyRunning(LH.IsRecursivelyRunning),
fCleanupRAII(LH.m_Parser.get()->getPreprocessor()),
fSavedCurToken(*LH.m_Parser.get()),
ResetParserState(*LH.m_Parser.get(),
!LH.IsRecursivelyRunning /*skipToEOF*/) {
LH.IsRecursivelyRunning = true;
prepareForParsing(code, bufferName, diagOnOff);
}
@ -1422,8 +1422,8 @@ namespace cling {
UnqualifiedId FuncId;
ParserStateRAII ResetParserState(P, false /*skipToEOF*/);
if (!ParseWithShortcuts(foundDC, Context, funcName, Interp,
FuncId, diagOnOff, ResetParserState)) {
if (!ParseWithShortcuts(foundDC, Context, funcName, Interp, FuncId,
diagOnOff, ResetParserState)) {
// Failed parse, cleanup.
// Destroy the scope we created first, and
// restore the original.