github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

dfa: standardise 'using' instead of typedef

Browse Source
This commit is contained in:
Justin Viiret 2017-05-15 10:02:13 +10:00 committed by Matthew Barr
parent 0d7d52625c
commit 85f7790a21
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nfa/rdfa_merge.cpp
View File

@ -53,8 +53,8 @@ namespace {
class Automaton_Merge { class Automaton_Merge {
public: public:
typedef vector<u16> StateSet; using StateSet = vector<u16>;
typedef ue2::unordered_map<StateSet, dstate_id_t> StateMap; using StateMap = unordered_map<StateSet, dstate_id_t>;
Automaton_Merge(const raw_dfa *rdfa1, const raw_dfa *rdfa2, Automaton_Merge(const raw_dfa *rdfa1, const raw_dfa *rdfa2,
const ReportManager *rm_in, const Grey &grey_in) const ReportManager *rm_in, const Grey &grey_in)

8
src/nfagraph/ng_haig.cpp
View File

@ -285,8 +285,8 @@ public:
class Automaton_Haig_Merge { class Automaton_Haig_Merge {
public: public:
typedef vector<u16> StateSet; using StateSet = vector<u16>;
typedef ue2::unordered_map<StateSet, dstate_id_t> StateMap; using StateMap = unordered_map<StateSet, dstate_id_t>;
explicit Automaton_Haig_Merge(const vector<const raw_som_dfa *> &in) explicit Automaton_Haig_Merge(const vector<const raw_som_dfa *> &in)
: nfas(in.begin(), in.end()), dead(in.size()) { : nfas(in.begin(), in.end()), dead(in.size()) {
@ -515,7 +515,7 @@ bool doHaig(const NGHolder &g, som_type som,
raw_som_dfa *rdfa) { raw_som_dfa *rdfa) {
u32 state_limit = HAIG_FINAL_DFA_STATE_LIMIT; /* haig never backs down from u32 state_limit = HAIG_FINAL_DFA_STATE_LIMIT; /* haig never backs down from
a fight */ a fight */
typedef typename Auto::StateSet StateSet; using StateSet = typename Auto::StateSet;
vector<StateSet> nfa_state_map; vector<StateSet> nfa_state_map;
Auto n(g, som, triggers, unordered_som); Auto n(g, som, triggers, unordered_som);
try { try {
@ -721,7 +721,7 @@ unique_ptr<raw_som_dfa> attemptToMergeHaig(const vector<const raw_som_dfa *> &df
} }
} }
typedef Automaton_Haig_Merge::StateSet StateSet; using StateSet = Automaton_Haig_Merge::StateSet;
vector<StateSet> nfa_state_map; vector<StateSet> nfa_state_map;
auto rdfa = ue2::make_unique<raw_som_dfa>(dfas[0]->kind, unordered_som, auto rdfa = ue2::make_unique<raw_som_dfa>(dfas[0]->kind, unordered_som,
NODE_START, NODE_START,

6
src/rose/rose_build_anchored.cpp
View File

@ -274,7 +274,7 @@ u32 anchoredStateSize(const anchored_matcher_info &atable) {
namespace { namespace {
typedef bitfield<ANCHORED_NFA_STATE_LIMIT> nfa_state_set; using nfa_state_set = bitfield<ANCHORED_NFA_STATE_LIMIT>;
struct Holder_StateSet { struct Holder_StateSet {
Holder_StateSet() : wdelay(0) {} Holder_StateSet() : wdelay(0) {}
@ -296,8 +296,8 @@ size_t hash_value(const Holder_StateSet &s) {
class Automaton_Holder { class Automaton_Holder {
public: public:
typedef Holder_StateSet StateSet; using StateSet = Holder_StateSet;
typedef ue2::unordered_map<StateSet, dstate_id_t> StateMap; using StateMap = unordered_map<StateSet, dstate_id_t>;
explicit Automaton_Holder(const NGHolder &g_in) : g(g_in) { explicit Automaton_Holder(const NGHolder &g_in) : g(g_in) {
for (auto v : vertices_range(g)) { for (auto v : vertices_range(g)) {

5
src/util/determinise.h
View File

@ -79,9 +79,8 @@ never_inline
bool determinise(Auto &n, std::vector<ds> &dstates, size_t state_limit, bool determinise(Auto &n, std::vector<ds> &dstates, size_t state_limit,
std::vector<typename Auto::StateSet> *statesets_out = nullptr) { std::vector<typename Auto::StateSet> *statesets_out = nullptr) {
DEBUG_PRINTF("the determinator\n"); DEBUG_PRINTF("the determinator\n");
typedef typename Auto::StateSet StateSet; using StateSet = typename Auto::StateSet;
typedef typename Auto::StateMap DstateIdMap; typename Auto::StateMap dstate_ids;
DstateIdMap dstate_ids;
const size_t alphabet_size = n.alphasize; const size_t alphabet_size = n.alphasize;