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

Fixed source_line_index problem with a null context object

Browse Source
This commit is contained in:
yhirose 2022-08-19 22:52:19 -04:00
parent 9c3497e350
commit eaef1725d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
peglib.h
View File

@ -496,6 +496,8 @@ struct SemanticValues : protected std::vector<std::any> {
// Line number and column at which the matched string is // Line number and column at which the matched string is
std::pair<size_t, size_t> line_info() const { std::pair<size_t, size_t> line_info() const {
if (!c_) { return std::pair(1, 1); }
auto &idx = source_line_index(); auto &idx = source_line_index();
auto cur = static_cast<size_t>(std::distance(ss, sv_.data())); auto cur = static_cast<size_t>(std::distance(ss, sv_.data()));
@ -2571,7 +2573,7 @@ inline size_t parse_literal(const char *s, size_t n, SemanticValues &vs,
} }
inline const std::vector<size_t> &SemanticValues::source_line_index() const { inline const std::vector<size_t> &SemanticValues::source_line_index() const {
if (!c_) { std::vector<size_t>(); } assert(c_);
if (c_->source_line_index.empty()) { if (c_->source_line_index.empty()) {
for (size_t pos = 0; pos < c_->l; pos++) { for (size_t pos = 0; pos < c_->l; pos++) {
if (c_->s[pos] == '\n') { c_->source_line_index.push_back(pos); } if (c_->s[pos] == '\n') { c_->source_line_index.push_back(pos); }