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

Add 'decl’ and ‘undo’ as predicates to .stats command. Add Interpreter::dump method.

Browse Source
This commit is contained in:
Frederich Munch 2016-07-04 16:20:28 -04:00 committed by sftnight
parent 20c6abd155
commit e709fd898b
5 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/cling/Interpreter/Interpreter.h
View File

@ -409,6 +409,13 @@ namespace cling {
///
void DumpIncludePath(llvm::raw_ostream* S = nullptr);
///\brief Dump various internal data.
///
///\param[in] what - which data to dump. 'undo', 'ast', 'asttree'
///\param[in] filter - optional argument to filter data with.
///
void dump(llvm::StringRef what, llvm::StringRef filter);
///\brief Store the interpreter state in files
/// Store the AST, the included files and the lookup tables
///

11
lib/Interpreter/Interpreter.cpp
View File

@ -466,6 +466,17 @@ namespace cling {
true /*withSystem*/, true /*withFlags*/);
}
// FIXME: Add stream argument and move DumpIncludePath path here.
void Interpreter::dump(llvm::StringRef what, llvm::StringRef filter) {
llvm::raw_ostream &where = cling::log();
if (what.equals("ast"))
getSema().getASTContext().PrintStats();
else if (what.equals("decl"))
ClangInternalState::printLookupTables(where, getSema().getASTContext());
else if (what.equals("undo"))
m_IncrParser->printTransactionStructure();
}
void Interpreter::storeInterpreterState(const std::string& name) const {
// This may induce deserialization
PushTransactionRAII RAII(this);

7
lib/MetaProcessor/MetaParser.cpp
View File

@ -463,9 +463,12 @@ namespace cling {
skipWhitespace();
if (!getCurTok().is(tok::ident))
return false; // FIXME: Issue proper diagnostics
std::string ident = getCurTok().getIdent();
llvm::StringRef what = getCurTok().getIdent();
consumeToken();
m_Actions->actOnstatsCommand(ident);
skipWhitespace();
const Token& next = getCurTok();
m_Actions->actOnstatsCommand(what, next.is(tok::ident)
? next.getIdent() : llvm::StringRef());
return true;
}
return false;

15
lib/MetaProcessor/MetaSema.cpp
View File

@ -17,8 +17,6 @@
#include "cling/Interpreter/Value.h"
#include "cling/MetaProcessor/MetaProcessor.h"
#include "../lib/Interpreter/IncrementalParser.h"
#include "clang/AST/ASTContext.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Frontend/CompilerInstance.h"
@ -287,10 +285,9 @@ namespace cling {
m_Interpreter.compareInterpreterState(name);
}
void MetaSema::actOnstatsCommand(llvm::StringRef name) const {
if (name.equals("ast")) {
m_Interpreter.getCI()->getSema().getASTContext().PrintStats();
}
void MetaSema::actOnstatsCommand(llvm::StringRef name,
llvm::StringRef args) const {
m_Interpreter.dump(name, args);
}
void MetaSema::actOndynamicExtensionsCommand(SwitchMode mode/* = kToggle*/)
@ -361,8 +358,10 @@ namespace cling {
" " << metaString << "compareState <filename>\t- Compare the interpreter's state with the one"
"\n\t\t\t\t saved in a given file\n"
"\n"
" " << metaString << "stats [name]\t\t- Show stats for various internal data"
"\n\t\t\t\t structures (only 'ast' for the time being)\n"
" " << metaString << "stats [name]\t\t- Show stats for internal data structures\n"
"\t\t\t\t 'ast' abstract syntax tree stats\n"
"\t\t\t\t 'decl' dump ast declarations\n"
"\t\t\t\t 'undo' show undo stack\n"
"\n"
" " << metaString << "help\t\t\t- Shows this information\n"
"\n"

4
lib/MetaProcessor/MetaSema.h
View File

@ -169,8 +169,10 @@ namespace cling {
///\brief Show stats for various internal data structures.
///
///\param[in] name - Name of the structure.
///\param[in] filter - Optional predicate for filtering displayed stats.
///
void actOnstatsCommand(llvm::StringRef name) const;
void actOnstatsCommand(llvm::StringRef name,
llvm::StringRef filter = llvm::StringRef()) const;
///\brief Switches on/off the experimental dynamic extensions (dynamic
/// scopes) and late binding.