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

Remove BroValUnion by hoisting underlying Val subclass values into subclasses

Browse source
This commit is contained in:
Vern Paxson 2020-11-10 15:18:54 -08:00 • committed by Tim Wojtulewicz
parent 49ca8e2163
commit 7f92a573d2
29 changed files with 632 additions and 512 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Expr.cc
View file

@ -1853,7 +1853,7 @@ ValPtr EqExpr::Fold(Val* v1, Val* v2) const
{
if ( op1->GetType()->Tag() == TYPE_PATTERN )
{
RE_Matcher* re = v1->AsPattern();
auto re = dynamic_cast<PatternVal*>(v1);
const String* s = v2->AsString();
if ( tag == EXPR_EQ )
return val_mgr->Bool(re->MatchExactly(s));
@ -4151,7 +4151,7 @@ ValPtr InExpr::Fold(Val* v1, Val* v2) const
{
if ( v1->GetType()->Tag() == TYPE_PATTERN )
{
RE_Matcher* re = v1->AsPattern();
auto re = dynamic_cast<PatternVal*>(v1);
const String* s = v2->AsString();
return val_mgr->Bool(re->MatchAnywhere(s) != 0);
}
@ -4412,7 +4412,7 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
// Update lamb's name
dummy_func->SetName(my_name.c_str());
auto v = make_intrusive<Val>(std::move(dummy_func));
auto v = make_intrusive<FuncVal>(std::move(dummy_func));
id->SetVal(std::move(v));
id->SetType(ingredients->id->GetType());
id->SetConst();
@ -4502,7 +4502,7 @@ ValPtr LambdaExpr::Eval(Frame* f) const
// Allows for lookups by the receiver.
lamb->SetName(my_name.c_str());
return make_intrusive<Val>(std::move(lamb));
return make_intrusive<FuncVal>(std::move(lamb));
}
void LambdaExpr::ExprDescribe(ODesc* d) const