Merge pull request #7 from Microsoft/preserveinput

wravery · web-flow · commit ed3f6530dd49 · 2018-12-01T14:08:56.000-08:00
Keep the parse_tree input alive so the string pointers remain valid
diff --git a/GraphQLService.cpp b/GraphQLService.cpp
@@ -381,10 +381,9 @@ Request::Request(TypeMap&& operationTypes)
 
 rapidjson::Document Request::resolve(const peg::ast_node& root, const std::string& operationName, const rapidjson::Document::ConstObject& variables) const
 {
-	const auto& document = *root.children.front();
 	FragmentDefinitionVisitor fragmentVisitor;
 
-	peg::for_each_child<peg::fragment_definition>(document,
+	peg::for_each_child<peg::fragment_definition>(root,
 		[&fragmentVisitor](const peg::ast_node& child)
 	{
 		fragmentVisitor.visit(child);
@@ -393,7 +392,7 @@ rapidjson::Document Request::resolve(const peg::ast_node& root, const std::strin
 	auto fragments = fragmentVisitor.getFragments();
 	OperationDefinitionVisitor operationVisitor(_operations, operationName, variables, fragments);
 
-	peg::for_each_child<peg::operation_definition>(document,
+	peg::for_each_child<peg::operation_definition>(root,
 		[&operationVisitor](const peg::ast_node& child)
 	{
 		operationVisitor.visit(child);
diff --git a/GraphQLTree.cpp b/GraphQLTree.cpp
@@ -552,27 +552,38 @@ struct ast_selector<input_object_type_extension>
 {
 };
 
-template <>
-struct ast_selector<document>
-	: std::true_type
+std::unique_ptr<ast<std::string>> parseString(std::string&& input)
 {
-};
+	std::unique_ptr<ast<std::string>> result(new ast<std::string> { std::move(input), nullptr });
+	memory_input<> in(result->input.c_str(), result->input.size(), "GraphQL");
 
-std::unique_ptr<ast_node> parseString(const char* text)
-{
-	return parse_tree::parse<document, ast_node, ast_selector>(memory_input<>(text, "GraphQL"));
+	result->root = parse_tree::parse<document, ast_node, ast_selector>(std::move(in));
+
+	return result;
 }
 
-std::unique_ptr<ast_node> parseFile(file_input<>&& in)
+std::unique_ptr<ast<std::unique_ptr<file_input<>>>> parseFile(const char* filename)
 {
-	return parse_tree::parse<document, ast_node, ast_selector>(std::move(in));
+	std::unique_ptr<ast<std::unique_ptr<file_input<>>>> result(new ast<std::unique_ptr<file_input<>>> {
+		std::unique_ptr<file_input<>>(new file_input<>(std::string(filename))),
+		nullptr
+		});
+
+	result->root = parse_tree::parse<document, ast_node, ast_selector>(std::move(*result->input));
+
+	return result;
 }
 
 } /* namespace peg */
 
-std::unique_ptr<peg::ast_node> operator "" _graphql(const char* text, size_t size)
+std::unique_ptr<peg::ast<const char*>> operator "" _graphql(const char* text, size_t size)
 {
-	return tao::graphqlpeg::parse_tree::parse<peg::document, peg::ast_node, peg::ast_selector>(tao::graphqlpeg::memory_input<>(text, size, "GraphQL"));
+	std::unique_ptr<peg::ast<const char*>> result(new peg::ast<const char*> { text, nullptr });
+	peg::memory_input<> in(text, size, "GraphQL");
+
+	result->root = peg::parse_tree::parse<peg::document, peg::ast_node, peg::ast_selector>(std::move(in));
+
+	return result;
 }
 
 } /* namespace graphql */
diff --git a/GraphQLTree.h b/GraphQLTree.h
@@ -23,12 +23,19 @@ struct ast_node
 	std::string unescaped;
 };
 
-std::unique_ptr<ast_node> parseString(const char* text);
-std::unique_ptr<ast_node> parseFile(file_input<>&& in);
+template <typename _Input>
+struct ast
+{
+	_Input input;
+	std::unique_ptr<ast_node> root;
+};
+
+std::unique_ptr<ast<std::string>> parseString(std::string&& input);
+std::unique_ptr<ast<std::unique_ptr<file_input<>>>> parseFile(const char* filename);
 
 } /* namespace peg */
 
-std::unique_ptr<peg::ast_node> operator "" _graphql(const char* text, size_t size);
+std::unique_ptr<peg::ast<const char*>> operator "" _graphql(const char* text, size_t size);
 
 } /* namespace graphql */
 } /* namespace facebook */
diff --git a/SchemaGenerator.cpp b/SchemaGenerator.cpp
@@ -144,7 +144,7 @@ Generator::Generator()
 		throw std::logic_error("Unable to parse the introspection schema, but there was no error message from the parser!");
 	}
 
-	for (const auto& child : ast->children.front()->children)
+	for (const auto& child : ast->root->children)
 	{
 		visitDefinition(*child);
 	}
@@ -160,15 +160,14 @@ Generator::Generator(std::string schemaFileName, std::string filenamePrefix, std
 	, _filenamePrefix(std::move(filenamePrefix))
 	, _schemaNamespace(std::move(schemaNamespace))
 {
-	tao::graphqlpeg::file_input<> in(schemaFileName.c_str());
-	auto ast = peg::parseFile(std::move(in));
+	auto ast = peg::parseFile(schemaFileName.c_str());
 
 	if (!ast)
 	{
 		throw std::logic_error("Unable to parse the service schema, but there was no error message from the parser!");
 	}
 
-	for (const auto& child : ast->children.front()->children)
+	for (const auto& child : ast->root->children)
 	{
 		visitDefinition(*child);
 	}
diff --git a/test_today.cpp b/test_today.cpp
@@ -60,25 +60,27 @@ int main(int argc, char** argv)
 
 	try
 	{
-		std::string input;
-		std::unique_ptr<tao::graphqlpeg::file_input<>> file;
-		std::unique_ptr<peg::ast_node> ast;
+		const peg::ast_node* ast = nullptr;
+		std::unique_ptr<peg::ast<std::string>> ast_input;
+		std::unique_ptr<peg::ast<std::unique_ptr<peg::file_input<>>>> ast_file;
 
 		if (argc > 1)
 		{
-			file.reset(new tao::graphqlpeg::file_input<>(argv[1]));
-			ast = peg::parseFile(std::move(*file));
+			ast_file = peg::parseFile(argv[1]);
+			ast = ast_file->root.get();
 		}
 		else
 		{
+			std::string input;
 			std::string line;
 
 			while (std::getline(std::cin, line))
 			{
 				input.append(line);
 			}
 
-			ast = peg::parseString(input.c_str());
+			ast_input = peg::parseString(std::move(input));
+			ast = ast_input->root.get();
 		}
 
 		if (!ast)
diff --git a/tests.cpp b/tests.cpp
@@ -123,7 +123,7 @@ TEST_F(TodayServiceCase, QueryEverything)
 			}
 		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
-	const auto result = _service->resolve(*ast, "Everything", variables.GetObject());
+	const auto result = _service->resolve(*ast->root, "Everything", variables.GetObject());
 	EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
 	EXPECT_EQ(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
 	EXPECT_EQ(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
@@ -197,7 +197,7 @@ TEST_F(TodayServiceCase, QueryAppointments)
 			}
 		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
-	const auto result = _service->resolve(*ast, "", variables.GetObject());
+	const auto result = _service->resolve(*ast->root, "", variables.GetObject());
 	EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
 	EXPECT_GE(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
 	EXPECT_GE(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
@@ -252,7 +252,7 @@ TEST_F(TodayServiceCase, QueryTasks)
 			}
 		})gql"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
-	const auto result = _service->resolve(*ast, "", variables.GetObject());
+	const auto result = _service->resolve(*ast->root, "", variables.GetObject());
 	EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
 	EXPECT_EQ(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
 	EXPECT_GE(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
@@ -306,7 +306,7 @@ TEST_F(TodayServiceCase, QueryUnreadCounts)
 			}
 		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
-	const auto result = _service->resolve(*ast, "", variables.GetObject());
+	const auto result = _service->resolve(*ast->root, "", variables.GetObject());
 	EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
 	EXPECT_GE(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
 	EXPECT_EQ(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
@@ -359,7 +359,7 @@ TEST_F(TodayServiceCase, MutateCompleteTask)
 			}
 		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
-	const auto result = _service->resolve(*ast, "", variables.GetObject());
+	const auto result = _service->resolve(*ast->root, "", variables.GetObject());
 
 	try
 	{
@@ -434,7 +434,7 @@ TEST_F(TodayServiceCase, Introspection)
 			}
 		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
-	const auto result = _service->resolve(*ast, "", variables.GetObject());
+	const auto result = _service->resolve(*ast->root, "", variables.GetObject());
 
 	try
 	{

Original file line number	Diff line number	Diff line change
`@@ -381,10 +381,9 @@ Request::Request(TypeMap&& operationTypes)`
`381`	`381`
`382`	`382`	`rapidjson::Document Request::resolve(const peg::ast_node& root, const std::string& operationName, const rapidjson::Document::ConstObject& variables) const`
`383`	`383`	`{`
`384`		`- const auto& document = *root.children.front();`
`385`	`384`	`FragmentDefinitionVisitor fragmentVisitor;`
`386`	`385`
`387`		`- peg::for_each_child<peg::fragment_definition>(document,`
	`386`	`+ peg::for_each_child<peg::fragment_definition>(root,`
`388`	`387`	`[&fragmentVisitor](const peg::ast_node& child)`
`389`	`388`	`{`
`390`	`389`	`fragmentVisitor.visit(child);`
`@@ -393,7 +392,7 @@ rapidjson::Document Request::resolve(const peg::ast_node& root, const std::strin`
`393`	`392`	`auto fragments = fragmentVisitor.getFragments();`
`394`	`393`	`OperationDefinitionVisitor operationVisitor(_operations, operationName, variables, fragments);`
`395`	`394`
`396`		`- peg::for_each_child<peg::operation_definition>(document,`
	`395`	`+ peg::for_each_child<peg::operation_definition>(root,`
`397`	`396`	`[&operationVisitor](const peg::ast_node& child)`
`398`	`397`	`{`
`399`	`398`	`operationVisitor.visit(child);`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ Generator::Generator()`
`144`	`144`	`throw std::logic_error("Unable to parse the introspection schema, but there was no error message from the parser!");`
`145`	`145`	`}`
`146`	`146`
`147`		`- for (const auto& child : ast->children.front()->children)`
	`147`	`+ for (const auto& child : ast->root->children)`
`148`	`148`	`{`
`149`	`149`	`visitDefinition(*child);`
`150`	`150`	`}`
`@@ -160,15 +160,14 @@ Generator::Generator(std::string schemaFileName, std::string filenamePrefix, std`
`160`	`160`	`, _filenamePrefix(std::move(filenamePrefix))`
`161`	`161`	`, _schemaNamespace(std::move(schemaNamespace))`
`162`	`162`	`{`
`163`		`- tao::graphqlpeg::file_input<> in(schemaFileName.c_str());`
`164`		`- auto ast = peg::parseFile(std::move(in));`
	`163`	`+ auto ast = peg::parseFile(schemaFileName.c_str());`
`165`	`164`
`166`	`165`	`if (!ast)`
`167`	`166`	`{`
`168`	`167`	`throw std::logic_error("Unable to parse the service schema, but there was no error message from the parser!");`
`169`	`168`	`}`
`170`	`169`
`171`		`- for (const auto& child : ast->children.front()->children)`
	`170`	`+ for (const auto& child : ast->root->children)`
`172`	`171`	`{`
`173`	`172`	`visitDefinition(*child);`
`174`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,25 +60,27 @@ int main(int argc, char** argv)`
`60`	`60`
`61`	`61`	`try`
`62`	`62`	`{`
`63`		`- std::string input;`
`64`		`- std::unique_ptr<tao::graphqlpeg::file_input<>> file;`
`65`		`- std::unique_ptr<peg::ast_node> ast;`
	`63`	`+ const peg::ast_node* ast = nullptr;`
	`64`	`+ std::unique_ptr<peg::ast<std::string>> ast_input;`
	`65`	`+ std::unique_ptr<peg::ast<std::unique_ptr<peg::file_input<>>>> ast_file;`
`66`	`66`
`67`	`67`	`if (argc > 1)`
`68`	`68`	`{`
`69`		`- file.reset(new tao::graphqlpeg::file_input<>(argv[1]));`
`70`		`- ast = peg::parseFile(std::move(*file));`
	`69`	`+ ast_file = peg::parseFile(argv[1]);`
	`70`	`+ ast = ast_file->root.get();`
`71`	`71`	`}`
`72`	`72`	`else`
`73`	`73`	`{`
	`74`	`+ std::string input;`
`74`	`75`	`std::string line;`
`75`	`76`
`76`	`77`	`while (std::getline(std::cin, line))`
`77`	`78`	`{`
`78`	`79`	`input.append(line);`
`79`	`80`	`}`
`80`	`81`
`81`		`- ast = peg::parseString(input.c_str());`
	`82`	`+ ast_input = peg::parseString(std::move(input));`
	`83`	`+ ast = ast_input->root.get();`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`if (!ast)`