Merge pull request #117 from peoro/master

Fix support to custom AST node types
yhirose · Jun 18, 2020 · 8e890ce · 8e890ce
2 parents c49366a + ad1a6d2
commit 8e890ce
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/peglib.h b/peglib.h
@@ -3937,7 +3937,7 @@ class parser {
   template <typename T = Ast> parser &enable_ast() {
     for (auto &x : *grammar_) {
       auto &rule = x.second;
-      if (!rule.action) { add_ast_action(rule); }
+      if (!rule.action) { add_ast_action<T>(rule); }
     }
     return *this;
   }

diff --git a/test/test1.cc b/test/test1.cc
@@ -387,6 +387,24 @@ TEST_CASE("Skip token test2", "[general]")
     REQUIRE(ret == true);
 }
 
+TEST_CASE("Custom AST test", "[general]")
+{
+	struct CustomType {};
+	using CustomAst = AstBase<CustomType>;
+
+    parser parser(R"(
+        ROOT <- _ TEXT*
+        TEXT <- [a-zA-Z]+ _
+        _ <- [ \t\r\n]*
+    )");
+
+    parser.enable_ast<CustomAst>();
+    std::shared_ptr<CustomAst> ast;
+    bool ret = parser.parse("a b c", ast);
+    REQUIRE(ret == true);
+    REQUIRE(ast->nodes.size() == 4);
+}
+
 TEST_CASE("Backtracking test", "[general]")
 {
     parser parser(R"(