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

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 ) if ( tag == TYPE_TABLE )
return op1->IsReduced(c) && op2->IsReduced(c); 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 op1->IsReduced(c) && op2->IsReduced(c);
return NonReduced(this); return NonReduced(this);
@ -923,7 +923,8 @@ ExprPtr AddToExpr::Reduce(Reducer* c, StmtPtr& red_stmt)
red_stmt = MergeStmts(red_stmt1, red_stmt2); 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); auto append = make_intrusive<AppendToExpr>(op1->Duplicate(), op2);
append->SetOriginal(ThisPtr()); append->SetOriginal(ThisPtr());

3
src/script_opt/ZAM/Ops.in
View file

@ -402,7 +402,8 @@ eval $1.re_val->AddTo(frame[z.v1].re_val, false);
unary-op AddVecToVec unary-op AddVecToVec
op1-read op1-read
eval $1.vector_val->AddTo(frame[z.v1].vector_val, false); eval if ( ! $1.vector_val->AddTo(frame[z.v1].vector_val, false) )
ZAM_run_time_error(z.loc, "incompatible vector element assignment");
unary-op AddTableToTable unary-op AddTableToTable
op1-read op1-read

2
testing/btest/Baseline.zam/language.vector-any-append/.stderr Normal file
View file

@ -0,0 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
runtime error in <...>/vector-any-append.zeek, line 63: incompatible vector element assignment

6
testing/btest/Baseline.zam/language.vector-any-append/out Normal file
View file

@ -0,0 +1,6 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
[0, 1, 2, 3]
[4, 0, 1, 2, 3]
[1, 2, 3, [4, 5]], 4, count, count, vector of count
[[r=r], [r=r], [s=s], [s=s]]
[a, -3]