diff --git a/example/calc2.cc b/example/calc2.cc index 058057e..8f288a2 100644 --- a/example/calc2.cc +++ b/example/calc2.cc @@ -44,7 +44,7 @@ int main(int argc, const char** argv) return result; }; - rule EXPRESSION, TERM, FACTOR, TERM_OPERATOR, FACTOR_OPERATOR, NUMBER; + Definition EXPRESSION, TERM, FACTOR, TERM_OPERATOR, FACTOR_OPERATOR, NUMBER; EXPRESSION <= seq(TERM, zom(seq(TERM_OPERATOR, TERM))), reduce; TERM <= seq(FACTOR, zom(seq(FACTOR_OPERATOR, FACTOR))), reduce; diff --git a/peglib.h b/peglib.h index e088647..7c5a0ea 100644 --- a/peglib.h +++ b/peglib.h @@ -1221,8 +1221,6 @@ private: std::shared_ptr holder_; }; -typedef Definition rule; - /* * Implementations */ diff --git a/test/test.cc b/test/test.cc index dcd2cd4..a5adc5c 100644 --- a/test/test.cc +++ b/test/test.cc @@ -70,7 +70,7 @@ TEST_CASE("String capture test2", "[general]") { vector tags; - rule ROOT, TAG, TAG_NAME, WS; + Definition ROOT, TAG, TAG_NAME, WS; ROOT <= seq(WS, zom(TAG)); TAG <= seq(chr('['), TAG_NAME, chr(']'), WS); TAG_NAME <= oom(seq(npd(chr(']')), dot())), [&](const char* s, size_t n) { tags.push_back(string(s, n)); }; @@ -131,7 +131,7 @@ TEST_CASE("Named capture test", "[general]") TEST_CASE("String capture test with embedded match action", "[general]") { - rule ROOT, TAG, TAG_NAME, WS; + Definition ROOT, TAG, TAG_NAME, WS; vector tags; @@ -156,8 +156,8 @@ TEST_CASE("String capture test with embedded match action", "[general]") TEST_CASE("Cyclic grammer test", "[general]") { - rule PARENT; - rule CHILD; + Definition PARENT; + Definition CHILD; PARENT <= seq(CHILD); CHILD <= seq(PARENT); @@ -165,7 +165,7 @@ TEST_CASE("Cyclic grammer test", "[general]") TEST_CASE("Visit test", "[general]") { - rule ROOT, TAG, TAG_NAME, WS; + Definition ROOT, TAG, TAG_NAME, WS; ROOT <= seq(WS, zom(TAG)); TAG <= seq(chr('['), TAG_NAME, chr(']'), WS); @@ -296,7 +296,7 @@ TEST_CASE("Simple calculator test", "[general]") TEST_CASE("Calculator test", "[general]") { // Construct grammer - rule EXPRESSION, TERM, FACTOR, TERM_OPERATOR, FACTOR_OPERATOR, NUMBER; + Definition EXPRESSION, TERM, FACTOR, TERM_OPERATOR, FACTOR_OPERATOR, NUMBER; EXPRESSION <= seq(TERM, zom(seq(TERM_OPERATOR, TERM))); TERM <= seq(FACTOR, zom(seq(FACTOR_OPERATOR, FACTOR)));