composition か phrase 以外のトークンがあるときのエラーメッセージを改善

diff --git a/include/message/id.hpp b/include/message/id.hpp
index 7c7749a..bc5b492 100644 (file)
--- a/include/message/id.hpp
+++ b/include/message/id.hpp
@@ -60,6 +60,7 @@ enum class MessageID : int
     GrammarUntilSingleQuote,
 
     // error_module.hpp
+    GrammarTrapNeitherCompositionNorPhrase,
     GrammarPhrasesAndCompositions,
 
     // grammar_phrase.hpp

diff --git a/src/driver/msgcallback.cpp b/src/driver/msgcallback.cpp
index 59a5071..9050d3d 100644 (file)
--- a/src/driver/msgcallback.cpp
+++ b/src/driver/msgcallback.cpp
@@ -81,7 +81,8 @@ MessagePrinter::MessagePrinter(IStdErrWriter* pStdErrWriter)
         {Message::MessageID::GrammarUntilSingleQuote, "unterminated string literal (missing single quote)"},
 
         // error_module.hpp
-        {Message::MessageID::GrammarPhrasesAndCompositions, "parse error: GrammarPhrasesAndCompositions"},
+        {Message::MessageID::GrammarTrapNeitherCompositionNorPhrase, "unexpected token '{0}', expecting 'phrase' or 'composition'"},
+        {Message::MessageID::GrammarPhrasesAndCompositions, "expecting 'phrase' or 'composition'"},
 
         // grammar_phrase.hpp
         {Message::MessageID::GrammarNoteSequenceBlockWithoutAttributes, "expecting '{' here"},

diff --git a/src/parser/error_module.hpp b/src/parser/error_module.hpp
index 50e8faf..4c266df 100644 (file)
--- a/src/parser/error_module.hpp
+++ b/src/parser/error_module.hpp
@@ -13,6 +13,9 @@ namespace Parser
 {
 
 template<>
+const Message::MessageID ErrorControl<Grammar::TrapNeitherCompositionNorPhrase>::ID = Message::MessageID::GrammarTrapNeitherCompositionNorPhrase;
+
+template<>
 const Message::MessageID ErrorControl<Grammar::PhrasesAndCompositions>::ID = Message::MessageID::GrammarPhrasesAndCompositions;
 
 template<>

diff --git a/src/parser/parser_module.hpp b/src/parser/parser_module.hpp
index b1ef2df..d809a14 100644 (file)
--- a/src/parser/parser_module.hpp
+++ b/src/parser/parser_module.hpp
@@ -3,6 +3,7 @@
 
 #include <pegtl.hh>
 
+#include "parser_attribute.hpp"
 #include "parser_composition.hpp"
 #include "parser_phrase.hpp"
 #include "parser_skips.hpp"
@@ -16,7 +17,16 @@ namespace Parser
 namespace Grammar
 {
 
-class PhrasesAndCompositions : public pegtl::star<pegtl::pad<pegtl::sor<Composition, Phrase>, Separator>>
+class TrapNeitherCompositionNorPhrase
+    : public pegtl::seq<
+        pegtl::disable<AttributeOptionalSequence>,
+        pegtl::not_at<pegtl::eof>,
+        pegtl::raise<TrapNeitherCompositionNorPhrase>
+    >
+{
+};
+
+class PhrasesAndCompositions : public pegtl::star<pegtl::pad<pegtl::sor<Composition, Phrase, TrapNeitherCompositionNorPhrase>, Separator>>
 {
 };