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

Performance improvement

Browse Source
This commit is contained in:
yhirose 2022-01-06 22:59:01 -05:00
parent 578eec705c
commit b85606ce2e
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
peglib.h
View File

@ -459,11 +459,15 @@ inline constexpr unsigned int operator"" _(const char *s, size_t l) {
/* /*
* Semantic values * Semantic values
*/ */
class Context;
struct SemanticValues : protected std::vector<std::any> { struct SemanticValues : protected std::vector<std::any> {
SemanticValues() = default;
SemanticValues(Context *c): c_(c) {}
// Input text // Input text
const char *path = nullptr; const char *path = nullptr;
const char *ss = nullptr; const char *ss = nullptr;
std::function<const std::vector<size_t> &()> source_line_index;
// Matched string // Matched string
std::string_view sv() const { return sv_; } std::string_view sv() const { return sv_; }
@ -553,6 +557,9 @@ private:
friend class Holder; friend class Holder;
friend class PrecedenceClimbing; friend class PrecedenceClimbing;
const std::vector<size_t> &source_line_index() const;
Context *c_ = nullptr;
std::string_view sv_; std::string_view sv_;
size_t choice_count_ = 0; size_t choice_count_ = 0;
size_t choice_ = 0; size_t choice_ = 0;
@ -773,7 +780,6 @@ private:
/* /*
* Context * Context
*/ */
class Context;
class Ope; class Ope;
class Definition; class Definition;
@ -882,7 +888,7 @@ public:
SemanticValues &push() { SemanticValues &push() {
assert(value_stack_size <= value_stack.size()); assert(value_stack_size <= value_stack.size());
if (value_stack_size == value_stack.size()) { if (value_stack_size == value_stack.size()) {
value_stack.emplace_back(std::make_shared<SemanticValues>()); value_stack.emplace_back(std::make_shared<SemanticValues>(this));
} else { } else {
auto &vs = *value_stack[value_stack_size]; auto &vs = *value_stack[value_stack_size];
if (!vs.empty()) { if (!vs.empty()) {
@ -898,15 +904,6 @@ public:
auto &vs = *value_stack[value_stack_size++]; auto &vs = *value_stack[value_stack_size++];
vs.path = path; vs.path = path;
vs.ss = s; vs.ss = s;
vs.source_line_index = [&]() -> const std::vector<size_t> & {
if (source_line_index.empty()) {
for (size_t pos = 0; pos < l; pos++) {
if (s[pos] == '\n') { source_line_index.push_back(pos); }
}
source_line_index.push_back(l);
}
return source_line_index;
};
return vs; return vs;
} }
@ -2469,6 +2466,19 @@ inline size_t parse_literal(const char *s, size_t n, SemanticValues &vs,
return i; return i;
} }
inline const std::vector<size_t> &SemanticValues::source_line_index() const {
if (!c_) {
std::vector<size_t>();
}
if (c_->source_line_index.empty()) {
for (size_t pos = 0; pos < c_->l; pos++) {
if (c_->s[pos] == '\n') { c_->source_line_index.push_back(pos); }
}
c_->source_line_index.push_back(c_->l);
}
return c_->source_line_index;
}
inline void Context::set_error_pos(const char *a_s, const char *literal) { inline void Context::set_error_pos(const char *a_s, const char *literal) {
if (log) { if (log) {
if (error_info.error_pos <= a_s) { if (error_info.error_pos <= a_s) {