Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 00:28: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/Val.cc
View file

@ -44,10 +44,10 @@ using namespace std;
namespace zeek {
Val::Val(zeek::detail::Func* f) : Val({NewRef{}, f})
Val::Val(zeek::Func* f) : Val({NewRef{}, f})
{}
Val::Val(zeek::detail::FuncPtr f)
Val::Val(zeek::FuncPtr f)
: val(f.release()), type(val.func_val->GetType())
{}
@ -155,7 +155,7 @@ ValPtr Val::DoClone(CloneState* state)
return nullptr;
}
zeek::detail::FuncPtr Val::AsFuncPtr() const
zeek::FuncPtr Val::AsFuncPtr() const
{
CHECK_TAG(type->Tag(), TYPE_FUNC, "Val::Func", type_name)
return {NewRef{}, val.func_val};
@ -1858,7 +1858,7 @@ ValPtr TableVal::Default(const ValPtr& index)
return nullptr;
}
const zeek::detail::Func* f = def_val->AsFunc();
const zeek::Func* f = def_val->AsFunc();
Args vl;
if ( index->GetType()->Tag() == TYPE_LIST )
@ -2056,7 +2056,7 @@ void TableVal::CallChangeFunc(const Val* index,
return;
}
const zeek::detail::Func* f = thefunc->AsFunc();
const zeek::Func* f = thefunc->AsFunc();
auto lv = index->AsListVal();
Args vl;
@ -2514,7 +2514,7 @@ double TableVal::CallExpireFunc(ListValPtr idx)
return 0;
}
const zeek::detail::Func* f = vf->AsFunc();
const zeek::Func* f = vf->AsFunc();
Args vl;
const auto& func_args = f->GetType()->ParamList()->GetTypes();