Add a ""_graphql string literal UDL

wravery · wravery · commit c7dbfc6220f9 · 2018-11-26T21:10:26.000-08:00
diff --git a/GraphQLTree.cpp b/GraphQLTree.cpp
@@ -569,5 +569,11 @@ std::unique_ptr<ast_node> parseFile(file_input<>&& in)
 }
 
 } /* namespace peg */
+
+std::unique_ptr<peg::ast_node> 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"));
+}
+
 } /* namespace graphql */
 } /* namespace facebook */
diff --git a/GraphQLTree.h b/GraphQLTree.h
@@ -27,5 +27,8 @@ std::unique_ptr<ast_node> parseString(const char* text);
 std::unique_ptr<ast_node> parseFile(file_input<>&& in);
 
 } /* namespace peg */
+
+std::unique_ptr<peg::ast_node> operator "" _graphql(const char* text, size_t size);
+
 } /* namespace graphql */
 } /* namespace facebook */
diff --git a/SchemaGenerator.cpp b/SchemaGenerator.cpp
@@ -44,7 +44,7 @@ Generator::Generator()
 	, _schemaNamespace(s_introspectionNamespace)
 {
 	// Introspection Schema: https://facebook.github.io/graphql/June2018/#sec-Schema-Introspection
-	auto ast = peg::parseString(R"gql(
+	auto ast = R"(
 		type __Schema {
 		  types: [__Type!]!
 		  queryType: __Type!
@@ -137,7 +137,7 @@ Generator::Generator()
 		  ENUM_VALUE
 		  INPUT_OBJECT
 		  INPUT_FIELD_DEFINITION
-		})gql");
+		})"_graphql;
 
 	if (!ast)
 	{
@@ -1627,7 +1627,7 @@ template <>
 					if (firstField)
 					{
 						firstField = false;
-						sourceFile << R"cpp(	static const auto defaultValue = []() -> rapidjson::Document
+						sourceFile << R"cpp(	const auto defaultValue = []()
 	{
 		rapidjson::Document values(rapidjson::Type::kObjectType);
 		auto& allocator = values.GetAllocator();
@@ -1858,7 +1858,7 @@ rapidjson::Document )cpp" << objectType.type
 							if (firstArgument)
 							{
 								firstArgument = false;
-								sourceFile << R"cpp(	static const auto defaultArguments = []() -> rapidjson::Document
+								sourceFile << R"cpp(	const auto defaultArguments = []()
 	{
 		rapidjson::Document values(rapidjson::Type::kObjectType);
 		auto& allocator = values.GetAllocator();
diff --git a/samples/IntrospectionSchema.cpp b/samples/IntrospectionSchema.cpp
@@ -228,7 +228,7 @@ rapidjson::Document __Type::resolveDescription(service::ResolverParams&& params)
 
 rapidjson::Document __Type::resolveFields(service::ResolverParams&& params)
 {
-	static const auto defaultArguments = []() -> rapidjson::Document
+	const auto defaultArguments = []()
 	{
 		rapidjson::Document values(rapidjson::Type::kObjectType);
 		auto& allocator = values.GetAllocator();
@@ -267,7 +267,7 @@ rapidjson::Document __Type::resolvePossibleTypes(service::ResolverParams&& param
 
 rapidjson::Document __Type::resolveEnumValues(service::ResolverParams&& params)
 {
-	static const auto defaultArguments = []() -> rapidjson::Document
+	const auto defaultArguments = []()
 	{
 		rapidjson::Document values(rapidjson::Type::kObjectType);
 		auto& allocator = values.GetAllocator();
diff --git a/samples/TodaySchema.cpp b/samples/TodaySchema.cpp
@@ -54,7 +54,7 @@ rapidjson::Document service::ModifiedResult<today::TaskState>::convert(today::Ta
 template <>
 today::CompleteTaskInput ModifiedArgument<today::CompleteTaskInput>::convert(const rapidjson::Value& value)
 {
-	static const auto defaultValue = []() -> rapidjson::Document
+	const auto defaultValue = []()
 	{
 		rapidjson::Document values(rapidjson::Type::kObjectType);
 		auto& allocator = values.GetAllocator();
diff --git a/tests.cpp b/tests.cpp
@@ -91,7 +91,7 @@ size_t TodayServiceCase::_getUnreadCountsCount = 0;
 
 TEST_F(TodayServiceCase, QueryEverything)
 {
-	auto ast = peg::parseString(R"gql(
+	auto ast = R"(
 		query Everything {
 			appointments {
 				edges {
@@ -121,7 +121,7 @@ TEST_F(TodayServiceCase, QueryEverything)
 					}
 				}
 			}
-		})gql");
+		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
 	const auto result = _service->resolve(*ast, "Everything", variables.GetObject());
 	EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
@@ -184,7 +184,7 @@ TEST_F(TodayServiceCase, QueryEverything)
 
 TEST_F(TodayServiceCase, QueryAppointments)
 {
-	auto ast = peg::parseString(R"gql({
+	auto ast = R"({
 			appointments {
 				edges {
 					node {
@@ -195,7 +195,7 @@ TEST_F(TodayServiceCase, QueryAppointments)
 					}
 				}
 			}
-		})gql");
+		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
 	const auto result = _service->resolve(*ast, "", variables.GetObject());
 	EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
@@ -240,7 +240,7 @@ TEST_F(TodayServiceCase, QueryAppointments)
 
 TEST_F(TodayServiceCase, QueryTasks)
 {
-	auto ast = peg::parseString(R"gql({
+	auto ast = R"gql({
 			tasks {
 				edges {
 					node {
@@ -250,7 +250,7 @@ TEST_F(TodayServiceCase, QueryTasks)
 					}
 				}
 			}
-		})gql");
+		})gql"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
 	const auto result = _service->resolve(*ast, "", variables.GetObject());
 	EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
@@ -294,7 +294,7 @@ TEST_F(TodayServiceCase, QueryTasks)
 
 TEST_F(TodayServiceCase, QueryUnreadCounts)
 {
-	auto ast = peg::parseString(R"gql({
+	auto ast = R"({
 			unreadCounts {
 				edges {
 					node {
@@ -304,7 +304,7 @@ TEST_F(TodayServiceCase, QueryUnreadCounts)
 					}
 				}
 			}
-		})gql");
+		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
 	const auto result = _service->resolve(*ast, "", variables.GetObject());
 	EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
@@ -348,7 +348,7 @@ TEST_F(TodayServiceCase, QueryUnreadCounts)
 
 TEST_F(TodayServiceCase, MutateCompleteTask)
 {
-	auto ast = peg::parseString(R"gql(mutation {
+	auto ast = R"(mutation {
 			completedTask: completeTask(input: {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!"}) {
 				completedTask: task {
 					completedTaskId: id
@@ -357,7 +357,7 @@ TEST_F(TodayServiceCase, MutateCompleteTask)
 				}
 				clientMutationId
 			}
-		})gql");
+		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
 	const auto result = _service->resolve(*ast, "", variables.GetObject());
 
@@ -401,7 +401,7 @@ TEST_F(TodayServiceCase, MutateCompleteTask)
 
 TEST_F(TodayServiceCase, Introspection)
 {
-	auto ast = peg::parseString(R"gql({
+	auto ast = R"({
 			__schema {
 				types {
 					kind
@@ -432,7 +432,7 @@ TEST_F(TodayServiceCase, Introspection)
 					name
 				}
 			}
-		})gql");
+		})"_graphql;
 	const rapidjson::Document variables(rapidjson::Type::kObjectType);
 	const auto result = _service->resolve(*ast, "", variables.GetObject());
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ Generator::Generator()`
`44`	`44`	`, _schemaNamespace(s_introspectionNamespace)`
`45`	`45`	`{`
`46`	`46`	`// Introspection Schema: https://facebook.github.io/graphql/June2018/#sec-Schema-Introspection`
`47`		`- auto ast = peg::parseString(R"gql(`
	`47`	`+ auto ast = R"(`
`48`	`48`	`type __Schema {`
`49`	`49`	`types: [__Type!]!`
`50`	`50`	`queryType: __Type!`
`@@ -137,7 +137,7 @@ Generator::Generator()`
`137`	`137`	`ENUM_VALUE`
`138`	`138`	`INPUT_OBJECT`
`139`	`139`	`INPUT_FIELD_DEFINITION`
`140`		`- })gql");`
	`140`	`+ })"_graphql;`
`141`	`141`
`142`	`142`	`if (!ast)`
`143`	`143`	`{`
`@@ -1627,7 +1627,7 @@ template <>`
`1627`	`1627`	`if (firstField)`
`1628`	`1628`	`{`
`1629`	`1629`	`firstField = false;`
`1630`		`- sourceFile << R"cpp( static const auto defaultValue = []() -> rapidjson::Document`
	`1630`	`+ sourceFile << R"cpp( const auto defaultValue = []()`
`1631`	`1631`	`{`
`1632`	`1632`	`rapidjson::Document values(rapidjson::Type::kObjectType);`
`1633`	`1633`	`auto& allocator = values.GetAllocator();`
`@@ -1858,7 +1858,7 @@ rapidjson::Document )cpp" << objectType.type`
`1858`	`1858`	`if (firstArgument)`
`1859`	`1859`	`{`
`1860`	`1860`	`firstArgument = false;`
`1861`		`- sourceFile << R"cpp( static const auto defaultArguments = []() -> rapidjson::Document`
	`1861`	`+ sourceFile << R"cpp( const auto defaultArguments = []()`
`1862`	`1862`	`{`
`1863`	`1863`	`rapidjson::Document values(rapidjson::Type::kObjectType);`
`1864`	`1864`	`auto& allocator = values.GetAllocator();`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ rapidjson::Document __Type::resolveDescription(service::ResolverParams&& params)`
`228`	`228`
`229`	`229`	`rapidjson::Document __Type::resolveFields(service::ResolverParams&& params)`
`230`	`230`	`{`
`231`		`- static const auto defaultArguments = []() -> rapidjson::Document`
	`231`	`+ const auto defaultArguments = []()`
`232`	`232`	`{`
`233`	`233`	`rapidjson::Document values(rapidjson::Type::kObjectType);`
`234`	`234`	`auto& allocator = values.GetAllocator();`
`@@ -267,7 +267,7 @@ rapidjson::Document __Type::resolvePossibleTypes(service::ResolverParams&& param`
`267`	`267`
`268`	`268`	`rapidjson::Document __Type::resolveEnumValues(service::ResolverParams&& params)`
`269`	`269`	`{`
`270`		`- static const auto defaultArguments = []() -> rapidjson::Document`
	`270`	`+ const auto defaultArguments = []()`
`271`	`271`	`{`
`272`	`272`	`rapidjson::Document values(rapidjson::Type::kObjectType);`
`273`	`273`	`auto& allocator = values.GetAllocator();`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ rapidjson::Document service::ModifiedResult<today::TaskState>::convert(today::Ta`
`54`	`54`	`template <>`
`55`	`55`	`today::CompleteTaskInput ModifiedArgument<today::CompleteTaskInput>::convert(const rapidjson::Value& value)`
`56`	`56`	`{`
`57`		`- static const auto defaultValue = []() -> rapidjson::Document`
	`57`	`+ const auto defaultValue = []()`
`58`	`58`	`{`
`59`	`59`	`rapidjson::Document values(rapidjson::Type::kObjectType);`
`60`	`60`	`auto& allocator = values.GetAllocator();`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ size_t TodayServiceCase::_getUnreadCountsCount = 0;`
`91`	`91`
`92`	`92`	`TEST_F(TodayServiceCase, QueryEverything)`
`93`	`93`	`{`
`94`		`- auto ast = peg::parseString(R"gql(`
	`94`	`+ auto ast = R"(`
`95`	`95`	`query Everything {`
`96`	`96`	`appointments {`
`97`	`97`	`edges {`
`@@ -121,7 +121,7 @@ TEST_F(TodayServiceCase, QueryEverything)`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`
`124`		`- })gql");`
	`124`	`+ })"_graphql;`
`125`	`125`	`const rapidjson::Document variables(rapidjson::Type::kObjectType);`
`126`	`126`	`const auto result = _service->resolve(*ast, "Everything", variables.GetObject());`
`127`	`127`	`EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";`
`@@ -184,7 +184,7 @@ TEST_F(TodayServiceCase, QueryEverything)`
`184`	`184`
`185`	`185`	`TEST_F(TodayServiceCase, QueryAppointments)`
`186`	`186`	`{`
`187`		`- auto ast = peg::parseString(R"gql({`
	`187`	`+ auto ast = R"({`
`188`	`188`	`appointments {`
`189`	`189`	`edges {`
`190`	`190`	`node {`
`@@ -195,7 +195,7 @@ TEST_F(TodayServiceCase, QueryAppointments)`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`}`
`198`		`- })gql");`
	`198`	`+ })"_graphql;`
`199`	`199`	`const rapidjson::Document variables(rapidjson::Type::kObjectType);`
`200`	`200`	`const auto result = _service->resolve(*ast, "", variables.GetObject());`
`201`	`201`	`EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";`
`@@ -240,7 +240,7 @@ TEST_F(TodayServiceCase, QueryAppointments)`
`240`	`240`
`241`	`241`	`TEST_F(TodayServiceCase, QueryTasks)`
`242`	`242`	`{`
`243`		`- auto ast = peg::parseString(R"gql({`
	`243`	`+ auto ast = R"gql({`
`244`	`244`	`tasks {`
`245`	`245`	`edges {`
`246`	`246`	`node {`
`@@ -250,7 +250,7 @@ TEST_F(TodayServiceCase, QueryTasks)`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`}`
`253`		`- })gql");`
	`253`	`+ })gql"_graphql;`
`254`	`254`	`const rapidjson::Document variables(rapidjson::Type::kObjectType);`
`255`	`255`	`const auto result = _service->resolve(*ast, "", variables.GetObject());`
`256`	`256`	`EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";`
`@@ -294,7 +294,7 @@ TEST_F(TodayServiceCase, QueryTasks)`
`294`	`294`
`295`	`295`	`TEST_F(TodayServiceCase, QueryUnreadCounts)`
`296`	`296`	`{`
`297`		`- auto ast = peg::parseString(R"gql({`
	`297`	`+ auto ast = R"({`
`298`	`298`	`unreadCounts {`
`299`	`299`	`edges {`
`300`	`300`	`node {`
`@@ -304,7 +304,7 @@ TEST_F(TodayServiceCase, QueryUnreadCounts)`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`	`}`
`307`		`- })gql");`
	`307`	`+ })"_graphql;`
`308`	`308`	`const rapidjson::Document variables(rapidjson::Type::kObjectType);`
`309`	`309`	`const auto result = _service->resolve(*ast, "", variables.GetObject());`
`310`	`310`	`EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";`
`@@ -348,7 +348,7 @@ TEST_F(TodayServiceCase, QueryUnreadCounts)`
`348`	`348`
`349`	`349`	`TEST_F(TodayServiceCase, MutateCompleteTask)`
`350`	`350`	`{`
`351`		`- auto ast = peg::parseString(R"gql(mutation {`
	`351`	`+ auto ast = R"(mutation {`
`352`	`352`	`completedTask: completeTask(input: {id: "ZmFrZVRhc2tJZA==", isComplete: true, clientMutationId: "Hi There!"}) {`
`353`	`353`	`completedTask: task {`
`354`	`354`	`completedTaskId: id`
`@@ -357,7 +357,7 @@ TEST_F(TodayServiceCase, MutateCompleteTask)`
`357`	`357`	`}`
`358`	`358`	`clientMutationId`
`359`	`359`	`}`
`360`		`- })gql");`
	`360`	`+ })"_graphql;`
`361`	`361`	`const rapidjson::Document variables(rapidjson::Type::kObjectType);`
`362`	`362`	`const auto result = _service->resolve(*ast, "", variables.GetObject());`
`363`	`363`
`@@ -401,7 +401,7 @@ TEST_F(TodayServiceCase, MutateCompleteTask)`
`401`	`401`
`402`	`402`	`TEST_F(TodayServiceCase, Introspection)`
`403`	`403`	`{`
`404`		`- auto ast = peg::parseString(R"gql({`
	`404`	`+ auto ast = R"({`
`405`	`405`	`__schema {`
`406`	`406`	`types {`
`407`	`407`	`kind`
`@@ -432,7 +432,7 @@ TEST_F(TodayServiceCase, Introspection)`
`432`	`432`	`name`
`433`	`433`	`}`
`434`	`434`	`}`
`435`		`- })gql");`
	`435`	`+ })"_graphql;`
`436`	`436`	`const rapidjson::Document variables(rapidjson::Type::kObjectType);`
`437`	`437`	`const auto result = _service->resolve(*ast, "", variables.GetObject());`
`438`	`438`