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

Move Func up to zeek namespace, rename BroFunc to ScriptFunc

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-02 14:10:04 -07:00
parent 86fdf0eaa9
commit a2bc42dd93
36 changed files with 190 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Expr.cc
View file

@ -4051,8 +4051,8 @@ CallExpr::CallExpr(ExprPtr arg_func, ListExprPtr arg_args, bool in_hook)
did_builtin_init &&
(func_val = func->Eval(nullptr)) )
{
zeek::detail::Func* f = func_val->AsFunc();
if ( f->GetKind() == zeek::detail::Func::BUILTIN_FUNC &&
zeek::Func* f = func_val->AsFunc();
if ( f->GetKind() == zeek::Func::BUILTIN_FUNC &&
! check_built_in_call((BuiltinFunc*) f, this) )
SetError();
}
@ -4072,7 +4072,7 @@ bool CallExpr::IsPure() const
if ( ! func_val )
return false;
zeek::detail::Func* f = func_val->AsFunc();
zeek::Func* f = func_val->AsFunc();
// Only recurse for built-in functions, as recursing on script
// functions can lead to infinite recursion if the function being
@ -4080,7 +4080,7 @@ bool CallExpr::IsPure() const
// or indirectly).
bool pure = false;
if ( f->GetKind() == zeek::detail::Func::BUILTIN_FUNC )
if ( f->GetKind() == zeek::Func::BUILTIN_FUNC )
pure = f->IsPure() && args->IsPure();
return pure;
@ -4114,7 +4114,7 @@ ValPtr CallExpr::Eval(Frame* f) const
if ( func_val && v )
{
const zeek::detail::Func* funcv = func_val->AsFunc();
const zeek::Func* funcv = func_val->AsFunc();
const CallExpr* current_call = f ? f->GetCall() : nullptr;
if ( f )
@ -4168,7 +4168,7 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
// Install a dummy version of the function globally for use only
// when broker provides a closure.
auto dummy_func = zeek::make_intrusive<BroFunc>(
auto dummy_func = zeek::make_intrusive<ScriptFunc>(
ingredients->id,
ingredients->body,
ingredients->inits,
@ -4219,7 +4219,7 @@ Scope* LambdaExpr::GetScope() const
ValPtr LambdaExpr::Eval(Frame* f) const
{
auto lamb = zeek::make_intrusive<BroFunc>(
auto lamb = zeek::make_intrusive<ScriptFunc>(
ingredients->id,
ingredients->body,
ingredients->inits,