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

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

7
src/Var.cc
View file

@ -322,7 +322,7 @@ static void make_var(const IDPtr& id, TypePtr t, InitClass c, ExprPtr init,
// defined.
std::vector<IDPtr> inits;
auto f = make_intrusive<ScriptFunc>(id, nullptr, inits, 0, 0);
id->SetVal(make_intrusive<Val>(std::move(f)));
id->SetVal(make_intrusive<FuncVal>(std::move(f)));
}
}
@ -750,11 +750,12 @@ void end_func(StmtPtr body)
ingredients->frame_size,
ingredients->priority);
ingredients->id->SetVal(make_intrusive<Val>(std::move(f)));
ingredients->id->SetVal(make_intrusive<FuncVal>(std::move(f)));
ingredients->id->SetConst();
}
auto func = cast_intrusive<ScriptFunc>(ingredients->id->GetVal()->AsFuncPtr());
auto func_ptr = cast_intrusive<FuncVal>(ingredients->id->GetVal())->AsFuncPtr();
auto func = cast_intrusive<ScriptFunc>(func_ptr);
func->SetScope(ingredients->scope);
analyze_func(std::move(func));