AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-12-22 11:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #197

Browse Source
This commit is contained in:
yhirose 2022-05-06 16:31:33 -04:00
parent 187ac4849a
commit cd1da19062
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
peglib.h
View File

@ -19,7 +19,6 @@
#include <initializer_list> #include <initializer_list>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
#include <list>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
@ -964,7 +963,7 @@ public:
bool is_traceable(const Ope &ope) const; bool is_traceable(const Ope &ope) const;
mutable size_t next_trace_id = 0; mutable size_t next_trace_id = 0;
mutable std::list<size_t> trace_ids; mutable std::vector<size_t> trace_ids;
}; };
/* /*
@ -1955,7 +1954,7 @@ private:
}; };
struct HasEmptyElement : public Ope::Visitor { struct HasEmptyElement : public Ope::Visitor {
HasEmptyElement(std::list<std::pair<const char *, std::string>> &refs) HasEmptyElement(std::vector<std::pair<const char *, std::string>> &refs)
: refs_(refs) {} : refs_(refs) {}
void visit(Sequence &ope) override { void visit(Sequence &ope) override {
@ -2013,7 +2012,7 @@ private:
is_empty = true; is_empty = true;
tie(error_s, error_name) = refs_.back(); tie(error_s, error_name) = refs_.back();
} }
std::list<std::pair<const char *, std::string>> &refs_; std::vector<std::pair<const char *, std::string>> &refs_;
}; };
struct DetectInfiniteLoop : public Ope::Visitor { struct DetectInfiniteLoop : public Ope::Visitor {
@ -2064,7 +2063,8 @@ struct DetectInfiniteLoop : public Ope::Visitor {
std::string error_name; std::string error_name;
private: private:
std::list<std::pair<const char *, std::string>> refs_; std::vector<std::pair<const char *, std::string>> refs_;
std::unordered_map<std::string, bool> has_error_cache_;
}; };
struct ReferenceChecker : public Ope::Visitor { struct ReferenceChecker : public Ope::Visitor {
@ -2956,9 +2956,15 @@ inline void DetectInfiniteLoop::visit(Reference &ope) {
if (it != refs_.end()) { return; } if (it != refs_.end()) { return; }
if (ope.rule_) { if (ope.rule_) {
refs_.emplace_back(ope.s_, ope.name_); auto it = has_error_cache_.find(ope.name_);
ope.rule_->accept(*this); if (it != has_error_cache_.end()) {
refs_.pop_back(); has_error = it->second;
} else {
refs_.emplace_back(ope.s_, ope.name_);
ope.rule_->accept(*this);
refs_.pop_back();
has_error_cache_[ope.name_] = has_error;
}
} }
if (ope.is_macro_) { if (ope.is_macro_) {