Use better names for the internal functions so that they are more visible while

debugging.


git-svn-id: http://root.cern.ch/svn/root/trunk@46024 27541ba8-7e3a-0410-8455-c3a389f83636
This commit is contained in:
Vassil Vassilev 2012-09-18 15:14:58 +00:00
parent 3bcd83bf79
commit c38e4407ef
2 changed files with 17 additions and 15 deletions

View File

@ -159,9 +159,9 @@ namespace cling {
///
///\returns Whether the operation was fully successful.
///
CompilationResult Declare(const std::string& input,
const CompilationOptions& CO,
const clang::Decl** D = 0);
CompilationResult DeclareInternal(const std::string& input,
const CompilationOptions& CO,
const clang::Decl** D = 0);
///\brief Worker function, building block for interpreter's public
/// interfaces.
@ -174,9 +174,9 @@ namespace cling {
///
///\returns Whether the operation was fully successful.
///
CompilationResult Evaluate(const std::string& input,
const CompilationOptions& CO,
Value* V = 0);
CompilationResult EvaluateInternal(const std::string& input,
const CompilationOptions& CO,
Value* V = 0);
///\brief Wraps a given input.
///

View File

@ -370,7 +370,7 @@ namespace cling {
if (!canWrapForCall(input))
return declare(input, D);
if (Evaluate(input, CO, V) == Interpreter::kFailure) {
if (EvaluateInternal(input, CO, V) == Interpreter::kFailure) {
if (D)
*D = 0;
return Interpreter::kFailure;
@ -391,7 +391,7 @@ namespace cling {
CO.DynamicScoping = isDynamicLookupEnabled();
CO.Debug = isPrintingAST();
return Declare(input, CO);
return DeclareInternal(input, CO);
}
Interpreter::CompilationResult
@ -402,7 +402,7 @@ namespace cling {
CO.DynamicScoping = isDynamicLookupEnabled();
CO.Debug = isPrintingAST();
return Declare(input, CO, D);
return DeclareInternal(input, CO, D);
}
Interpreter::CompilationResult
@ -415,7 +415,7 @@ namespace cling {
CO.DeclarationExtraction = 0;
CO.ValuePrinting = 0;
return Evaluate(input, CO, V);
return EvaluateInternal(input, CO, V);
}
Interpreter::CompilationResult
@ -424,7 +424,7 @@ namespace cling {
CO.DeclarationExtraction = 0;
CO.ValuePrinting = CompilationOptions::VPEnabled;
return Evaluate(input, CO, V);
return EvaluateInternal(input, CO, V);
}
void Interpreter::WrapInput(std::string& input, std::string& fname) {
@ -477,8 +477,9 @@ namespace cling {
}
Interpreter::CompilationResult
Interpreter::Declare(const std::string& input, const CompilationOptions& CO,
const clang::Decl** D /* = 0 */) {
Interpreter::DeclareInternal(const std::string& input,
const CompilationOptions& CO,
const clang::Decl** D /* = 0 */) {
if (m_IncrParser->Compile(input, CO) != IncrementalParser::kFailed) {
if (D)
@ -490,8 +491,9 @@ namespace cling {
}
Interpreter::CompilationResult
Interpreter::Evaluate(const std::string& input, const CompilationOptions& CO,
Value* V /* = 0 */) {
Interpreter::EvaluateInternal(const std::string& input,
const CompilationOptions& CO,
Value* V /* = 0 */) {
Sema& TheSema = getCI()->getSema();