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

ZAM fixes for compatibility with GH-3249 changes

Browse source
This commit is contained in:
Vern Paxson 2023-09-01 12:20:35 -07:00
parent 80eed34985
commit e78570ad89
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/script_opt/Expr.cc
View file

@ -894,7 +894,7 @@ bool AddToExpr::IsReduced(Reducer* c) const
if ( tag == TYPE_TABLE )
return op1->IsReduced(c) && op2->IsReduced(c);
if ( tag == TYPE_VECTOR && same_type(t, op2->GetType()) )
if ( tag == TYPE_VECTOR && IsVector(op2->GetType()->Tag()) && same_type(t, op2->GetType()) )
return op1->IsReduced(c) && op2->IsReduced(c);
return NonReduced(this);
@ -923,7 +923,8 @@ ExprPtr AddToExpr::Reduce(Reducer* c, StmtPtr& red_stmt)
red_stmt = MergeStmts(red_stmt1, red_stmt2);
if ( tag == TYPE_VECTOR && ! same_type(t, op2->GetType()) )
if ( tag == TYPE_VECTOR &&
(! IsVector(op2->GetType()->Tag()) || ! same_type(t, op2->GetType())) )
{
auto append = make_intrusive<AppendToExpr>(op1->Duplicate(), op2);
append->SetOriginal(ThisPtr());