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

Allow assignment for vectors using slices

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-06-13 15:37:31 -07:00
parent 964e2c91a3
commit 23f9fb0ae9
3 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Expr.cc
View file

@ -3199,7 +3199,26 @@ void IndexExpr::Assign(Frame* f, Val* v, Opcode op)
switch ( v1->Type()->Tag() ) { switch ( v1->Type()->Tag() ) {
case TYPE_VECTOR: case TYPE_VECTOR:
if ( ! v1->AsVectorVal()->Assign(v2, v, op) ) {
const ListVal *lv = v2->AsListVal();
if ( lv->Length() > 1 )
{
int len = v1->AsVectorVal()->Size();
bro_int_t first = get_slice_index(lv->Index(0)->CoerceToInt(), len);
bro_int_t last = get_slice_index(lv->Index(1)->CoerceToInt(), len);
int slice_length = last - first;
const VectorVal *v_vect = v->AsVectorVal();
if ( slice_length != v_vect->Size())
RuntimeError("vector being assigned to slice does not match size of slice");
else if ( slice_length >= 0 )
{
for ( int idx = first; idx < last; idx++ )
v1->AsVectorVal()->Assign(idx, v_vect->Lookup(idx - first)->Ref(), op);
}
}
else if ( !v1->AsVectorVal()->Assign(v2, v, op))
{ {
if ( v ) if ( v )
{ {
@ -3216,6 +3235,7 @@ void IndexExpr::Assign(Frame* f, Val* v, Opcode op)
RuntimeErrorWithCallStack("assignment failed with null value"); RuntimeErrorWithCallStack("assignment failed with null value");
} }
break; break;
}
case TYPE_TABLE: case TYPE_TABLE:
if ( ! v1->AsTableVal()->Assign(v2, v, op) ) if ( ! v1->AsTableVal()->Assign(v2, v, op) )

2
testing/btest/Baseline/language.vector/out
View file

@ -63,3 +63,5 @@ slicing (PASS)
slicing (PASS) slicing (PASS)
slicing (PASS) slicing (PASS)
slicing (PASS) slicing (PASS)
slicing assignment (PASS)
slicing assignment (PASS)

4
testing/btest/language/vector.zeek
View file

@ -175,4 +175,8 @@ event zeek_init()
test_case( "slicing", all_set(v17[:2] == vector( 1, 2 )) ); test_case( "slicing", all_set(v17[:2] == vector( 1, 2 )) );
test_case( "slicing", all_set(v17[2:] == vector( 3, 4, 5 )) ); test_case( "slicing", all_set(v17[2:] == vector( 3, 4, 5 )) );
test_case( "slicing", all_set(v17[:] == v17) ); test_case( "slicing", all_set(v17[:] == v17) );
v17[0:1] = vector(6);
test_case( "slicing assignment", all_set(v17 == vector(6, 2, 3, 4, 5)) );
v17[2:4] = vector(7, 8);
test_case( "slicing assignment", all_set(v17 == vector(6, 2, 7, 8, 5)) );
} }