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

Performance improvement. Close #82

Browse Source
This commit is contained in:
yhirose 2020-05-18 01:24:53 -04:00
parent a37c609802
commit 10cc75d503
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
peglib.h
View File

@ -928,13 +928,13 @@ public:
auto &sv = *value_stack[value_stack_size]; auto &sv = *value_stack[value_stack_size];
if (!sv.empty()) { if (!sv.empty()) {
sv.clear(); sv.clear();
sv.tags.clear(); if (!sv.tags.empty()) { sv.tags.clear(); }
} }
sv.s_ = nullptr; sv.s_ = nullptr;
sv.n_ = 0; sv.n_ = 0;
sv.choice_count_ = 0; sv.choice_count_ = 0;
sv.choice_ = 0; sv.choice_ = 0;
sv.tokens.clear(); if (!sv.tokens.empty()) { sv.tokens.clear(); }
} }
auto &sv = *value_stack[value_stack_size++]; auto &sv = *value_stack[value_stack_size++];
@ -962,7 +962,7 @@ public:
capture_scope_stack.emplace_back(std::map<std::string, std::string>()); capture_scope_stack.emplace_back(std::map<std::string, std::string>());
} else { } else {
auto &cs = capture_scope_stack[capture_scope_stack_size]; auto &cs = capture_scope_stack[capture_scope_stack_size];
cs.clear(); if (!cs.empty()) { cs.clear(); }
} }
capture_scope_stack_size++; capture_scope_stack_size++;
} }
@ -1070,8 +1070,7 @@ public:
c.pop(); c.pop();
c.pop_capture_scope(); c.pop_capture_scope();
}); });
const auto &rule = *ope; auto len = ope->parse(s, n, chldsv, c, dt);
auto len = rule.parse(s, n, chldsv, c, dt);
if (success(len)) { if (success(len)) {
if (!chldsv.empty()) { if (!chldsv.empty()) {
for (size_t i = 0; i < chldsv.size(); i++) { for (size_t i = 0; i < chldsv.size(); i++) {
@ -1224,8 +1223,7 @@ public:
c.pop(); c.pop();
c.pop_capture_scope(); c.pop_capture_scope();
}); });
const auto &rule = *ope_; auto len = ope_->parse(s, n, chldsv, c, dt);
auto len = rule.parse(s, n, chldsv, c, dt);
if (success(len)) { if (success(len)) {
c.set_error_pos(s); c.set_error_pos(s);
return static_cast<size_t>(-1); return static_cast<size_t>(-1);
@ -1255,7 +1253,11 @@ public:
class LiteralString : public Ope, class LiteralString : public Ope,
public std::enable_shared_from_this<LiteralString> { public std::enable_shared_from_this<LiteralString> {
public: public:
LiteralString(const std::string &s, bool ignore_case) LiteralString(std::string &&s, bool ignore_case)
: lit_(s), ignore_case_(ignore_case), init_is_word_(false),
is_word_(false) {}
LiteralString(const std::string& s, bool ignore_case)
: lit_(s), ignore_case_(ignore_case), init_is_word_(false), : lit_(s), ignore_case_(ignore_case), init_is_word_(false),
is_word_(false) {} is_word_(false) {}
@ -1614,11 +1616,11 @@ inline std::shared_ptr<Ope> dic(const std::vector<std::string> &v) {
return std::make_shared<Dictionary>(v); return std::make_shared<Dictionary>(v);
} }
inline std::shared_ptr<Ope> lit(const std::string &s) { inline std::shared_ptr<Ope> lit(std::string &&s) {
return std::make_shared<LiteralString>(s, false); return std::make_shared<LiteralString>(s, false);
} }
inline std::shared_ptr<Ope> liti(const std::string &s) { inline std::shared_ptr<Ope> liti(std::string &&s) {
return std::make_shared<LiteralString>(s, true); return std::make_shared<LiteralString>(s, true);
} }
@ -2378,8 +2380,8 @@ inline size_t parse_literal(const char *s, size_t n, SemanticValues &sv,
} }
if (is_word) { if (is_word) {
auto ope = std::make_shared<NotPredicate>(c.wordOpe); NotPredicate ope(c.wordOpe);
auto len = ope->parse(s + i, n - i, dummy_sv, dummy_c, dummy_dt); auto len = ope.parse(s + i, n - i, dummy_sv, dummy_c, dummy_dt);
if (fail(len)) { return static_cast<size_t>(-1); } if (fail(len)) { return static_cast<size_t>(-1); }
i += len; i += len;
} }
@ -2452,10 +2454,9 @@ inline size_t TokenBoundary::parse_core(const char *s, size_t n,
any &dt) const { any &dt) const {
c.in_token = true; c.in_token = true;
auto se = make_scope_exit([&]() { c.in_token = false; }); auto se = make_scope_exit([&]() { c.in_token = false; });
const auto &rule = *ope_; auto len = ope_->parse(s, n, sv, c, dt);
auto len = rule.parse(s, n, sv, c, dt);
if (success(len)) { if (success(len)) {
sv.tokens.push_back(std::make_pair(s, len)); sv.tokens.emplace_back(std::make_pair(s, len));
if (c.whitespaceOpe) { if (c.whitespaceOpe) {
auto l = c.whitespaceOpe->parse(s + len, n - len, sv, c, dt); auto l = c.whitespaceOpe->parse(s + len, n - len, sv, c, dt);
@ -2519,7 +2520,7 @@ inline size_t Holder::parse_core(const char *s, size_t n, SemanticValues &sv,
if (success(len)) { if (success(len)) {
if (!outer_->ignoreSemanticValue) { if (!outer_->ignoreSemanticValue) {
sv.emplace_back(val); sv.emplace_back(std::move(val));
sv.tags.emplace_back(str2tag(outer_->name.c_str())); sv.tags.emplace_back(str2tag(outer_->name.c_str()));
} }
} else { } else {
@ -2561,7 +2562,7 @@ inline size_t Reference::parse_core(const char *s, size_t n, SemanticValues &sv,
std::vector<std::shared_ptr<Ope>> args; std::vector<std::shared_ptr<Ope>> args;
for (auto arg : args_) { for (auto arg : args_) {
arg->accept(vis); arg->accept(vis);
args.push_back(vis.found_ope); args.emplace_back(std::move(vis.found_ope));
} }
c.push_args(std::move(args)); c.push_args(std::move(args));