Fix #205

Author: yhirose

docs/native.wasm

@@ -3810,17 +3810,8 @@ class ParserGenerator {
     if (!ret) { return nullptr; }
 
     // Check infinite loop
-    {
-      DetectInfiniteLoop vis(data.start_pos, data.start);
-      start_rule.accept(vis);
-      if (vis.has_error) {
-        if (log) {
-          auto line = line_info(s, vis.error_s);
-          log(line.first, line.second,
-              "infinite loop is detected in '" + vis.error_name + "'.");
-        }
-        return nullptr;
-      }
+    if (detect_infiniteLoop(data, start_rule, log, s)) {
+      return nullptr;
     }
 
     // Automatic whitespace skipping
@@ -3831,13 +3822,22 @@ class ParserGenerator {
         if (IsLiteralToken::check(*ope)) { rule <= tok(ope); }
       }
 
-      start_rule.whitespaceOpe =
-          wsp(grammar[WHITESPACE_DEFINITION_NAME].get_core_operator());
+      auto &rule = grammar[WHITESPACE_DEFINITION_NAME];
+      start_rule.whitespaceOpe = wsp(rule.get_core_operator());
+
+      if (detect_infiniteLoop(data, rule, log, s)) {
+        return nullptr;
+      }
     }
 
     // Word expression
     if (grammar.count(WORD_DEFINITION_NAME)) {
-      start_rule.wordOpe = grammar[WORD_DEFINITION_NAME].get_core_operator();
+      auto &rule = grammar[WORD_DEFINITION_NAME];
+      start_rule.wordOpe = rule.get_core_operator();
+
+      if (detect_infiniteLoop(data, rule, log, s)) {
+        return nullptr;
+      }
     }
 
     // Apply instructions
@@ -3867,6 +3867,20 @@ class ParserGenerator {
     return data.grammar;
   }
 
+  bool detect_infiniteLoop(const Data &data, Definition &rule, const Log &log, const char *s) const {
+    DetectInfiniteLoop vis(data.start_pos, rule.name);
+    rule.accept(vis);
+    if (vis.has_error) {
+      if (log) {
+        auto line = line_info(s, vis.error_s);
+        log(line.first, line.second,
+            "infinite loop is detected in '" + vis.error_name + "'.");
+      }
+      return true;
+    }
+    return false;
+  }
+
   Grammar g;
 };
 

peglib.h

@@ -204,6 +204,25 @@ TEST(InfiniteLoopTest, Not_infinite_3) {
   EXPECT_TRUE(!!pg);
 }
 
+TEST(InfiniteLoopTest, whitespace) {
+  parser pg(R"(
+    S <- 'hello'
+    %whitespace <- ('')*
+  )");
+
+  EXPECT_FALSE(pg);
+}
+
+TEST(InfiniteLoopTest, word) {
+  parser pg(R"(
+    S <- 'hello'
+    %whitespace <- ' '*
+    %word <- ('')*
+  )");
+
+  EXPECT_FALSE(pg);
+}
+
 TEST(PrecedenceTest, Precedence_climbing) {
   parser parser(R"(
         START            <-  _ EXPRESSION