replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

<rdar://problem/10898363> 

Emitting a warning when defining a summary or a synthetic provider and the function/class name provided does not correspond to a valid scripting object

Also using this chance to edit a few error messages from weird "internal error" markers to actual user-legible data!

llvm-svn: 170013
This commit is contained in:
Enrico Granata 2012-12-12 20:11:05 +00:00
parent 7bc144c366
commit eb17816bf4
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/include/lldb/Interpreter/ScriptInterpreter.h
View File

@ -378,6 +378,12 @@ public:
dest.clear();
return false;
}
virtual bool
CheckObjectExists (const char* name)
{
return false;
}
virtual bool
LoadScriptingModule (const char* filename,

9
lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
View File

@ -158,6 +158,15 @@ public:
virtual bool
GetDocumentationForItem (const char* item, std::string& dest);
virtual bool
CheckObjectExists (const char* name)
{
if (!name || !name[0])
return false;
std::string temp;
return GetDocumentationForItem (name,temp);
}
virtual bool
LoadScriptingModule (const char* filename,
bool can_reload,

43
lldb/source/Commands/CommandObjectType.cpp
View File

@ -818,7 +818,7 @@ public:
ScriptAddOptions *options_ptr = ((ScriptAddOptions*)data.baton);
if (!options_ptr)
{
out_stream->Printf ("Internal error #1: no script attached.\n");
out_stream->Printf ("internal synchronization information missing or invalid.\n");
out_stream->Flush();
return;
}
@ -828,7 +828,7 @@ public:
ScriptInterpreter *interpreter = data.reader.GetDebugger().GetCommandInterpreter().GetScriptInterpreter();
if (!interpreter)
{
out_stream->Printf ("Internal error #2: no script attached.\n");
out_stream->Printf ("no script interprter.\n");
out_stream->Flush();
return;
}
@ -836,13 +836,13 @@ public:
if (!interpreter->GenerateTypeScriptFunction (options->m_user_source,
funct_name_str))
{
out_stream->Printf ("Internal error #3: no script attached.\n");
out_stream->Printf ("unable to generate a function.\n");
out_stream->Flush();
return;
}
if (funct_name_str.empty())
{
out_stream->Printf ("Internal error #4: no script attached.\n");
out_stream->Printf ("unable to obtain a valid function name from the script interpreter.\n");
out_stream->Flush();
return;
}
@ -1037,17 +1037,10 @@ CommandObjectTypeSummaryAdd::Execute_ScriptSummary (Args& command, CommandReturn
if (!m_options.m_python_function.empty()) // we have a Python function ready to use
{
ScriptInterpreter *interpreter = m_interpreter.GetScriptInterpreter();
if (!interpreter)
{
result.AppendError ("Internal error #1N: no script attached.\n");
result.SetStatus (eReturnStatusFailed);
return false;
}
const char *funct_name = m_options.m_python_function.c_str();
if (!funct_name || !funct_name[0])
{
result.AppendError ("Internal error #2N: no script attached.\n");
result.AppendError ("function name empty.\n");
result.SetStatus (eReturnStatusFailed);
return false;
}
@ -1057,13 +1050,18 @@ CommandObjectTypeSummaryAdd::Execute_ScriptSummary (Args& command, CommandReturn
script_format.reset(new ScriptSummaryFormat(m_options.m_flags,
funct_name,
code.c_str()));
ScriptInterpreter *interpreter = m_interpreter.GetScriptInterpreter();
if (interpreter && interpreter->CheckObjectExists(funct_name) == false)
result.AppendWarning("The provided function does not exist - please define it before attempting to use this summary");
}
else if (!m_options.m_python_script.empty()) // we have a quick 1-line script, just use it
{
ScriptInterpreter *interpreter = m_interpreter.GetScriptInterpreter();
if (!interpreter)
{
result.AppendError ("Internal error #1Q: no script attached.\n");
result.AppendError ("script interpreter missing - unable to generate function wrapper.\n");
result.SetStatus (eReturnStatusFailed);
return false;
}
@ -1073,13 +1071,13 @@ CommandObjectTypeSummaryAdd::Execute_ScriptSummary (Args& command, CommandReturn
if (!interpreter->GenerateTypeScriptFunction (funct_sl,
funct_name_str))
{
result.AppendError ("Internal error #2Q: no script attached.\n");
result.AppendError ("unable to generate function wrapper.\n");
result.SetStatus (eReturnStatusFailed);
return false;
}
if (funct_name_str.empty())
{
result.AppendError ("Internal error #3Q: no script attached.\n");
result.AppendError ("script interpreter failed to generate a valid function name.\n");
result.SetStatus (eReturnStatusFailed);
return false;
}
@ -3353,7 +3351,7 @@ public:
SynthAddOptions *options_ptr = ((SynthAddOptions*)data.baton);
if (!options_ptr)
{
out_stream->Printf ("Internal error #1: no script attached.\n");
out_stream->Printf ("internal synchronization data missing.\n");
out_stream->Flush();
return;
}
@ -3363,7 +3361,7 @@ public:
ScriptInterpreter *interpreter = data.reader.GetDebugger().GetCommandInterpreter().GetScriptInterpreter();
if (!interpreter)
{
out_stream->Printf ("Internal error #2: no script attached.\n");
out_stream->Printf ("no script interpreter.\n");
out_stream->Flush();
return;
}
@ -3371,13 +3369,13 @@ public:
if (!interpreter->GenerateTypeSynthClass (options->m_user_source,
class_name_str))
{
out_stream->Printf ("Internal error #3: no script attached.\n");
out_stream->Printf ("unable to generate a class.\n");
out_stream->Flush();
return;
}
if (class_name_str.empty())
{
out_stream->Printf ("Internal error #4: no script attached.\n");
out_stream->Printf ("unable to obtain a proper name for the class.\n");
out_stream->Flush();
return;
}
@ -3415,7 +3413,7 @@ public:
}
else
{
out_stream->Printf ("Internal error #6: no script attached.\n");
out_stream->Printf ("invalid type name.\n");
out_stream->Flush();
return;
}
@ -3512,6 +3510,11 @@ CommandObjectTypeSynthAdd::Execute_PythonClass (Args& command, CommandReturnObje
entry.reset(impl);
ScriptInterpreter *interpreter = m_interpreter.GetScriptInterpreter();
if (interpreter && interpreter->CheckObjectExists(impl->GetPythonClassName()) == false)
result.AppendWarning("The provided class does not exist - please define it before attempting to use this synthetic provider");
// now I have a valid provider, let's add it to every type
lldb::TypeCategoryImplSP category;