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

BIT-1350: improve record coercion type checking.

Browse source 
For a field of the same name in both the target type and the coerced
type, a type mismatch is now reported as an error at parse-time.
This commit is contained in:
Jon Siwek 2015-04-27 16:37:40 -05:00
parent da24fa40a5
commit 48fccb3bce
4 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Type.cc
View file

@ -1971,18 +1971,33 @@ int same_attrs(const Attributes* a1, const Attributes* a2)
return (*a1 == *a2);
}
int record_promotion_compatible(const RecordType* /* super_rec */,
const RecordType* /* sub_rec */)
int record_promotion_compatible(const RecordType* super_rec,
const RecordType* sub_rec)
{
#if 0
int n = sub_rec->NumFields();
for ( int i = 0; i < n; ++i )
for ( int i = 0; i < sub_rec->NumFields(); ++i )
{
if ( ! super_rec->HasField(sub_rec->FieldName(i)) )
int o = super_rec->FieldOffset(sub_rec->FieldName(i));
if ( o < 0 )
// Orphaned field.
continue;
BroType* sub_field_type = sub_rec->FieldType(i);
BroType* super_field_type = super_rec->FieldType(o);
if ( same_type(sub_field_type, super_field_type) )
continue;
if ( sub_field_type->Tag() != TYPE_RECORD )
return 0;
if ( super_field_type->Tag() != TYPE_RECORD )
return 0;
if ( ! record_promotion_compatible(super_field_type->AsRecordType(),
sub_field_type->AsRecordType()) )
return 0;
}
#endif
return 1;
}