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

employ explicit conversions to/from "any" and "vector of any" types

Browse source
This commit is contained in:
Vern Paxson 2021-05-30 18:05:11 -07:00
parent 292bd1b671
commit 8044926e00
3 changed files with 85 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Expr.cc
View file

@ -55,7 +55,7 @@ const char* expr_name(BroExprTag t)
"inline()",
"[]=", "$=",
"vec+=",
"to_any_coerce", "from_any_coerce",
"to_any_coerce", "from_any_coerce", "from_any_vec_coerce",
"any[]",
"nop",
@ -5274,17 +5274,29 @@ ExprPtr get_assign_expr(ExprPtr op1, ExprPtr op2, bool is_init)
ExprPtr check_and_promote_expr(Expr* const e, zeek::Type* t)
{
ExprPtr e_ptr{NewRef{}, e};
const auto& et = e->GetType();
TypeTag e_tag = et->Tag();
TypeTag t_tag = t->Tag();
if ( t->Tag() == TYPE_ANY )
return {NewRef{}, e};
if ( t_tag == TYPE_ANY )
{
if ( e_tag != TYPE_ANY )
e_ptr = make_intrusive<CoerceToAnyExpr>(e_ptr);
return e_ptr;
}
if ( e_tag == TYPE_ANY )
{
TypePtr t_ptr{NewRef{}, t};
return make_intrusive<CoerceFromAnyExpr>(e_ptr, t_ptr);
}
if ( EitherArithmetic(t_tag, e_tag) )
{
if ( e_tag == t_tag )
return {NewRef{}, e};
return e_ptr;
if ( ! BothArithmetic(t_tag, e_tag) )
{