mirror of
https://github.com/zeek/zeek.git
synced 2025-10-12 11:38: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
220
src/ID.h
220
src/ID.h
|
|
@ -13,8 +13,7 @@
|
|||
#include "zeek/Obj.h"
|
||||
#include "zeek/TraverseTypes.h"
|
||||
|
||||
namespace zeek
|
||||
{
|
||||
namespace zeek {
|
||||
|
||||
class Func;
|
||||
class Val;
|
||||
|
|
@ -31,29 +30,22 @@ using EnumTypePtr = IntrusivePtr<EnumType>;
|
|||
using ValPtr = IntrusivePtr<Val>;
|
||||
using FuncPtr = IntrusivePtr<Func>;
|
||||
|
||||
}
|
||||
} // namespace zeek
|
||||
|
||||
namespace zeek::detail
|
||||
{
|
||||
namespace zeek::detail {
|
||||
|
||||
class Attributes;
|
||||
class Expr;
|
||||
using ExprPtr = IntrusivePtr<Expr>;
|
||||
|
||||
enum InitClass
|
||||
{
|
||||
INIT_NONE,
|
||||
INIT_FULL,
|
||||
INIT_EXTRA,
|
||||
INIT_REMOVE,
|
||||
INIT_SKIP,
|
||||
};
|
||||
enum IDScope
|
||||
{
|
||||
SCOPE_FUNCTION,
|
||||
SCOPE_MODULE,
|
||||
SCOPE_GLOBAL
|
||||
};
|
||||
enum InitClass {
|
||||
INIT_NONE,
|
||||
INIT_FULL,
|
||||
INIT_EXTRA,
|
||||
INIT_REMOVE,
|
||||
INIT_SKIP,
|
||||
};
|
||||
enum IDScope { SCOPE_FUNCTION, SCOPE_MODULE, SCOPE_GLOBAL };
|
||||
|
||||
class ID;
|
||||
using IDPtr = IntrusivePtr<ID>;
|
||||
|
|
@ -61,130 +53,131 @@ using IDSet = std::unordered_set<const ID*>;
|
|||
|
||||
class IDOptInfo;
|
||||
|
||||
class ID final : public Obj, public notifier::detail::Modifiable
|
||||
{
|
||||
class ID final : public Obj, public notifier::detail::Modifiable {
|
||||
public:
|
||||
static inline const IDPtr nil;
|
||||
static inline const IDPtr nil;
|
||||
|
||||
ID(const char* name, IDScope arg_scope, bool arg_is_export);
|
||||
ID(const char* name, IDScope arg_scope, bool arg_is_export);
|
||||
|
||||
~ID() override;
|
||||
~ID() override;
|
||||
|
||||
const char* Name() const { return name; }
|
||||
const char* Name() const { return name; }
|
||||
|
||||
int Scope() const { return scope; }
|
||||
bool IsGlobal() const { return scope != SCOPE_FUNCTION; }
|
||||
int Scope() const { return scope; }
|
||||
bool IsGlobal() const { return scope != SCOPE_FUNCTION; }
|
||||
|
||||
bool IsExport() const { return is_export; }
|
||||
void SetExport() { is_export = true; }
|
||||
bool IsExport() const { return is_export; }
|
||||
void SetExport() { is_export = true; }
|
||||
|
||||
std::string ModuleName() const;
|
||||
std::string ModuleName() const;
|
||||
|
||||
void SetType(TypePtr t);
|
||||
void SetType(TypePtr t);
|
||||
|
||||
const TypePtr& GetType() const { return type; }
|
||||
const TypePtr& GetType() const { return type; }
|
||||
|
||||
template <class T> IntrusivePtr<T> GetType() const { return cast_intrusive<T>(type); }
|
||||
template<class T>
|
||||
IntrusivePtr<T> GetType() const {
|
||||
return cast_intrusive<T>(type);
|
||||
}
|
||||
|
||||
bool IsType() const { return is_type; }
|
||||
bool IsType() const { return is_type; }
|
||||
|
||||
void MakeType() { is_type = true; }
|
||||
void MakeType() { is_type = true; }
|
||||
|
||||
void SetVal(ValPtr v);
|
||||
void SetVal(ValPtr v);
|
||||
|
||||
void SetVal(ValPtr v, InitClass c);
|
||||
void SetVal(ExprPtr ev, InitClass c);
|
||||
void SetVal(ValPtr v, InitClass c);
|
||||
void SetVal(ExprPtr ev, InitClass c);
|
||||
|
||||
bool HasVal() const { return val != nullptr; }
|
||||
bool HasVal() const { return val != nullptr; }
|
||||
|
||||
const ValPtr& GetVal() const { return val; }
|
||||
const ValPtr& GetVal() const { return val; }
|
||||
|
||||
void ClearVal();
|
||||
void ClearVal();
|
||||
|
||||
void SetConst() { is_const = true; }
|
||||
bool IsConst() const { return is_const; }
|
||||
void SetConst() { is_const = true; }
|
||||
bool IsConst() const { return is_const; }
|
||||
|
||||
void SetOption();
|
||||
bool IsOption() const { return is_option; }
|
||||
bool IsBlank() const { return is_blank; };
|
||||
void SetOption();
|
||||
bool IsOption() const { return is_option; }
|
||||
bool IsBlank() const { return is_blank; };
|
||||
|
||||
void SetEnumConst() { is_enum_const = true; }
|
||||
bool IsEnumConst() const { return is_enum_const; }
|
||||
void SetEnumConst() { is_enum_const = true; }
|
||||
bool IsEnumConst() const { return is_enum_const; }
|
||||
|
||||
void SetOffset(int arg_offset) { offset = arg_offset; }
|
||||
int Offset() const { return offset; }
|
||||
void SetOffset(int arg_offset) { offset = arg_offset; }
|
||||
int Offset() const { return offset; }
|
||||
|
||||
bool IsRedefinable() const;
|
||||
bool IsRedefinable() const;
|
||||
|
||||
void SetAttrs(AttributesPtr attr);
|
||||
void AddAttr(AttrPtr a, bool is_redef = false);
|
||||
void AddAttrs(AttributesPtr attr, bool is_redef = false);
|
||||
void RemoveAttr(AttrTag a);
|
||||
void UpdateValAttrs();
|
||||
void SetAttrs(AttributesPtr attr);
|
||||
void AddAttr(AttrPtr a, bool is_redef = false);
|
||||
void AddAttrs(AttributesPtr attr, bool is_redef = false);
|
||||
void RemoveAttr(AttrTag a);
|
||||
void UpdateValAttrs();
|
||||
|
||||
const AttributesPtr& GetAttrs() const { return attrs; }
|
||||
const AttributesPtr& GetAttrs() const { return attrs; }
|
||||
|
||||
const AttrPtr& GetAttr(AttrTag t) const;
|
||||
const AttrPtr& GetAttr(AttrTag t) const;
|
||||
|
||||
bool IsDeprecated() const;
|
||||
bool IsDeprecated() const;
|
||||
|
||||
void MakeDeprecated(ExprPtr deprecation);
|
||||
void MakeDeprecated(ExprPtr deprecation);
|
||||
|
||||
std::string GetDeprecationWarning() const;
|
||||
std::string GetDeprecationWarning() const;
|
||||
|
||||
void Error(const char* msg, const Obj* o2 = nullptr);
|
||||
void Error(const char* msg, const Obj* o2 = nullptr);
|
||||
|
||||
void Describe(ODesc* d) const override;
|
||||
// Adds type and value to description.
|
||||
void DescribeExtended(ODesc* d) const;
|
||||
// Produces a description that's reST-ready.
|
||||
void DescribeReST(ODesc* d, bool roles_only = false) const;
|
||||
void DescribeReSTShort(ODesc* d) const;
|
||||
void Describe(ODesc* d) const override;
|
||||
// Adds type and value to description.
|
||||
void DescribeExtended(ODesc* d) const;
|
||||
// Produces a description that's reST-ready.
|
||||
void DescribeReST(ODesc* d, bool roles_only = false) const;
|
||||
void DescribeReSTShort(ODesc* d) const;
|
||||
|
||||
bool DoInferReturnType() const { return infer_return_type; }
|
||||
void SetInferReturnType(bool infer) { infer_return_type = infer; }
|
||||
bool DoInferReturnType() const { return infer_return_type; }
|
||||
void SetInferReturnType(bool infer) { infer_return_type = infer; }
|
||||
|
||||
TraversalCode Traverse(TraversalCallback* cb) const;
|
||||
TraversalCode Traverse(TraversalCallback* cb) const;
|
||||
|
||||
bool HasOptionHandlers() const { return ! option_handlers.empty(); }
|
||||
bool HasOptionHandlers() const { return ! option_handlers.empty(); }
|
||||
|
||||
void AddOptionHandler(FuncPtr callback, int priority);
|
||||
std::vector<Func*> GetOptionHandlers() const;
|
||||
void AddOptionHandler(FuncPtr callback, int priority);
|
||||
std::vector<Func*> GetOptionHandlers() const;
|
||||
|
||||
IDOptInfo* GetOptInfo() const { return opt_info; }
|
||||
void ClearOptInfo();
|
||||
IDOptInfo* GetOptInfo() const { return opt_info; }
|
||||
void ClearOptInfo();
|
||||
|
||||
protected:
|
||||
void EvalFunc(ExprPtr ef, ExprPtr ev);
|
||||
void EvalFunc(ExprPtr ef, ExprPtr ev);
|
||||
|
||||
#ifdef DEBUG
|
||||
void UpdateValID();
|
||||
void UpdateValID();
|
||||
#endif
|
||||
|
||||
const char* name;
|
||||
IDScope scope;
|
||||
bool is_export;
|
||||
bool infer_return_type;
|
||||
TypePtr type;
|
||||
bool is_const, is_enum_const, is_type, is_option, is_blank;
|
||||
int offset;
|
||||
ValPtr val;
|
||||
AttributesPtr attrs;
|
||||
const char* name;
|
||||
IDScope scope;
|
||||
bool is_export;
|
||||
bool infer_return_type;
|
||||
TypePtr type;
|
||||
bool is_const, is_enum_const, is_type, is_option, is_blank;
|
||||
int offset;
|
||||
ValPtr val;
|
||||
AttributesPtr attrs;
|
||||
|
||||
// contains list of functions that are called when an option changes
|
||||
std::multimap<int, FuncPtr> option_handlers;
|
||||
// contains list of functions that are called when an option changes
|
||||
std::multimap<int, FuncPtr> option_handlers;
|
||||
|
||||
// Information managed by script optimization. We package this
|
||||
// up into a separate object for purposes of modularity, and,
|
||||
// via the associated pointer, to allow it to be modified in
|
||||
// contexts where the ID is itself "const".
|
||||
IDOptInfo* opt_info;
|
||||
};
|
||||
// Information managed by script optimization. We package this
|
||||
// up into a separate object for purposes of modularity, and,
|
||||
// via the associated pointer, to allow it to be modified in
|
||||
// contexts where the ID is itself "const".
|
||||
IDOptInfo* opt_info;
|
||||
};
|
||||
|
||||
} // namespace zeek::detail
|
||||
} // namespace zeek::detail
|
||||
|
||||
namespace zeek::id
|
||||
{
|
||||
namespace zeek::id {
|
||||
|
||||
/**
|
||||
* Lookup an ID in the global module and return it, if one exists;
|
||||
|
|
@ -208,10 +201,10 @@ const TypePtr& find_type(std::string_view name);
|
|||
* @param name The identifier name to lookup
|
||||
* @return The type of the identifier.
|
||||
*/
|
||||
template <class T> IntrusivePtr<T> find_type(std::string_view name)
|
||||
{
|
||||
return cast_intrusive<T>(find_type(name));
|
||||
}
|
||||
template<class T>
|
||||
IntrusivePtr<T> find_type(std::string_view name) {
|
||||
return cast_intrusive<T>(find_type(name));
|
||||
}
|
||||
|
||||
/**
|
||||
* Lookup an ID by its name and return its value. A fatal occurs if the ID
|
||||
|
|
@ -227,10 +220,10 @@ const ValPtr& find_val(std::string_view name);
|
|||
* @param name The identifier name to lookup
|
||||
* @return The current value of the identifier.
|
||||
*/
|
||||
template <class T> IntrusivePtr<T> find_val(std::string_view name)
|
||||
{
|
||||
return cast_intrusive<T>(find_val(name));
|
||||
}
|
||||
template<class T>
|
||||
IntrusivePtr<T> find_val(std::string_view name) {
|
||||
return cast_intrusive<T>(find_val(name));
|
||||
}
|
||||
|
||||
/**
|
||||
* Lookup an ID by its name and return its value. A fatal occurs if the ID
|
||||
|
|
@ -246,10 +239,10 @@ const ValPtr& find_const(std::string_view name);
|
|||
* @param name The identifier name to lookup
|
||||
* @return The current value of the identifier.
|
||||
*/
|
||||
template <class T> IntrusivePtr<T> find_const(std::string_view name)
|
||||
{
|
||||
return cast_intrusive<T>(find_const(name));
|
||||
}
|
||||
template<class T>
|
||||
IntrusivePtr<T> find_const(std::string_view name) {
|
||||
return cast_intrusive<T>(find_const(name));
|
||||
}
|
||||
|
||||
/**
|
||||
* Lookup an ID by its name and return the function it references.
|
||||
|
|
@ -271,10 +264,9 @@ extern TableTypePtr count_set;
|
|||
extern VectorTypePtr string_vec;
|
||||
extern VectorTypePtr index_vec;
|
||||
|
||||
namespace detail
|
||||
{
|
||||
namespace detail {
|
||||
|
||||
void init_types();
|
||||
|
||||
} // namespace detail
|
||||
} // namespace zeek::id
|
||||
} // namespace detail
|
||||
} // namespace zeek::id
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue