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

overlooked another way in which vector holes can be created

Browse source
This commit is contained in:
Vern Paxson 2021-02-27 13:34:53 -08:00
parent f43be3a206
commit 0f10c46f42
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Val.cc
View file

@ -3269,8 +3269,11 @@ bool VectorVal::Assign(unsigned int index, ValPtr element)
if ( ! CheckElementType(element) ) if ( ! CheckElementType(element) )
return false; return false;
if ( index >= vector_val->size() ) auto n = vector_val->size();
if ( index >= n )
{ {
AddHoles(index - n);
vector_val->resize(index + 1); vector_val->resize(index + 1);
if ( yield_types ) if ( yield_types )
yield_types->resize(index + 1); yield_types->resize(index + 1);
@ -3332,14 +3335,7 @@ bool VectorVal::Insert(unsigned int index, ValPtr element)
it = vector_val->end(); it = vector_val->end();
if ( yield_types ) if ( yield_types )
types_it = yield_types->end(); types_it = yield_types->end();
AddHoles(index - n);
// Initialize any holes the assignment induces in the vector.
TypePtr fill_t = yield_type;
if ( yield_type->Tag() == TYPE_VOID )
fill_t = base_type(TYPE_ANY);
for ( auto i = n; i < index; ++i )
vector_val->emplace_back(ZVal(fill_t));
} }
if ( yield_types ) if ( yield_types )
@ -3355,6 +3351,16 @@ bool VectorVal::Insert(unsigned int index, ValPtr element)
return true; return true;
} }
void VectorVal::AddHoles(int nholes)
{
TypePtr fill_t = yield_type;
if ( yield_type->Tag() == TYPE_VOID )
fill_t = base_type(TYPE_ANY);
for ( auto i = 0; i < nholes; ++i )
vector_val->emplace_back(ZVal(fill_t));
}
bool VectorVal::Remove(unsigned int index) bool VectorVal::Remove(unsigned int index)
{ {
if ( index >= vector_val->size() ) if ( index >= vector_val->size() )

3
src/Val.h
View file

@ -1571,6 +1571,9 @@ private:
// element type-checked. // element type-checked.
bool CheckElementType(const ValPtr& element); bool CheckElementType(const ValPtr& element);
// Add the given number of "holes" to the end of a vector.
void AddHoles(int nholes);
std::vector<ZVal>* vector_val; std::vector<ZVal>* vector_val;
// For homogeneous vectors (the usual case), the type of the // For homogeneous vectors (the usual case), the type of the