AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2025-04-03 01:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #270

Browse Source
This commit is contained in:
yhirose 2023-03-15 11:31:46 -04:00
parent d8ec5992f6
commit d9dfc5b4f5
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
peglib.h
View File

@ -2756,9 +2756,7 @@ inline size_t Holder::parse_core(const char *s, size_t n, SemanticValues &vs,
auto ope_ptr = ope_.get(); auto ope_ptr = ope_.get();
{ {
auto tok_ptr = dynamic_cast<const peg::TokenBoundary *>(ope_ptr); auto tok_ptr = dynamic_cast<const peg::TokenBoundary *>(ope_ptr);
if (tok_ptr) { if (tok_ptr) { ope_ptr = tok_ptr->ope_.get(); }
ope_ptr = tok_ptr->ope_.get();
}
} }
if (!dynamic_cast<const peg::PrioritizedChoice *>(ope_ptr)) { if (!dynamic_cast<const peg::PrioritizedChoice *>(ope_ptr)) {
chvs.choice_count_ = 0; chvs.choice_count_ = 0;
@ -4538,8 +4536,8 @@ public:
const char *path = nullptr) const { const char *path = nullptr) const {
if (grammar_ != nullptr) { if (grammar_ != nullptr) {
const auto &rule = (*grammar_)[start_]; const auto &rule = (*grammar_)[start_];
return post_process(s, n, auto result = rule.parse_and_get_value(s, n, dt, val, path, log_);
rule.parse_and_get_value(s, n, dt, val, path, log_)); return post_process(s, n, result);
} }
return false; return false;
} }
@ -4685,7 +4683,7 @@ private:
inline void enable_tracing(parser &parser, std::ostream &os) { inline void enable_tracing(parser &parser, std::ostream &os) {
parser.enable_trace( parser.enable_trace(
[&](auto &ope, auto s, auto, auto &, auto &c, auto &, auto &trace_data) { [&](auto &ope, auto s, auto, auto &, auto &c, auto &, auto &trace_data) {
auto prev_pos = std::any_cast<size_t>(trace_data); auto prev_pos = std::any_cast<size_t>(trace_data);
auto pos = static_cast<size_t>(s - c.s); auto pos = static_cast<size_t>(s - c.s);
auto backtrack = (pos < prev_pos ? "*" : ""); auto backtrack = (pos < prev_pos ? "*" : "");
std::string indent; std::string indent;
@ -4809,8 +4807,8 @@ inline void enable_profiling(parser &parser, std::ostream &os) {
"Total counters"); "Total counters");
os << buff << std::endl; os << buff << std::endl;
snprintf(buff, BUFSIZ, "%4s %10s %5s %10.2f %10.2f %s", "", snprintf(buff, BUFSIZ, "%4s %10s %5s %10.2f %10.2f %s", "", "",
"", "", total_success * 100.0 / grand_total, "", total_success * 100.0 / grand_total,
total_fail * 100.0 / grand_total, "% success/fail"); total_fail * 100.0 / grand_total, "% success/fail");
os << buff << std::endl << std::endl; os << buff << std::endl << std::endl;
; ;
@ -4819,8 +4817,8 @@ inline void enable_profiling(parser &parser, std::ostream &os) {
for (auto &[name, success, fail] : stats.items) { for (auto &[name, success, fail] : stats.items) {
auto total = success + fail; auto total = success + fail;
auto ratio = total * 100.0 / stats.total; auto ratio = total * 100.0 / stats.total;
snprintf(buff, BUFSIZ, "%4zu %10zu %5.2f %10zu %10zu %s", snprintf(buff, BUFSIZ, "%4zu %10zu %5.2f %10zu %10zu %s", id,
id, total, ratio, success, fail, name.c_str()); total, ratio, success, fail, name.c_str());
os << buff << std::endl; os << buff << std::endl;
id++; id++;
} }

17
test/test1.cc
View File

@ -1239,7 +1239,7 @@ TEST(GeneralTest, ChoiceWithWhitespace) {
%whitespace <- ' '* %whitespace <- ' '*
)"); )");
parser["type"] = [](const SemanticValues& vs) { parser["type"] = [](const SemanticValues &vs) {
auto n = vs.choice(); auto n = vs.choice();
EXPECT_EQ(1, n); EXPECT_EQ(1, n);
}; };
@ -1248,3 +1248,18 @@ TEST(GeneralTest, ChoiceWithWhitespace) {
EXPECT_TRUE(ret); EXPECT_TRUE(ret);
} }
TEST(GeneralTest, PassingContextAndOutputParameter) {
parser parser(R"(
START <- TOKEN
TOKEN <- [0-9]+
)");
parser["TOKEN"] = [&](const peg::SemanticValues &vs, std::any & /*dt*/) {
return vs.token_to_number<int>();
};
int output = 0;
std::any dt = std::string{"context"};
parser.parse<int>("42", dt, output);
EXPECT_EQ(42, output);
}