Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move Func up to zeek namespace, rename BroFunc to ScriptFunc

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-02 14:10:04 -07:00
parent 86fdf0eaa9
commit a2bc42dd93
36 changed files with 190 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Debug.cc
View file

@ -146,7 +146,7 @@ int TraceState::LogTrace(const char* fmt, ...)
loc = *stmt->GetLocationInfo();
else
{
const zeek::detail::BroFunc* f = g_frame_stack.back()->GetFunction();
const zeek::detail::ScriptFunc* f = g_frame_stack.back()->GetFunction();
if ( f )
loc = *f->GetLocationInfo();
}
@ -221,8 +221,8 @@ static void parse_function_name(vector<ParseLocationRec>& result,
return;
}
const zeek::detail::Func* func = id->GetVal()->AsFunc();
const vector<zeek::detail::Func::Body>& bodies = func->GetBodies();
const zeek::Func* func = id->GetVal()->AsFunc();
const vector<zeek::Func::Body>& bodies = func->GetBodies();
if ( bodies.size() == 0 )
{
@ -731,7 +731,7 @@ static char* get_prompt(bool reset_counter = false)
string get_context_description(const zeek::detail::Stmt* stmt, const zeek::detail::Frame* frame)
{
ODesc d;
const zeek::detail::BroFunc* func = frame ? frame->GetFunction() : nullptr;
const zeek::detail::ScriptFunc* func = frame ? frame->GetFunction() : nullptr;
if ( func )
func->DescribeDebug(&d, frame->GetFuncArgs());
@ -770,7 +770,7 @@ int dbg_handle_debug_input()
}
zeek::detail::Frame* curr_frame = g_frame_stack.back();
const zeek::detail::BroFunc* func = curr_frame->GetFunction();
const zeek::detail::ScriptFunc* func = curr_frame->GetFunction();
if ( func )
zeek::detail::current_module = extract_module_name(func->Name());
else
@ -963,7 +963,7 @@ zeek::ValPtr dbg_eval_expr(const char* expr)
if ( ! (frame) )
reporter->InternalError("Assertion failed: frame");
const zeek::detail::BroFunc* func = frame->GetFunction();
const zeek::detail::ScriptFunc* func = frame->GetFunction();
if ( func )
{
Ref(func->GetScope());