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

Switch FuncType capture-list storage to optional<vector<Capture>>

Browse source 
May help clarify overall mem-mgmt/ownership semantics.
This commit is contained in:
Jon Siwek 2021-01-11 15:57:58 -08:00
parent ab15a98b28
commit b08112b2e7
8 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Expr.cc
View file

@ -4421,7 +4421,7 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
void LambdaExpr::CheckCaptures()
{
auto ft = type->AsFuncType();
auto captures = ft->GetCaptures();
const auto& captures = ft->GetCaptures();
capture_by_ref = false;
@ -4441,9 +4441,9 @@ void LambdaExpr::CheckCaptures()
std::set<const ID*> outer_is_matched;
std::set<const ID*> capture_is_matched;
for ( auto c : *captures )
for ( const auto& c : *captures )
{
auto cid = c->id.get();
auto cid = c.id.get();
if ( ! cid )
// This happens for undefined/inappropriate
@ -4470,9 +4470,9 @@ void LambdaExpr::CheckCaptures()
if ( outer_is_matched.count(id) == 0 )
ExprError(util::fmt("%s is used inside lambda but not captured", id->Name()));
for ( auto c : *captures )
for ( const auto& c : *captures )
{
auto cid = c->id.get();
auto cid = c.id.get();
if ( cid && capture_is_matched.count(cid) == 0 )
ExprError(util::fmt("%s is captured but not used inside lambda", cid->Name()));
}