mirror of
https://github.com/zeek/zeek.git
synced 2025-10-13 12:08:20 +00:00
Reformat Zeek in Spicy style
This largely copies over Spicy's `.clang-format` configuration file. The one place where we deviate is header include order since Zeek depends on headers being included in a certain order.
This commit is contained in:
Benjamin Bannier
parent
7b8e7ed72c
commit
f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
378
src/ZVal.cc
378
src/ZVal.cc
|
|
@ -10,302 +10,194 @@ using namespace zeek;
|
|||
|
||||
bool* ZVal::zval_was_nil_addr = nullptr;
|
||||
|
||||
ZVal::ZVal(ValPtr v, const TypePtr& t)
|
||||
{
|
||||
if ( ! v )
|
||||
{
|
||||
// This can happen for some forms of error propagation.
|
||||
// We can deal with it iff the type is managed, and thus
|
||||
// we can employ a "nil" placeholder.
|
||||
ASSERT(IsManagedType(t));
|
||||
managed_val = nullptr;
|
||||
return;
|
||||
}
|
||||
ZVal::ZVal(ValPtr v, const TypePtr& t) {
|
||||
if ( ! v ) {
|
||||
// This can happen for some forms of error propagation.
|
||||
// We can deal with it iff the type is managed, and thus
|
||||
// we can employ a "nil" placeholder.
|
||||
ASSERT(IsManagedType(t));
|
||||
managed_val = nullptr;
|
||||
return;
|
||||
}
|
||||
|
||||
const auto& vt = v->GetType();
|
||||
const auto& vt = v->GetType();
|
||||
|
||||
if ( vt->Tag() != t->Tag() && t->Tag() != TYPE_ANY )
|
||||
{
|
||||
if ( t->InternalType() == TYPE_INTERNAL_OTHER || t->InternalType() != vt->InternalType() )
|
||||
reporter->InternalError("type inconsistency in ZVal constructor");
|
||||
}
|
||||
if ( vt->Tag() != t->Tag() && t->Tag() != TYPE_ANY ) {
|
||||
if ( t->InternalType() == TYPE_INTERNAL_OTHER || t->InternalType() != vt->InternalType() )
|
||||
reporter->InternalError("type inconsistency in ZVal constructor");
|
||||
}
|
||||
|
||||
switch ( t->Tag() )
|
||||
{
|
||||
case TYPE_BOOL:
|
||||
case TYPE_INT:
|
||||
case TYPE_ENUM:
|
||||
int_val = v->AsInt();
|
||||
break;
|
||||
switch ( t->Tag() ) {
|
||||
case TYPE_BOOL:
|
||||
case TYPE_INT:
|
||||
case TYPE_ENUM: int_val = v->AsInt(); break;
|
||||
|
||||
case TYPE_COUNT:
|
||||
case TYPE_PORT:
|
||||
uint_val = v->AsCount();
|
||||
break;
|
||||
case TYPE_COUNT:
|
||||
case TYPE_PORT: uint_val = v->AsCount(); break;
|
||||
|
||||
case TYPE_DOUBLE:
|
||||
case TYPE_INTERVAL:
|
||||
case TYPE_TIME:
|
||||
double_val = v->AsDouble();
|
||||
break;
|
||||
case TYPE_DOUBLE:
|
||||
case TYPE_INTERVAL:
|
||||
case TYPE_TIME: double_val = v->AsDouble(); break;
|
||||
|
||||
case TYPE_FUNC:
|
||||
func_val = v->AsFunc();
|
||||
Ref(func_val);
|
||||
break;
|
||||
case TYPE_FUNC:
|
||||
func_val = v->AsFunc();
|
||||
Ref(func_val);
|
||||
break;
|
||||
|
||||
case TYPE_FILE:
|
||||
file_val = v->AsFile();
|
||||
Ref(file_val);
|
||||
break;
|
||||
case TYPE_FILE:
|
||||
file_val = v->AsFile();
|
||||
Ref(file_val);
|
||||
break;
|
||||
|
||||
case TYPE_LIST:
|
||||
list_val = v.release()->AsListVal();
|
||||
break;
|
||||
case TYPE_LIST: list_val = v.release()->AsListVal(); break;
|
||||
|
||||
case TYPE_OPAQUE:
|
||||
opaque_val = v.release()->AsOpaqueVal();
|
||||
break;
|
||||
case TYPE_OPAQUE: opaque_val = v.release()->AsOpaqueVal(); break;
|
||||
|
||||
case TYPE_PATTERN:
|
||||
re_val = v.release()->AsPatternVal();
|
||||
break;
|
||||
case TYPE_PATTERN: re_val = v.release()->AsPatternVal(); break;
|
||||
|
||||
case TYPE_TABLE:
|
||||
table_val = v.release()->AsTableVal();
|
||||
break;
|
||||
case TYPE_TABLE: table_val = v.release()->AsTableVal(); break;
|
||||
|
||||
case TYPE_VECTOR:
|
||||
vector_val = v.release()->AsVectorVal();
|
||||
break;
|
||||
case TYPE_VECTOR: vector_val = v.release()->AsVectorVal(); break;
|
||||
|
||||
case TYPE_RECORD:
|
||||
record_val = v.release()->AsRecordVal();
|
||||
break;
|
||||
case TYPE_RECORD: record_val = v.release()->AsRecordVal(); break;
|
||||
|
||||
case TYPE_STRING:
|
||||
string_val = v.release()->AsStringVal();
|
||||
break;
|
||||
case TYPE_STRING: string_val = v.release()->AsStringVal(); break;
|
||||
|
||||
case TYPE_ADDR:
|
||||
addr_val = v.release()->AsAddrVal();
|
||||
break;
|
||||
case TYPE_ADDR: addr_val = v.release()->AsAddrVal(); break;
|
||||
|
||||
case TYPE_SUBNET:
|
||||
subnet_val = v.release()->AsSubNetVal();
|
||||
break;
|
||||
case TYPE_SUBNET: subnet_val = v.release()->AsSubNetVal(); break;
|
||||
|
||||
case TYPE_ANY:
|
||||
any_val = v.release();
|
||||
break;
|
||||
case TYPE_ANY: any_val = v.release(); break;
|
||||
|
||||
case TYPE_TYPE:
|
||||
type_val = v.release()->AsTypeVal();
|
||||
break;
|
||||
case TYPE_TYPE: type_val = v.release()->AsTypeVal(); break;
|
||||
|
||||
case TYPE_ERROR:
|
||||
case TYPE_VOID:
|
||||
reporter->InternalError("bad type in ZVal constructor");
|
||||
}
|
||||
}
|
||||
case TYPE_ERROR:
|
||||
case TYPE_VOID: reporter->InternalError("bad type in ZVal constructor");
|
||||
}
|
||||
}
|
||||
|
||||
ZVal::ZVal(const TypePtr& t)
|
||||
{
|
||||
switch ( t->Tag() )
|
||||
{
|
||||
case TYPE_BOOL:
|
||||
case TYPE_INT:
|
||||
case TYPE_ENUM:
|
||||
int_val = 0;
|
||||
break;
|
||||
ZVal::ZVal(const TypePtr& t) {
|
||||
switch ( t->Tag() ) {
|
||||
case TYPE_BOOL:
|
||||
case TYPE_INT:
|
||||
case TYPE_ENUM: int_val = 0; break;
|
||||
|
||||
case TYPE_COUNT:
|
||||
case TYPE_PORT:
|
||||
uint_val = 0;
|
||||
break;
|
||||
case TYPE_COUNT:
|
||||
case TYPE_PORT: uint_val = 0; break;
|
||||
|
||||
case TYPE_DOUBLE:
|
||||
case TYPE_INTERVAL:
|
||||
case TYPE_TIME:
|
||||
double_val = 0.0;
|
||||
break;
|
||||
case TYPE_DOUBLE:
|
||||
case TYPE_INTERVAL:
|
||||
case TYPE_TIME: double_val = 0.0; break;
|
||||
|
||||
case TYPE_FUNC:
|
||||
func_val = nullptr;
|
||||
break;
|
||||
case TYPE_FUNC: func_val = nullptr; break;
|
||||
|
||||
case TYPE_FILE:
|
||||
file_val = nullptr;
|
||||
break;
|
||||
case TYPE_FILE: file_val = nullptr; break;
|
||||
|
||||
case TYPE_LIST:
|
||||
list_val = nullptr;
|
||||
break;
|
||||
case TYPE_LIST: list_val = nullptr; break;
|
||||
|
||||
case TYPE_OPAQUE:
|
||||
opaque_val = nullptr;
|
||||
break;
|
||||
case TYPE_OPAQUE: opaque_val = nullptr; break;
|
||||
|
||||
case TYPE_PATTERN:
|
||||
re_val = nullptr;
|
||||
break;
|
||||
case TYPE_PATTERN: re_val = nullptr; break;
|
||||
|
||||
case TYPE_TABLE:
|
||||
table_val = nullptr;
|
||||
break;
|
||||
case TYPE_TABLE: table_val = nullptr; break;
|
||||
|
||||
case TYPE_VECTOR:
|
||||
vector_val = nullptr;
|
||||
break;
|
||||
case TYPE_VECTOR: vector_val = nullptr; break;
|
||||
|
||||
case TYPE_RECORD:
|
||||
record_val = nullptr;
|
||||
break;
|
||||
case TYPE_RECORD: record_val = nullptr; break;
|
||||
|
||||
case TYPE_STRING:
|
||||
string_val = nullptr;
|
||||
break;
|
||||
case TYPE_STRING: string_val = nullptr; break;
|
||||
|
||||
case TYPE_ADDR:
|
||||
addr_val = nullptr;
|
||||
break;
|
||||
case TYPE_ADDR: addr_val = nullptr; break;
|
||||
|
||||
case TYPE_SUBNET:
|
||||
subnet_val = nullptr;
|
||||
break;
|
||||
case TYPE_SUBNET: subnet_val = nullptr; break;
|
||||
|
||||
case TYPE_ANY:
|
||||
any_val = nullptr;
|
||||
break;
|
||||
case TYPE_ANY: any_val = nullptr; break;
|
||||
|
||||
case TYPE_TYPE:
|
||||
type_val = nullptr;
|
||||
break;
|
||||
case TYPE_TYPE: type_val = nullptr; break;
|
||||
|
||||
case TYPE_ERROR:
|
||||
case TYPE_VOID:
|
||||
reporter->InternalError("bad type in ZVal constructor");
|
||||
}
|
||||
}
|
||||
case TYPE_ERROR:
|
||||
case TYPE_VOID: reporter->InternalError("bad type in ZVal constructor");
|
||||
}
|
||||
}
|
||||
|
||||
ValPtr ZVal::ToVal(const TypePtr& t) const
|
||||
{
|
||||
Val* v;
|
||||
ValPtr ZVal::ToVal(const TypePtr& t) const {
|
||||
Val* v;
|
||||
|
||||
switch ( t->Tag() )
|
||||
{
|
||||
case TYPE_INT:
|
||||
return val_mgr->Int(int_val);
|
||||
switch ( t->Tag() ) {
|
||||
case TYPE_INT: return val_mgr->Int(int_val);
|
||||
|
||||
case TYPE_BOOL:
|
||||
return val_mgr->Bool(int_val ? true : false);
|
||||
case TYPE_BOOL: return val_mgr->Bool(int_val ? true : false);
|
||||
|
||||
case TYPE_PORT:
|
||||
return val_mgr->Port(uint_val);
|
||||
case TYPE_PORT: return val_mgr->Port(uint_val);
|
||||
|
||||
case TYPE_COUNT:
|
||||
return val_mgr->Count(uint_val);
|
||||
case TYPE_COUNT: return val_mgr->Count(uint_val);
|
||||
|
||||
case TYPE_DOUBLE:
|
||||
return make_intrusive<DoubleVal>(double_val);
|
||||
case TYPE_DOUBLE: return make_intrusive<DoubleVal>(double_val);
|
||||
|
||||
case TYPE_INTERVAL:
|
||||
return make_intrusive<IntervalVal>(double_val, Seconds);
|
||||
case TYPE_INTERVAL: return make_intrusive<IntervalVal>(double_val, Seconds);
|
||||
|
||||
case TYPE_TIME:
|
||||
return make_intrusive<TimeVal>(double_val);
|
||||
case TYPE_TIME: return make_intrusive<TimeVal>(double_val);
|
||||
|
||||
case TYPE_ENUM:
|
||||
return t->AsEnumType()->GetEnumVal(int_val);
|
||||
case TYPE_ENUM: return t->AsEnumType()->GetEnumVal(int_val);
|
||||
|
||||
case TYPE_FUNC:
|
||||
if ( func_val )
|
||||
{
|
||||
FuncPtr fv_ptr = {NewRef{}, func_val};
|
||||
return make_intrusive<FuncVal>(fv_ptr);
|
||||
}
|
||||
case TYPE_FUNC:
|
||||
if ( func_val ) {
|
||||
FuncPtr fv_ptr = {NewRef{}, func_val};
|
||||
return make_intrusive<FuncVal>(fv_ptr);
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
return nullptr;
|
||||
|
||||
case TYPE_FILE:
|
||||
if ( file_val )
|
||||
{
|
||||
FilePtr fv_ptr = {NewRef{}, file_val};
|
||||
return make_intrusive<FileVal>(fv_ptr);
|
||||
}
|
||||
case TYPE_FILE:
|
||||
if ( file_val ) {
|
||||
FilePtr fv_ptr = {NewRef{}, file_val};
|
||||
return make_intrusive<FileVal>(fv_ptr);
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
return nullptr;
|
||||
|
||||
case TYPE_ADDR:
|
||||
v = addr_val;
|
||||
break;
|
||||
case TYPE_SUBNET:
|
||||
v = subnet_val;
|
||||
break;
|
||||
case TYPE_STRING:
|
||||
v = string_val;
|
||||
break;
|
||||
case TYPE_LIST:
|
||||
v = list_val;
|
||||
break;
|
||||
case TYPE_OPAQUE:
|
||||
v = opaque_val;
|
||||
break;
|
||||
case TYPE_TABLE:
|
||||
v = table_val;
|
||||
break;
|
||||
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_ADDR: v = addr_val; break;
|
||||
case TYPE_SUBNET: v = subnet_val; break;
|
||||
case TYPE_STRING: v = string_val; break;
|
||||
case TYPE_LIST: v = list_val; break;
|
||||
case TYPE_OPAQUE: v = opaque_val; break;
|
||||
case TYPE_TABLE: v = table_val; break;
|
||||
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_VOID:
|
||||
default:
|
||||
v = nullptr;
|
||||
reporter->InternalError("bad type in ZVal::ToVal: %s", type_name(t->Tag()));
|
||||
}
|
||||
case TYPE_ERROR:
|
||||
case TYPE_VOID:
|
||||
default: v = nullptr; reporter->InternalError("bad type in ZVal::ToVal: %s", type_name(t->Tag()));
|
||||
}
|
||||
|
||||
if ( v )
|
||||
return {NewRef{}, v};
|
||||
if ( v )
|
||||
return {NewRef{}, v};
|
||||
|
||||
if ( zval_was_nil_addr )
|
||||
*zval_was_nil_addr = true;
|
||||
if ( zval_was_nil_addr )
|
||||
*zval_was_nil_addr = true;
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool ZVal::IsManagedType(const TypePtr& t)
|
||||
{
|
||||
switch ( t->Tag() )
|
||||
{
|
||||
case zeek::TYPE_ADDR:
|
||||
case zeek::TYPE_ANY:
|
||||
case zeek::TYPE_FILE:
|
||||
case zeek::TYPE_FUNC:
|
||||
case zeek::TYPE_LIST:
|
||||
case zeek::TYPE_OPAQUE:
|
||||
case zeek::TYPE_PATTERN:
|
||||
case zeek::TYPE_RECORD:
|
||||
case zeek::TYPE_STRING:
|
||||
case zeek::TYPE_SUBNET:
|
||||
case zeek::TYPE_TABLE:
|
||||
case zeek::TYPE_TYPE:
|
||||
case zeek::TYPE_VECTOR:
|
||||
return true;
|
||||
bool ZVal::IsManagedType(const TypePtr& t) {
|
||||
switch ( t->Tag() ) {
|
||||
case zeek::TYPE_ADDR:
|
||||
case zeek::TYPE_ANY:
|
||||
case zeek::TYPE_FILE:
|
||||
case zeek::TYPE_FUNC:
|
||||
case zeek::TYPE_LIST:
|
||||
case zeek::TYPE_OPAQUE:
|
||||
case zeek::TYPE_PATTERN:
|
||||
case zeek::TYPE_RECORD:
|
||||
case zeek::TYPE_STRING:
|
||||
case zeek::TYPE_SUBNET:
|
||||
case zeek::TYPE_TABLE:
|
||||
case zeek::TYPE_TYPE:
|
||||
case zeek::TYPE_VECTOR: return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue