mirror of
https://github.com/zeek/zeek.git
synced 2025-10-04 07:38:19 +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
173
src/DFA.h
173
src/DFA.h
|
|
@ -11,8 +11,7 @@
|
|||
#include "zeek/Obj.h"
|
||||
#include "zeek/RE.h" // for typedef AcceptingSet
|
||||
|
||||
namespace zeek::detail
|
||||
{
|
||||
namespace zeek::detail {
|
||||
|
||||
class DFA_State;
|
||||
class DFA_Machine;
|
||||
|
|
@ -22,132 +21,126 @@ class DFA_Machine;
|
|||
#define DFA_UNCOMPUTED_STATE -2
|
||||
#define DFA_UNCOMPUTED_STATE_PTR ((DFA_State*)DFA_UNCOMPUTED_STATE)
|
||||
|
||||
class DFA_State : public Obj
|
||||
{
|
||||
class DFA_State : public Obj {
|
||||
public:
|
||||
DFA_State(int state_num, const EquivClass* ec, NFA_state_list* nfa_states,
|
||||
AcceptingSet* accept);
|
||||
~DFA_State() override;
|
||||
DFA_State(int state_num, const EquivClass* ec, NFA_state_list* nfa_states, AcceptingSet* accept);
|
||||
~DFA_State() override;
|
||||
|
||||
int StateNum() const { return state_num; }
|
||||
int NFAStateNum() const { return nfa_states->length(); }
|
||||
void AddXtion(int sym, DFA_State* next_state);
|
||||
int StateNum() const { return state_num; }
|
||||
int NFAStateNum() const { return nfa_states->length(); }
|
||||
void AddXtion(int sym, DFA_State* next_state);
|
||||
|
||||
inline DFA_State* Xtion(int sym, DFA_Machine* machine);
|
||||
inline DFA_State* Xtion(int sym, DFA_Machine* machine);
|
||||
|
||||
const AcceptingSet* Accept() const { return accept; }
|
||||
void SymPartition(const EquivClass* ec);
|
||||
const AcceptingSet* Accept() const { return accept; }
|
||||
void SymPartition(const EquivClass* ec);
|
||||
|
||||
// ec_sym is an equivalence class, not a character.
|
||||
NFA_state_list* SymFollowSet(int ec_sym, const EquivClass* ec);
|
||||
// ec_sym is an equivalence class, not a character.
|
||||
NFA_state_list* SymFollowSet(int ec_sym, const EquivClass* ec);
|
||||
|
||||
void SetMark(DFA_State* m) { mark = m; }
|
||||
DFA_State* Mark() const { return mark; }
|
||||
void ClearMarks();
|
||||
void SetMark(DFA_State* m) { mark = m; }
|
||||
DFA_State* Mark() const { return mark; }
|
||||
void ClearMarks();
|
||||
|
||||
// Returns the equivalence classes of ec's corresponding to this state.
|
||||
const EquivClass* MetaECs() const { return meta_ec; }
|
||||
// Returns the equivalence classes of ec's corresponding to this state.
|
||||
const EquivClass* MetaECs() const { return meta_ec; }
|
||||
|
||||
void Describe(ODesc* d) const override;
|
||||
void Dump(FILE* f, DFA_Machine* m);
|
||||
void Stats(unsigned int* computed, unsigned int* uncomputed);
|
||||
unsigned int Size();
|
||||
void Describe(ODesc* d) const override;
|
||||
void Dump(FILE* f, DFA_Machine* m);
|
||||
void Stats(unsigned int* computed, unsigned int* uncomputed);
|
||||
unsigned int Size();
|
||||
|
||||
protected:
|
||||
friend class DFA_State_Cache;
|
||||
friend class DFA_State_Cache;
|
||||
|
||||
DFA_State* ComputeXtion(int sym, DFA_Machine* machine);
|
||||
void AppendIfNew(int sym, int_list* sym_list);
|
||||
DFA_State* ComputeXtion(int sym, DFA_Machine* machine);
|
||||
void AppendIfNew(int sym, int_list* sym_list);
|
||||
|
||||
int state_num;
|
||||
int num_sym;
|
||||
int state_num;
|
||||
int num_sym;
|
||||
|
||||
DFA_State** xtions;
|
||||
DFA_State** xtions;
|
||||
|
||||
AcceptingSet* accept;
|
||||
NFA_state_list* nfa_states;
|
||||
EquivClass* meta_ec; // which ec's make same transition
|
||||
DFA_State* mark;
|
||||
};
|
||||
AcceptingSet* accept;
|
||||
NFA_state_list* nfa_states;
|
||||
EquivClass* meta_ec; // which ec's make same transition
|
||||
DFA_State* mark;
|
||||
};
|
||||
|
||||
using DigestStr = std::basic_string<u_char>;
|
||||
|
||||
class DFA_State_Cache
|
||||
{
|
||||
class DFA_State_Cache {
|
||||
public:
|
||||
DFA_State_Cache();
|
||||
~DFA_State_Cache();
|
||||
DFA_State_Cache();
|
||||
~DFA_State_Cache();
|
||||
|
||||
// If the caller stores the handle, it has to call Ref() on it.
|
||||
DFA_State* Lookup(const NFA_state_list& nfa_states, DigestStr* digest);
|
||||
// If the caller stores the handle, it has to call Ref() on it.
|
||||
DFA_State* Lookup(const NFA_state_list& nfa_states, DigestStr* digest);
|
||||
|
||||
// Takes ownership of state; digest is the one returned by Lookup().
|
||||
DFA_State* Insert(DFA_State* state, DigestStr digest);
|
||||
// Takes ownership of state; digest is the one returned by Lookup().
|
||||
DFA_State* Insert(DFA_State* state, DigestStr digest);
|
||||
|
||||
int NumEntries() const { return states.size(); }
|
||||
int NumEntries() const { return states.size(); }
|
||||
|
||||
struct Stats
|
||||
{
|
||||
// Sum of all NFA states
|
||||
unsigned int nfa_states;
|
||||
unsigned int dfa_states;
|
||||
unsigned int computed;
|
||||
unsigned int uncomputed;
|
||||
unsigned int mem;
|
||||
unsigned int hits;
|
||||
unsigned int misses;
|
||||
};
|
||||
struct Stats {
|
||||
// Sum of all NFA states
|
||||
unsigned int nfa_states;
|
||||
unsigned int dfa_states;
|
||||
unsigned int computed;
|
||||
unsigned int uncomputed;
|
||||
unsigned int mem;
|
||||
unsigned int hits;
|
||||
unsigned int misses;
|
||||
};
|
||||
|
||||
void GetStats(Stats* s);
|
||||
void GetStats(Stats* s);
|
||||
|
||||
private:
|
||||
int hits; // Statistics
|
||||
int misses;
|
||||
int hits; // Statistics
|
||||
int misses;
|
||||
|
||||
// Hash indexed by NFA states (MD5s of them, actually).
|
||||
std::map<DigestStr, DFA_State*> states;
|
||||
};
|
||||
// Hash indexed by NFA states (MD5s of them, actually).
|
||||
std::map<DigestStr, DFA_State*> states;
|
||||
};
|
||||
|
||||
class DFA_Machine : public Obj
|
||||
{
|
||||
class DFA_Machine : public Obj {
|
||||
public:
|
||||
DFA_Machine(NFA_Machine* n, EquivClass* ec);
|
||||
~DFA_Machine() override;
|
||||
DFA_Machine(NFA_Machine* n, EquivClass* ec);
|
||||
~DFA_Machine() override;
|
||||
|
||||
DFA_State* StartState() const { return start_state; }
|
||||
DFA_State* StartState() const { return start_state; }
|
||||
|
||||
int NumStates() const { return dfa_state_cache->NumEntries(); }
|
||||
int NumStates() const { return dfa_state_cache->NumEntries(); }
|
||||
|
||||
DFA_State_Cache* Cache() { return dfa_state_cache; }
|
||||
DFA_State_Cache* Cache() { return dfa_state_cache; }
|
||||
|
||||
int Rep(int sym);
|
||||
int Rep(int sym);
|
||||
|
||||
void Describe(ODesc* d) const override;
|
||||
void Dump(FILE* f);
|
||||
void Describe(ODesc* d) const override;
|
||||
void Dump(FILE* f);
|
||||
|
||||
protected:
|
||||
friend class DFA_State; // for DFA_State::ComputeXtion
|
||||
friend class DFA_State_Cache;
|
||||
friend class DFA_State; // for DFA_State::ComputeXtion
|
||||
friend class DFA_State_Cache;
|
||||
|
||||
int state_count;
|
||||
int state_count;
|
||||
|
||||
// The state list has to be sorted according to IDs.
|
||||
bool StateSetToDFA_State(NFA_state_list* state_set, DFA_State*& d, const EquivClass* ec);
|
||||
const EquivClass* EC() const { return ec; }
|
||||
// The state list has to be sorted according to IDs.
|
||||
bool StateSetToDFA_State(NFA_state_list* state_set, DFA_State*& d, const EquivClass* ec);
|
||||
const EquivClass* EC() const { return ec; }
|
||||
|
||||
EquivClass* ec; // equivalence classes corresponding to NFAs
|
||||
DFA_State* start_state;
|
||||
DFA_State_Cache* dfa_state_cache;
|
||||
EquivClass* ec; // equivalence classes corresponding to NFAs
|
||||
DFA_State* start_state;
|
||||
DFA_State_Cache* dfa_state_cache;
|
||||
|
||||
NFA_Machine* nfa;
|
||||
};
|
||||
NFA_Machine* nfa;
|
||||
};
|
||||
|
||||
inline DFA_State* DFA_State::Xtion(int sym, DFA_Machine* machine)
|
||||
{
|
||||
if ( xtions[sym] == DFA_UNCOMPUTED_STATE_PTR )
|
||||
return ComputeXtion(sym, machine);
|
||||
else
|
||||
return xtions[sym];
|
||||
}
|
||||
inline DFA_State* DFA_State::Xtion(int sym, DFA_Machine* machine) {
|
||||
if ( xtions[sym] == DFA_UNCOMPUTED_STATE_PTR )
|
||||
return ComputeXtion(sym, machine);
|
||||
else
|
||||
return xtions[sym];
|
||||
}
|
||||
|
||||
} // namespace zeek::detail
|
||||
} // namespace zeek::detail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue