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

Code cleanup

Browse Source
This commit is contained in:
yhirose 2018-07-27 22:47:00 -04:00
parent bbd8e68b71
commit 6f9d19463d
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
peglib.h
View File

@ -1525,23 +1525,7 @@ struct LinkReferences : public Ope::Visitor {
void visit(Ignore& ope) override { ope.ope_->accept(*this); }
void visit(WeakHolder& ope) override { ope.weak_.lock()->accept(*this); }
void visit(Holder& ope) override { ope.ope_->accept(*this); }
void visit(Reference& ope) override {
if (grammar_.count(ope.name_)) {
auto& rule = grammar_.at(ope.name_);
ope.rule_ = &rule;
} else {
for (size_t i = 0; i < params_.size(); i++) {
const auto& param = params_[i];
if (param == ope.name_) {
ope.iarg_ = i;
break;
}
}
}
for (auto arg: ope.args_) {
arg->accept(*this);
}
}
void visit(Reference& ope) override;
void visit(Whitespace& ope) override { ope.ope_->accept(*this); }
private:
@ -1588,16 +1572,7 @@ struct FindReference : public Ope::Visitor {
void visit(Ignore& ope) override { ope.ope_->accept(*this); found_ope = ign(found_ope); }
void visit(WeakHolder& ope) override { ope.weak_.lock()->accept(*this); }
void visit(Holder& ope) override { ope.ope_->accept(*this); }
void visit(Reference& ope) override {
for (size_t i = 0; i < args_.size(); i++) {
const auto& name = params_[i];
if (name == ope.name_) {
found_ope = args_[i];
return;
}
}
found_ope = ope.shared_from_this();
}
void visit(Reference& ope) override;
void visit(Whitespace& ope) override { ope.ope_->accept(*this); found_ope = wsp(found_ope); }
std::shared_ptr<Ope> found_ope;
@ -2087,6 +2062,35 @@ inline void ReferenceChecker::visit(Reference& ope) {
}
}
inline void LinkReferences::visit(Reference& ope) {
if (grammar_.count(ope.name_)) {
auto& rule = grammar_.at(ope.name_);
ope.rule_ = &rule;
} else {
for (size_t i = 0; i < params_.size(); i++) {
const auto& param = params_[i];
if (param == ope.name_) {
ope.iarg_ = i;
break;
}
}
}
for (auto arg: ope.args_) {
arg->accept(*this);
}
}
inline void FindReference::visit(Reference& ope) {
for (size_t i = 0; i < args_.size(); i++) {
const auto& name = params_[i];
if (name == ope.name_) {
found_ope = args_[i];
return;
}
}
found_ope = ope.shared_from_this();
}
/*-----------------------------------------------------------------------------
* PEG parser generator
*---------------------------------------------------------------------------*/