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

disambiguate lambdas by adding scoping and consideration of captures

Browse source
This commit is contained in:
Vern Paxson 2023-08-16 16:58:05 -07:00
parent 3925ff4592
commit 3e0f814635
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Expr.cc
View file

@ -4673,11 +4673,11 @@ LambdaExpr::LambdaExpr(FunctionIngredientsPtr arg_ing, IDPList arg_outer_ids, st
else else
my_name = name; my_name = name;
// Install that in the global_scope // Install that in the current scope.
lambda_id = install_ID(my_name.c_str(), "", true, false); lambda_id = install_ID(my_name.c_str(), current_module.c_str(), true, false);
// Update lamb's name // Update lamb's name
primary_func->SetName(my_name.c_str()); primary_func->SetName(lambda_id->Name());
auto v = make_intrusive<FuncVal>(primary_func); auto v = make_intrusive<FuncVal>(primary_func);
lambda_id->SetVal(std::move(v)); lambda_id->SetVal(std::move(v));
@ -4800,6 +4800,17 @@ void LambdaExpr::BuildName()
ODesc d; ODesc d;
primary_func->Describe(&d); primary_func->Describe(&d);
if ( captures )
for ( auto& c : *captures )
{
if ( c.IsDeepCopy() )
d.AddSP("copy");
if ( c.Id() )
// c.Id() will be nil for some errors
c.Id()->Describe(&d);
}
for ( ;; ) for ( ;; )
{ {
hash128_t h; hash128_t h;
@ -4807,7 +4818,7 @@ void LambdaExpr::BuildName()
my_name = "lambda_<" + std::to_string(h[0]) + ">"; my_name = "lambda_<" + std::to_string(h[0]) + ">";
auto fullname = make_full_var_name(current_module.data(), my_name.data()); auto fullname = make_full_var_name(current_module.data(), my_name.data());
const auto& id = global_scope()->Find(fullname); const auto& id = current_scope()->Find(fullname);
if ( id ) if ( id )
// Just try again to make a unique lambda name. // Just try again to make a unique lambda name.
@ -4873,6 +4884,9 @@ void LambdaExpr::ExprDescribe(ODesc* d) const
if ( &c != &(*captures)[0] ) if ( &c != &(*captures)[0] )
d->AddSP(", "); d->AddSP(", ");
if ( c.IsDeepCopy() )
d->AddSP("copy");
d->Add(c.Id()->Name()); d->Add(c.Id()->Name());
} }

8
testing/btest/Baseline/language.closure-binding-errors/.stderr
View file

@ -1,9 +1,9 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/closure-binding-errors.zeek, line 12: a is captured but not used inside lambda (function(){ print no a!}) error in <...>/closure-binding-errors.zeek, line 12: a is captured but not used inside lambda (function()[a]{ print no a!})
error in <...>/closure-binding-errors.zeek, line 13: no such local identifier: a2 error in <...>/closure-binding-errors.zeek, line 13: no such local identifier: a2
error in <...>/closure-binding-errors.zeek, line 14: b is used inside lambda but not captured (function(){ print b}) error in <...>/closure-binding-errors.zeek, line 14: b is used inside lambda but not captured (function()[a]{ print b})
error in <...>/closure-binding-errors.zeek, line 15: a is captured but not used inside lambda (function(){ print b}) error in <...>/closure-binding-errors.zeek, line 15: a is captured but not used inside lambda (function()[a, b]{ print b})
error in <...>/closure-binding-errors.zeek, line 16: b listed multiple times in capture (function(){ print b}) error in <...>/closure-binding-errors.zeek, line 16: b listed multiple times in capture (function()[b, b]{ print b})
error in <...>/closure-binding-errors.zeek, line 18: cannot specify global in capture: c error in <...>/closure-binding-errors.zeek, line 18: cannot specify global in capture: c
error in <...>/closure-binding-errors.zeek, line 19: cannot specify type in capture: t error in <...>/closure-binding-errors.zeek, line 19: cannot specify type in capture: t
error in <...>/closure-binding-errors.zeek, line 9 and <...>/closure-binding-errors.zeek, line 20: already defined (a) error in <...>/closure-binding-errors.zeek, line 9 and <...>/closure-binding-errors.zeek, line 20: already defined (a)