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

Fixed Infinite loop 9 problem

Browse Source
This commit is contained in:
yhirose 2021-03-30 20:59:17 -04:00
parent 3d68799d9c
commit a9f7572a6c
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
peglib.h
View File

@ -2945,6 +2945,12 @@ inline void DetectInfiniteLoop::visit(Reference &ope) {
ope.rule_->accept(*this); ope.rule_->accept(*this);
refs_.pop_back(); refs_.pop_back();
} }
if (ope.is_macro_) {
for (auto arg : ope.args_) {
arg->accept(*this);
}
}
} }
inline void ReferenceChecker::visit(Reference &ope) { inline void ReferenceChecker::visit(Reference &ope) {

37
test/test2.cc
View File

@ -168,39 +168,10 @@ TEST_CASE("Infinite loop 8", "[infinite loop]") {
REQUIRE(!pg); REQUIRE(!pg);
} }
TEST_CASE("Infinite 9", "[infinite loop]") { TEST_CASE("Infinite loop 9", "[infinite loop]") {
parser pg(R"( parser pg(R"(
START <- __? SECTION* ROOT <- %recover(('A' /)*)
)");
SECTION <- HEADER __ ENTRIES __?
HEADER <- '[' _ CATEGORY (':' _ ATTRIBUTES)? ']'^header
CATEGORY <- < [-_a-zA-Z0-9\u0080-\uFFFF ]+ > _
ATTRIBUTES <- ATTRIBUTE (',' _ ATTRIBUTE)*
ATTRIBUTE <- < [-_a-zA-Z0-9\u0080-\uFFFF]+ > _
ENTRIES <- (ENTRY (__ ENTRY)*)?
ENTRY <- ONE_WAY PHRASE ('|' _ PHRASE)* !'='
/ PHRASE ('|' _ PHRASE)+ !'='
/ %recover(entry)
ONE_WAY <- PHRASE '=' _
PHRASE <- WORD (' ' WORD)* _
WORD <- < (![ \t\r\n=|[\]#] .)+ >
~__ <- _ (comment? nl _)+
~_ <- [ \t]*
comment <- ('#' (!nl .)*)
nl <- '\r'? '\n'
header <- (!__ .)* { message "invalid section header, missing ']'." }
# The `(!(__ / HEADER) )+` should be `(!(__ / HEADER) .)+`
entry <- (!(__ / HEADER) )+ { message "invalid token '%t', expecting another phrase." }
)");
REQUIRE(!pg); REQUIRE(!pg);
} }