Skip to content

Update PEGTL dependency to 3.2.0 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wravery merged 1 commit into from
Jan 16, 2021
Merged

Update PEGTL dependency to 3.2.0 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ endfunction()

find_package(Threads MODULE REQUIRED)

find_package(pegtl 3.1.0 QUIET CONFIG)
find_package(pegtl 3.2.0 QUIET CONFIG)
if(NOT pegtl_FOUND)
# If a compatible version of PEGTL is not already installed, build and install it from the submodule directory.
set(PEGTL_BUILD_TESTS OFF CACHE BOOL "Disable PEGTL tests")
Expand Down
2 changes: 1 addition & 1 deletion PEGTL
Open in desktop
Submodule PEGTL updated 378 files
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ means you need to include an acknowledgement along with the license text.

### graphqlpeg

- GraphQL parsing: [Parsing Expression Grammar Template Library (PEGTL)](https://github.com/taocpp/PEGTL) release 3.1.1,
- GraphQL parsing: [Parsing Expression Grammar Template Library (PEGTL)](https://github.com/taocpp/PEGTL) release 3.2.0,
which is part of [The Art of C++](https://taocpp.github.io/) library collection. I've added this as a sub-module, so you
do not need to install this separately. If you already have 3.1.1 installed where CMake can find it, it will use that
do not need to install this separately. If you already have 3.2.0 installed where CMake can find it, it will use that
instead of the sub-module and avoid installing another copy of PEGTL.

### graphqlservice
Expand Down
13 changes: 0 additions & 13 deletions include/graphqlservice/GraphQLTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,6 @@
#include <tao/pegtl.hpp>
#include <tao/pegtl/contrib/parse_tree.hpp>

// Temporarily workaround the tao::demangle namespace in 3.1.0. This was fixed in PEGTL commit
// https://github.com/taocpp/PEGTL/commit/0cc3128e07734fb72e23e2eeee70b9f1fc13ca5f, which put this
// in the correct namespace defined by TAO_PEGTL_NAMESPACE (tao::graphqlpeg) and should be included
// in 3.1.1 or later. Once that version of PEGTL is released, this can be removed.
#include <tao/pegtl/version.hpp>

#if (TAO_PEGTL_VERSION_MAJOR == 3) && (TAO_PEGTL_VERSION_MINOR == 1) \
&& (TAO_PEGTL_VERSION_PATCH < 1)
namespace tao::graphqlpeg {
using ::tao::demangle;
}
#endif

#include <string>
#include <string_view>
#include <variant>
Expand Down