maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Moved expression evaluation from CommandObjectExpression into 

ClangUserExpression::Evaluate () as a public static function so anyone can
evaluate an expression.

llvm-svn: 115581
This commit is contained in:
Greg Clayton 2010-10-05 00:31:29 +00:00
parent 6296bbbb65
commit 0184f01936
4 changed files with 76 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/include/lldb/Expression/ClangUserExpression.h
View File

@ -171,6 +171,12 @@ public:
return true;
}
static Error
Evaluate (ExecutionContext &exe_ctx,
const char *expr_cstr,
lldb::ValueObjectSP &result_valobj_sp);
private:
//------------------------------------------------------------------
/// Populate m_cplusplus and m_objetivec based on the environment.

62
lldb/source/Commands/CommandObjectExpression.cpp
View File

@ -193,9 +193,7 @@ CommandObjectExpression::MultiLineExpressionCallback
case eInputReaderDone:
{
bool bare = false;
cmd_object_expr->EvaluateExpression (cmd_object_expr->m_expr_lines.c_str(),
bare,
reader.GetDebugger().GetOutputStream(),
reader.GetDebugger().GetErrorStream());
}
@ -209,7 +207,6 @@ bool
CommandObjectExpression::EvaluateExpression
(
const char *expr,
bool bare,
Stream &output_stream,
Stream &error_stream,
CommandReturnObject *result
@ -236,54 +233,31 @@ CommandObjectExpression::EvaluateExpression
m_exe_ctx.process->SetDynamicCheckers(dynamic_checkers);
}
ClangUserExpression user_expression (expr);
lldb::ValueObjectSP result_valobj_sp;
if (!user_expression.Parse (error_stream, m_exe_ctx))
{
error_stream.Printf ("Couldn't parse the expresssion\n");
return false;
}
Error expr_error (ClangUserExpression::Evaluate (m_exe_ctx, expr, result_valobj_sp));
ClangExpressionVariable *expr_result = NULL;
if (!user_expression.Execute (error_stream, m_exe_ctx, expr_result))
if (expr_error.Success())
{
error_stream.Printf ("Couldn't execute the expresssion\n");
return false;
}
if (expr_result)
{
// TODO: seems weird to get a pointer to a result object back from
// a function. Do we own it? Feels like we do, but from looking at the
// code we don't. Might be best to make this a reference and state
// explicitly that we don't own it when we get a reference back from
// the execute?
lldb::ValueObjectSP valobj_sp (expr_result->GetExpressionResult (&m_exe_ctx));
if (valobj_sp)
{
ValueObject::DumpValueObject (output_stream,
m_exe_ctx.GetBestExecutionContextScope(),
valobj_sp.get(), // Variable object to dump
expr_result->m_name.c_str(),// Root object name
0, // Pointer depth to traverse (zero means stop at pointers)
0, // Current depth, this is the top most, so zero...
UINT32_MAX, // Max depth to go when dumping concrete types, dump everything...
m_options.show_types, // Show types when dumping?
false, // Show locations of variables, no since this is a host address which we don't care to see
m_options.print_object, // Print the objective C object?
true); // Scope is already checked. Const results are always in scope.
output_stream.EOL();
}
else
{
error_stream.PutCString ("Couldn't extract expression result");
}
assert (result_valobj_sp.get() != NULL);
ValueObject::DumpValueObject (output_stream,
m_exe_ctx.GetBestExecutionContextScope(),
result_valobj_sp.get(), // Variable object to dump
result_valobj_sp->GetName().AsCString(),// Root object name
0, // Pointer depth to traverse (zero means stop at pointers)
0, // Current depth, this is the top most, so zero...
UINT32_MAX, // Max depth to go when dumping concrete types, dump everything...
m_options.show_types, // Show types when dumping?
false, // Show locations of variables, no since this is a host address which we don't care to see
m_options.print_object, // Print the objective C object?
true); // Scope is already checked. Const results are always in scope.
output_stream.EOL();
if (result)
result->SetStatus (eReturnStatusSuccessFinishResult);
}
else
{
error_stream.PutCString(expr_error.AsCString());
if (result)
result->SetStatus (eReturnStatusSuccessFinishNoResult);
}
@ -370,7 +344,7 @@ CommandObjectExpression::ExecuteRawCommandString
if (expr == NULL)
expr = command;
if (EvaluateExpression (expr, false, result.GetOutputStream(), result.GetErrorStream(), &result))
if (EvaluateExpression (expr, result.GetOutputStream(), result.GetErrorStream(), &result))
return true;
result.SetStatus (eReturnStatusFailed);

1
lldb/source/Commands/CommandObjectExpression.h
View File

@ -87,7 +87,6 @@ protected:
bool
EvaluateExpression (const char *expr,
bool bare,
Stream &output_stream,
Stream &error_stream,
CommandReturnObject *result = NULL);

52
lldb/source/Expression/ClangUserExpression.cpp
View File

@ -336,3 +336,55 @@ ClangUserExpression::DwarfOpcodeStream ()
return *m_dwarf_opcodes.get();
}
Error
ClangUserExpression::Evaluate (ExecutionContext &exe_ctx, const char *expr_cstr, lldb::ValueObjectSP &result_valobj_sp)
{
Error error;
result_valobj_sp.reset();
ClangUserExpression user_expression (expr_cstr);
StreamString error_stream;
if (!user_expression.Parse (error_stream, exe_ctx))
{
if (error_stream.GetString().empty())
error.SetErrorString ("expression failed to parse, unknown error");
else
error.SetErrorString (error_stream.GetString().c_str());
}
else
{
ClangExpressionVariable *expr_result = NULL;
error_stream.GetString().clear();
if (!user_expression.Execute (error_stream, exe_ctx, expr_result))
{
if (error_stream.GetString().empty())
error.SetErrorString ("expression failed to execute, unknown error");
else
error.SetErrorString (error_stream.GetString().c_str());
}
else
{
// TODO: seems weird to get a pointer to a result object back from
// a function. Do we own it? Feels like we do, but from looking at the
// code we don't. Might be best to make this a reference and state
// explicitly that we don't own it when we get a reference back from
// the execute?
if (expr_result)
{
result_valobj_sp = expr_result->GetExpressionResult (&exe_ctx);
}
else
{
error.SetErrorString ("NULL expression result");
}
}
}
return error;
}