Don't include PEGTL from public headers

Author: wravery

include/GraphQLGrammar.h

@@ -8,10 +8,29 @@
 
 #include <graphqlservice/GraphQLTree.h>
 
+#define TAO_PEGTL_NAMESPACE tao::graphqlpeg
+
+#include <tao/pegtl.hpp>
+#include <tao/pegtl/contrib/parse_tree.hpp>
+
+#include <variant>
+#include <vector>
+#include <functional>
+
 namespace facebook::graphql::peg {
 
 using namespace tao::graphqlpeg;
 
+struct ast_node : parse_tree::basic_node<ast_node>
+{
+	std::string unescaped;
+};
+
+struct ast_input
+{
+	std::variant<std::vector<char>, std::unique_ptr<file_input<>>, std::string_view> data;
+};
+
 template <typename Rule>
 void for_each_child(const ast_node& n, std::function<void(const ast_node&)>&& func)
 {

include/SchemaGenerator.h

@@ -5,6 +5,8 @@
 
 #include <graphqlservice/GraphQLService.h>
 
+#include "GraphQLGrammar.h"
+
 #include <array>
 #include <cstdio>
 

include/graphqlservice/GraphQLService.h

@@ -630,7 +630,7 @@ using TypeMap = std::unordered_map<std::string, std::shared_ptr<Object>>;
 struct SubscriptionParams
 {
 	std::shared_ptr<RequestState> state;
-	peg::ast<std::vector<char>> query;
+	peg::ast query;
 	std::string operationName;
 	response::Value variables;
 };
@@ -666,12 +666,12 @@ using SubscriptionName = std::string;
 struct SubscriptionData : std::enable_shared_from_this<SubscriptionData>
 {
 	explicit SubscriptionData(std::shared_ptr<OperationData>&& data, std::unordered_map<SubscriptionName, std::vector<response::Value>>&& fieldNamesAndArgs,
-		peg::ast<std::vector<char>>&& query, std::string&& operationName, SubscriptionCallback&& callback,
+		peg::ast&& query, std::string&& operationName, SubscriptionCallback&& callback,
 		const peg::ast_node& selection);
 
 	std::shared_ptr<OperationData> data;
 	std::unordered_map<SubscriptionName, std::vector<response::Value>> fieldNamesAndArgs;
-	peg::ast<std::vector<char>> query;
+	peg::ast query;
 	std::string operationName;
 	SubscriptionCallback callback;
 	const peg::ast_node& selection;

include/graphqlservice/GraphQLTree.h

@@ -3,44 +3,26 @@
 
 #pragma once
 
-#define TAO_PEGTL_NAMESPACE tao::graphqlpeg
-
-#include <tao/pegtl.hpp>
-#include <tao/pegtl/contrib/parse_tree.hpp>
-
-#include <vector>
+#include <memory>
 #include <string_view>
-#include <functional>
 
 namespace facebook::graphql {
 namespace peg {
 
-using namespace tao::graphqlpeg;
+struct ast_node;
+struct ast_input;
 
-struct ast_node
-	: parse_tree::basic_node<ast_node>
-{
-	std::string unescaped;
-};
-
-template <typename Input>
 struct ast
 {
-	ast() = default;
-	ast(ast&& other) = default;
-	~ast();
-
-	ast& operator=(ast&& other) = default;
-
-	Input input;
-	std::unique_ptr<ast_node> root;
+	std::shared_ptr<ast_input> input;
+	std::shared_ptr<ast_node> root;
 };
 
-ast<std::vector<char>> parseString(std::string_view input);
-ast<std::unique_ptr<file_input<>>> parseFile(std::string_view filename);
+ast parseString(std::string_view input);
+ast parseFile(std::string_view filename);
 
 } /* namespace peg */
 
-peg::ast<const char*> operator "" _graphql(const char* text, size_t size);
+peg::ast operator "" _graphql(const char* text, size_t size);
 
 } /* namespace facebook::graphql */

samples/today/sample.cpp

@@ -58,14 +58,11 @@ int main(int argc, char** argv)
 
 	try
 	{
-		const peg::ast_node* ast = nullptr;
-		peg::ast<std::vector<char>> ast_input;
-		peg::ast<std::unique_ptr<peg::file_input<>>> ast_file;
+		peg::ast query;
 
 		if (argc > 1)
 		{
-			ast_file = peg::parseFile(argv[1]);
-			ast = ast_file.root.get();
+			query = peg::parseFile(argv[1]);
 		}
 		else
 		{
@@ -77,11 +74,10 @@ int main(int argc, char** argv)
 				input.append(line);
 			}
 
-			ast_input = peg::parseString(std::move(input));
-			ast = ast_input.root.get();
+			query = peg::parseString(std::move(input));
 		}
 
-		if (!ast)
+		if (!query.root)
 		{
 			std::cerr << "Unknown error!" << std::endl;
 			std::cerr << std::endl;
@@ -90,7 +86,7 @@ int main(int argc, char** argv)
 
 		std::cout << "Executing query..." << std::endl;
 
-		std::cout << response::toJSON(service->resolve(nullptr, *ast, ((argc > 2) ? argv[2] : ""), response::Value(response::Type::Map)).get()) << std::endl;
+		std::cout << response::toJSON(service->resolve(nullptr, *query.root, ((argc > 2) ? argv[2] : ""), response::Value(response::Type::Map)).get()) << std::endl;
 	}
 	catch (const std::runtime_error& ex)
 	{

src/GraphQLService.cpp

@@ -1275,7 +1275,7 @@ void OperationDefinitionVisitor::visit(std::launch launch, const std::string & o
 }
 
 SubscriptionData::SubscriptionData(std::shared_ptr<OperationData> && data, std::unordered_map<SubscriptionName, std::vector<response::Value>> && fieldNamesAndArgs,
-	peg::ast<std::vector<char>> && query, std::string && operationName, SubscriptionCallback && callback,
+	peg::ast && query, std::string && operationName, SubscriptionCallback && callback,
 	const peg::ast_node & selection)
 	: data(std::move(data))
 	, fieldNamesAndArgs(std::move(fieldNamesAndArgs))

src/GraphQLTree.cpp

@@ -637,57 +637,37 @@ template <> const std::string ast_control<enum_type_extension_content>::error_me
 template <> const std::string ast_control<input_object_type_extension_content>::error_message = "Expected https://facebook.github.io/graphql/June2018/#InputObjectTypeExtension";
 template <> const std::string ast_control<document_content>::error_message = "Expected https://facebook.github.io/graphql/June2018/#Document";
 
-template <>
-ast<std::vector<char>>::~ast()
+ast parseString(std::string_view input)
 {
-	// The default destructor gets inlined and may use a different allocator to free ast<>'s member
-	// variables than the graphqlservice module used to allocate them. So even though this could be
-	// omitted, declare it explicitly and define it in graphqlservice.
-}
-
-template <>
-ast<std::unique_ptr<file_input<>>>::~ast()
-{
-	// The default destructor gets inlined and may use a different allocator to free ast<>'s member
-	// variables than the graphqlservice module used to allocate them. So even though this could be
-	// omitted, declare it explicitly and define it in graphqlservice.
-}
-
-template <>
-ast<const char*>::~ast()
-{
-	// The default destructor gets inlined and may use a different allocator to free ast<>'s member
-	// variables than the graphqlservice module used to allocate them. So even though this could be
-	// omitted, declare it explicitly and define it in graphqlservice.
-}
-
-ast<std::vector<char>> parseString(std::string_view input)
-{
-	ast<std::vector<char>> result{ { input.cbegin(), input.cend() }, nullptr };
-	memory_input<> in(result.input.data(), result.input.size(), "GraphQL");
+	ast result{ std::make_shared<ast_input>(ast_input{ std::vector<char>{ input.cbegin(), input.cend() } }), {}};
+	const auto& data = std::get<std::vector<char>>(result.input->data);
+	memory_input<> in(data.data(), data.size(), "GraphQL");
 
 	result.root = parse_tree::parse<document, ast_node, ast_selector, nothing, ast_control>(std::move(in));
 
 	return result;
 }
 
-ast<std::unique_ptr<file_input<>>> parseFile(std::string_view filename)
+ast parseFile(std::string_view filename)
 {
-	auto in = std::make_unique<file_input<>>(std::string(filename));
-	ast<std::unique_ptr<file_input<>>> result { std::move(in), nullptr };
+	ast result{ std::make_shared<ast_input>(ast_input{ std::make_unique<file_input<>>(filename) }), {} };
+	auto& in = *std::get<std::unique_ptr<file_input<>>>(result.input->data);
 
-	result.root = parse_tree::parse<document, ast_node, ast_selector, nothing, ast_control>(std::move(*result.input));
+	result.root = parse_tree::parse<document, ast_node, ast_selector, nothing, ast_control>(std::move(in));
 
 	return result;
 }
 
 } /* namespace peg */
 
-peg::ast<const char*> operator "" _graphql(const char* text, size_t size)
+peg::ast operator "" _graphql(const char* text, size_t size)
 {
 	peg::memory_input<> in(text, size, "GraphQL");
 
-	return { text, peg::parse_tree::parse<peg::document, peg::ast_node, peg::ast_selector, peg::nothing, peg::ast_control>(std::move(in)) };
+	return {
+		std::make_shared<peg::ast_input>(peg::ast_input{ { std::string_view{ text, size } } }),
+		peg::parse_tree::parse<peg::document, peg::ast_node, peg::ast_selector, peg::nothing, peg::ast_control>(std::move(in))
+	};
 }
 
 } /* namespace facebook::graphql */