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

introduce internal "mask" expression node to avoid mixed-type overloading of "/"

Browse source
This commit is contained in:
Vern Paxson 2023-09-26 14:39:26 -07:00
parent b53a025b1e
commit 434a7e059d
6 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Expr.cc
View file

@ -48,6 +48,7 @@ const char* expr_name(ExprTag t)
"-=",
"*",
"/",
"/", // mask operator
"%",
"&",
"|",
@ -1918,14 +1919,27 @@ DivideExpr::DivideExpr(ExprPtr arg_op1, ExprPtr arg_op2)
else if ( BothArithmetic(bt1, bt2) )
PromoteType(max_type(bt1, bt2), is_vector(op1) || is_vector(op2));
else if ( bt1 == TYPE_ADDR && ! is_vector(op2) && (bt2 == TYPE_COUNT || bt2 == TYPE_INT) )
SetType(base_type(TYPE_SUBNET));
else
ExprError("requires arithmetic operands");
}
ValPtr DivideExpr::AddrFold(Val* v1, Val* v2) const
MaskExpr::MaskExpr(ExprPtr arg_op1, ExprPtr arg_op2)
: BinaryExpr(EXPR_MASK, std::move(arg_op1), std::move(arg_op2))
{
if ( IsError() )
return;
TypeTag bt1, bt2;
if ( ! get_types_from_scalars_or_vectors(this, bt1, bt2) )
return;
if ( bt1 == TYPE_ADDR && ! is_vector(op2) && (bt2 == TYPE_COUNT || bt2 == TYPE_INT) )
SetType(base_type(TYPE_SUBNET));
else
ExprError("requires address LHS and count/int RHS");
}
ValPtr MaskExpr::AddrFold(Val* v1, Val* v2) const
{
uint32_t mask;