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

switch ZVal representation of types from Type objects to TypeVal's

Browse source
This commit is contained in:
Vern Paxson 2021-05-30 18:44:41 -07:00
parent f3fa8a7c0b
commit dfc74a9af4
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/ZVal.cc
View file

@ -24,7 +24,7 @@ ZVal::ZVal(ValPtr v, const TypePtr& t)
return;
}
auto vt = v->GetType();
const auto& vt = v->GetType();
if ( vt->Tag() != t->Tag() && t->Tag() != TYPE_ANY )
{
@ -102,7 +102,7 @@ ZVal::ZVal(ValPtr v, const TypePtr& t)
break;
case TYPE_TYPE:
type_val = t->Ref();
type_val = v.release()->AsTypeVal();
break;
case TYPE_ERROR:
@ -222,15 +222,6 @@ ValPtr ZVal::ToVal(const TypePtr& t) const
case TYPE_ENUM:
return t->AsEnumType()->GetEnumVal(int_val);
case TYPE_ANY:
return {NewRef{}, any_val};
case TYPE_TYPE:
{
TypePtr tp = {NewRef{}, type_val};
return make_intrusive<TypeVal>(tp);
}
case TYPE_FUNC:
if ( func_val )
{
@ -258,6 +249,8 @@ ValPtr ZVal::ToVal(const TypePtr& t) const
case TYPE_RECORD: v = record_val; break;
case TYPE_VECTOR: v = vector_val; break;
case TYPE_PATTERN: v = re_val; break;
case TYPE_ANY: v = any_val; break;
case TYPE_TYPE: v = type_val; break;
case TYPE_ERROR:
case TYPE_TIMER: