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

restored record constructor checking for missing-but-mandatory fields

Browse source
This commit is contained in:
Vern Paxson 2022-02-28 15:33:03 -08:00
parent 9b184c3d4a
commit 3e0b46b963
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Expr.cc
View file

@ -3375,6 +3375,8 @@ RecordConstructorExpr::RecordConstructorExpr(RecordTypePtr known_rt, ListExprPtr
const auto& exprs = op->AsListExpr()->Exprs(); const auto& exprs = op->AsListExpr()->Exprs();
map = std::vector<int>(exprs.length()); map = std::vector<int>(exprs.length());
std::set<int> fields_seen; // used to check for missing fields
int i = 0; int i = 0;
for ( const auto& e : exprs ) for ( const auto& e : exprs )
{ {
@ -3401,7 +3403,28 @@ RecordConstructorExpr::RecordConstructorExpr(RecordTypePtr known_rt, ListExprPtr
SetError(); SetError();
(*map)[i++] = index; (*map)[i++] = index;
fields_seen.insert(index);
} }
if ( IsError() )
return;
auto n = known_rt->NumFields();
for ( i = 0; i < n; ++i )
if ( fields_seen.count(i) == 0 )
{
const auto td_i = known_rt->FieldDecl(i);
if ( IsAggr(td_i->type) )
// These are always initialized.
continue;
if ( ! td_i->GetAttr(ATTR_OPTIONAL) )
{
auto err = std::string("mandatory field \"") + known_rt->FieldName(i) +
"\" missing";
ExprError(err.c_str());
}
}
} }
ValPtr RecordConstructorExpr::InitVal(const TypePtr& t, ValPtr aggr) const ValPtr RecordConstructorExpr::InitVal(const TypePtr& t, ValPtr aggr) const