Demote proto3 grammar.

taocpp · Sep 21, 2023 · bd7a1ca · bd7a1ca
1 parent 5773ab3
commit bd7a1ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/example/pegtl/proto3.cpp b/src/example/pegtl/proto3.cpp
@@ -15,7 +15,8 @@ int main()
 
 #include <tao/pegtl.hpp>
 #include <tao/pegtl/contrib/analyze.hpp>
-#include <tao/pegtl/contrib/proto3.hpp>
+
+#include "proto3.hpp"
 
 int main( int argc, char** argv )  // NOLINT(bugprone-exception-escape)
 {

diff --git a/include/tao/pegtl/contrib/proto3.hpp → src/example/pegtl/proto3.hpp b/include/tao/pegtl/contrib/proto3.hpp → src/example/pegtl/proto3.hpp
@@ -2,15 +2,15 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef TAO_PEGTL_CONTRIB_PROTO3_HPP
-#define TAO_PEGTL_CONTRIB_PROTO3_HPP
+#ifndef TAO_PEGTL_SRC_EXAMPLES_PEGTL_PROTO3_HPP
+#define TAO_PEGTL_SRC_EXAMPLES_PEGTL_PROTO3_HPP
 
-#include "../ascii.hpp"
-#include "../config.hpp"
-#include "../rules.hpp"
+#include <tao/pegtl.hpp>
 
-namespace TAO_PEGTL_NAMESPACE::proto3
+namespace proto3
 {
+   using namespace TAO_PEGTL_NAMESPACE;
+
    // protocol buffer v3
    // https://developers.google.com/protocol-buffers/docs/reference/proto3-spec
 
@@ -141,6 +141,6 @@ namespace TAO_PEGTL_NAMESPACE::proto3
    struct proto : must< sps, head, sps, star< body, sps >, eof > {};
    // clang-format on
 
-}  // namespace TAO_PEGTL_NAMESPACE::proto3
+}  // namespace proto3
 
 #endif