pegtl::seq<> でパーサーをラップ

diff --git a/src/parser/action_state_phrase.hpp b/src/parser/action_state_phrase.hpp
index 7e81c82..4fc8b97 100644 (file)
--- a/src/parser/action_state_phrase.hpp
+++ b/src/parser/action_state_phrase.hpp
@@ -481,6 +481,10 @@ public:
 class NoteNameState
 {
 public:
+    NoteNameState() : ASTNode{}
+    {
+    }
+
     template<typename TParentState, typename... TCommonStates>
     void success(TParentState& st, TCommonStates&...)
     {

diff --git a/src/parser/parser_literal.hpp b/src/parser/parser_literal.hpp
index 4f423bb..1f11959 100644 (file)
--- a/src/parser/parser_literal.hpp
+++ b/src/parser/parser_literal.hpp
@@ -22,7 +22,7 @@ class UnsignedIntegerBase
 {
 };
 
-class UnsignedInteger : public UnsignedIntegerBase
+class UnsignedInteger : public pegtl::seq<UnsignedIntegerBase>
 {
 };
 

diff --git a/src/parser/parser_phrase.hpp b/src/parser/parser_phrase.hpp
index 202aa0f..3add525 100644 (file)
--- a/src/parser/parser_phrase.hpp
+++ b/src/parser/parser_phrase.hpp
@@ -33,7 +33,7 @@ class NoteName : public pegtl::seq<NoteNameBase, pegtl::opt<NoteNameKey>>
 {
 };
 
-class NoteOctave : public SignedInteger
+class NoteOctave : public pegtl::seq<SignedInteger>
 {
 };
 
@@ -45,11 +45,11 @@ class SimpleChord : public pegtl::list_must<NoteNumber, pegtl::one<'&'>, Separat
 {
 };
 
-class SimpleDuration : public UnsignedInteger
+class SimpleDuration : public pegtl::seq<UnsignedInteger>
 {
 };
 
-class SimpleDurationModifier : public UnsignedInteger
+class SimpleDurationModifier : public pegtl::seq<UnsignedInteger>
 {
 };