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

fix for compiling record constructors to C++

Browse source
This commit is contained in:
Vern Paxson 2021-12-12 12:34:23 -08:00
parent 52ed9351a9
commit 96ed944571
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/script_opt/CPP/RuntimeOps.cc
View file

@ -215,22 +215,43 @@ TableValPtr table_constructor__CPP(vector<ValPtr> indices, vector<ValPtr> vals,
RecordValPtr record_constructor__CPP(vector<ValPtr> vals, RecordTypePtr t) RecordValPtr record_constructor__CPP(vector<ValPtr> vals, RecordTypePtr t)
{ {
auto rv = make_intrusive<RecordVal>(move(t)); auto rv = make_intrusive<RecordVal>(t);
auto n = vals.size(); auto n = vals.size();
for ( auto i = 0u; i < n; ++i ) for ( auto i = 0u; i < n; ++i )
rv->Assign(i, vals[i]); {
auto& v_i = vals[i];
if ( v_i && v_i->GetType()->Tag() == TYPE_VECTOR && v_i->AsVectorVal()->Size() == 0 )
{
const auto& t_ind = t->GetFieldType(i);
v_i->AsVectorVal()->Concretize(t_ind->Yield());
}
rv->Assign(i, v_i);
}
return rv; return rv;
} }
RecordValPtr record_constructor_map__CPP(vector<ValPtr> vals, vector<int> map, RecordTypePtr t) RecordValPtr record_constructor_map__CPP(vector<ValPtr> vals, vector<int> map, RecordTypePtr t)
{ {
auto rv = make_intrusive<RecordVal>(move(t)); auto rv = make_intrusive<RecordVal>(t);
auto n = vals.size(); auto n = vals.size();
for ( auto i = 0u; i < n; ++i ) for ( auto i = 0u; i < n; ++i )
rv->Assign(map[i], vals[i]); {
auto& v_i = vals[i];
auto ind = map[i];
if ( v_i && v_i->GetType()->Tag() == TYPE_VECTOR && v_i->AsVectorVal()->Size() == 0 )
{
const auto& t_ind = t->GetFieldType(ind);
v_i->AsVectorVal()->Concretize(t_ind->Yield());
}
rv->Assign(ind, v_i);
}
return rv; return rv;
} }