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

no semantic changes: corrected & reflowed some comments, plus a whitespace tweak

Browse source
This commit is contained in:
Vern Paxson 2021-01-04 13:38:36 -08:00
parent fa61a715bc
commit c8be7ec795
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Expr.cc
View file

@ -292,7 +292,8 @@ ValPtr NameExpr::Eval(Frame* f) const
v = f->GetElementByID(id); v = f->GetElementByID(id);
else else
// No frame - evaluating for Simplify() purposes // No frame - evaluating for purposes of resolving a
// compile-time constant.
return nullptr; return nullptr;
if ( v ) if ( v )
@ -4353,10 +4354,10 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
const auto& id = global_scope()->Find(fullname); const auto& id = global_scope()->Find(fullname);
if ( id ) if ( id )
// Just try again to make a unique lambda name. If two peer // Just try again to make a unique lambda name.
// processes need to agree on the same lambda name, this assumes // If two peer processes need to agree on the same
// they're loading the same scripts and thus have the same hash // lambda name, this assumes they're loading the same
// collisions. // scripts and thus have the same hash collisions.
d.Add(" "); d.Add(" ");
else else
break; break;

2
src/Frame.cc
View file

@ -263,7 +263,7 @@ Frame* Frame::SelectiveClone(const IDPList& selection, ScriptFunc* func) const
// other->closure = closure->SelectiveClone(them); // other->closure = closure->SelectiveClone(them);
// other->outer_ids = outer_ids; // other->outer_ids = outer_ids;
if( closure ) if ( closure )
other->CaptureClosure(closure, outer_ids); other->CaptureClosure(closure, outer_ids);
if ( offset_map ) if ( offset_map )

11
src/parse.y
View file

@ -1288,11 +1288,14 @@ lambda_body:
{ {
zeek::detail::set_location(@1, @5); zeek::detail::set_location(@1, @5);
// Code duplication here is sad but needed. end_func actually instantiates the function // Code duplication here is sad but needed.
// and associates it with an ID. We perform that association later and need to return // end_func actually instantiates the function
// a lambda expression. // and associates it with an ID. We perform that
// association later and need to return a lambda
// expression.
// Gather the ingredients for a BroFunc from the current scope // Gather the ingredients for a Func from the
// current scope.
auto ingredients = std::make_unique<zeek::detail::function_ingredients>( auto ingredients = std::make_unique<zeek::detail::function_ingredients>(
zeek::IntrusivePtr{zeek::NewRef{}, zeek::detail::current_scope()}, zeek::IntrusivePtr{zeek::NewRef{}, zeek::detail::current_scope()},
zeek::IntrusivePtr{zeek::AdoptRef{}, $3}); zeek::IntrusivePtr{zeek::AdoptRef{}, $3});