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

Change Scope/Func inits from id_list* to vector<IntrusivePtr<ID>>

Browse source
This commit is contained in:
Jon Siwek 2020-05-27 17:27:40 -07:00
parent 46e23b49fb
commit 2cee468eac
8 changed files with 48 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Expr.cc
View file

@ -4168,29 +4168,6 @@ void CallExpr::ExprDescribe(ODesc* d) const
args->Describe(d);
}
static std::unique_ptr<id_list> shallow_copy_func_inits(const IntrusivePtr<Stmt>& body,
const id_list* src)
{
if ( ! body )
return nullptr;
if ( ! src )
return nullptr;
if ( src->empty() )
return nullptr;
auto dest = std::make_unique<id_list>(src->length());
for ( ID* i : *src )
{
Ref(i);
dest->push_back(i);
}
return dest;
}
LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
id_list arg_outer_ids) : Expr(EXPR_LAMBDA)
{
@ -4204,7 +4181,7 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
auto dummy_func = make_intrusive<BroFunc>(
ingredients->id.get(),
ingredients->body,
shallow_copy_func_inits(ingredients->body, ingredients->inits).release(),
ingredients->inits,
ingredients->frame_size,
ingredients->priority);
@ -4255,7 +4232,7 @@ IntrusivePtr<Val> LambdaExpr::Eval(Frame* f) const
auto lamb = make_intrusive<BroFunc>(
ingredients->id.get(),
ingredients->body,
shallow_copy_func_inits(ingredients->body, ingredients->inits).release(),
ingredients->inits,
ingredients->frame_size,
ingredients->priority);