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

Use std::call_once to initialize is_word in LiteralString

Browse Source
This commit is contained in:
yhirose 2020-06-09 08:48:19 -04:00
parent a2a4f30219
commit c49366ad07
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
peglib.h
View File

@ -1239,11 +1239,11 @@ class LiteralString : public Ope,
public std::enable_shared_from_this<LiteralString> { public std::enable_shared_from_this<LiteralString> {
public: public:
LiteralString(std::string &&s, bool ignore_case) LiteralString(std::string &&s, bool ignore_case)
: lit_(s), ignore_case_(ignore_case), init_is_word_(false), : lit_(s), ignore_case_(ignore_case),
is_word_(false) {} is_word_(false) {}
LiteralString(const std::string &s, bool ignore_case) LiteralString(const std::string &s, bool ignore_case)
: lit_(s), ignore_case_(ignore_case), init_is_word_(false), : lit_(s), ignore_case_(ignore_case),
is_word_(false) {} is_word_(false) {}
size_t parse_core(const char *s, size_t n, SemanticValues &sv, Context &c, size_t parse_core(const char *s, size_t n, SemanticValues &sv, Context &c,
@ -1253,7 +1253,7 @@ public:
std::string lit_; std::string lit_;
bool ignore_case_; bool ignore_case_;
mutable bool init_is_word_; mutable std::once_flag init_is_word_;
mutable bool is_word_; mutable bool is_word_;
}; };
@ -2342,7 +2342,7 @@ private:
inline size_t parse_literal(const char *s, size_t n, SemanticValues &sv, inline size_t parse_literal(const char *s, size_t n, SemanticValues &sv,
Context &c, any &dt, const std::string &lit, Context &c, any &dt, const std::string &lit,
bool &init_is_word, bool &is_word, std::once_flag &init_is_word, bool &is_word,
bool ignore_case) { bool ignore_case) {
size_t i = 0; size_t i = 0;
for (; i < lit.size(); i++) { for (; i < lit.size(); i++) {
@ -2359,14 +2359,13 @@ inline size_t parse_literal(const char *s, size_t n, SemanticValues &sv,
static SemanticValues dummy_sv; static SemanticValues dummy_sv;
static any dummy_dt; static any dummy_dt;
if (!init_is_word) { // TODO: Protect with mutex std::call_once(init_is_word, [&]() {
if (c.wordOpe) { if (c.wordOpe) {
auto len = auto len =
c.wordOpe->parse(lit.data(), lit.size(), dummy_sv, dummy_c, dummy_dt); c.wordOpe->parse(lit.data(), lit.size(), dummy_sv, dummy_c, dummy_dt);
is_word = success(len); is_word = success(len);
} }
init_is_word = true; });
}
if (is_word) { if (is_word) {
NotPredicate ope(c.wordOpe); NotPredicate ope(c.wordOpe);
@ -2463,7 +2462,6 @@ inline size_t Holder::parse_core(const char *s, size_t n, SemanticValues &sv,
} }
// Macro reference // Macro reference
// TODO: need packrat support
if (outer_->is_macro) { if (outer_->is_macro) {
c.rule_stack.push_back(outer_); c.rule_stack.push_back(outer_);
auto len = ope_->parse(s, n, sv, c, dt); auto len = ope_->parse(s, n, sv, c, dt);
@ -2592,7 +2590,7 @@ inline size_t BackReference::parse_core(const char *s, size_t n,
const auto &cs = c.capture_scope_stack[index]; const auto &cs = c.capture_scope_stack[index];
if (cs.find(name_) != cs.end()) { if (cs.find(name_) != cs.end()) {
const auto &lit = cs.at(name_); const auto &lit = cs.at(name_);
auto init_is_word = false; std::once_flag init_is_word;
auto is_word = false; auto is_word = false;
return parse_literal(s, n, sv, c, dt, lit, init_is_word, is_word, false); return parse_literal(s, n, sv, c, dt, lit, init_is_word, is_word, false);
} }