Merge pull request #141 from wravery/field_path

Various memory optimizations

Author: wravery

CMakeLists.txt

@@ -45,7 +45,7 @@ endfunction()
 
 find_package(Threads MODULE REQUIRED)
 
-find_package(pegtl 3.1.0 QUIET CONFIG)
+find_package(pegtl 3.1.1 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")

PEGTL

@@ -7,10 +7,13 @@
 #define SCHEMAGENERATOR_H
 
 #include "graphqlservice/GraphQLGrammar.h"
+#include "graphqlservice/GraphQLParse.h"
 #include "graphqlservice/GraphQLService.h"
 
 #include <array>
 #include <cstdio>
+#include <unordered_map>
+#include <unordered_set>
 
 namespace graphql::schema {
 
@@ -24,10 +27,10 @@ enum class BuiltinType
 	ID,
 };
 
-using BuiltinTypeMap = std::map<std::string, BuiltinType>;
+using BuiltinTypeMap = std::map<std::string_view, BuiltinType>;
 
 // These are the C++ types we'll use for them.
-using CppTypeMap = std::array<std::string, static_cast<size_t>(BuiltinType::ID) + 1>;
+using CppTypeMap = std::array<std::string_view, static_cast<size_t>(BuiltinType::ID) + 1>;
 
 // Types that we understand and use to generate the skeleton of a service.
 enum class SchemaType
@@ -41,14 +44,14 @@ enum class SchemaType
 	Operation,
 };
 
-using SchemaTypeMap = std::map<std::string, SchemaType>;
+using SchemaTypeMap = std::map<std::string_view, SchemaType>;
 
 // Keep track of the positions of each type declaration in the file.
-using PositionMap = std::unordered_map<std::string, tao::graphqlpeg::position>;
+using PositionMap = std::unordered_map<std::string_view, tao::graphqlpeg::position>;
 
 // For all of the named types we track, we want to keep them in order in a vector but
 // be able to lookup their offset quickly by name.
-using TypeNameMap = std::unordered_map<std::string, size_t>;
+using TypeNameMap = std::unordered_map<std::string_view, size_t>;
 
 // Any type can also have a list and/or non-nullable wrapper, and those can be nested.
 // Since it's easier to express nullability than non-nullability in C++, we'll invert
@@ -60,28 +63,28 @@ using TypeModifierStack = std::vector<service::TypeModifier>;
 // scalar type names have been declared so we recognize the references.
 struct ScalarType
 {
-	std::string type;
-	std::string description;
+	std::string_view type;
+	std::string_view description;
 };
 
 using ScalarTypeList = std::vector<ScalarType>;
 
 // Enum types map a type name to a collection of valid string values.
 struct EnumValueType
 {
-	std::string value;
-	std::string cppValue;
-	std::string description;
-	std::optional<std::string> deprecationReason;
+	std::string_view value;
+	std::string_view cppValue;
+	std::string_view description;
+	std::optional<std::string_view> deprecationReason;
 	std::optional<tao::graphqlpeg::position> position;
 };
 
 struct EnumType
 {
-	std::string type;
-	std::string cppType;
+	std::string_view type;
+	std::string_view cppType;
 	std::vector<EnumValueType> values;
-	std::string description;
+	std::string_view description;
 };
 
 using EnumTypeList = std::vector<EnumType>;
@@ -99,47 +102,47 @@ enum class InputFieldType
 
 struct InputField
 {
-	std::string type;
-	std::string name;
-	std::string cppName;
-	std::string defaultValueString;
+	std::string_view type;
+	std::string_view name;
+	std::string_view cppName;
+	std::string_view defaultValueString;
 	response::Value defaultValue;
 	InputFieldType fieldType = InputFieldType::Builtin;
 	TypeModifierStack modifiers;
-	std::string description;
+	std::string_view description;
 	std::optional<tao::graphqlpeg::position> position;
 };
 
 using InputFieldList = std::vector<InputField>;
 
 struct InputType
 {
-	std::string type;
-	std::string cppType;
+	std::string_view type;
+	std::string_view cppType;
 	InputFieldList fields;
-	std::string description;
+	std::string_view description;
 };
 
 using InputTypeList = std::vector<InputType>;
 
 // Directives are defined with arguments and a list of valid locations.
 struct Directive
 {
-	std::string name;
-	std::vector<std::string> locations;
+	std::string_view name;
+	std::vector<std::string_view> locations;
 	InputFieldList arguments;
-	std::string description;
+	std::string_view description;
 };
 
 using DirectiveList = std::vector<Directive>;
 
 // Union types map a type name to a set of potential concrete type names.
 struct UnionType
 {
-	std::string type;
-	std::string cppType;
-	std::vector<std::string> options;
-	std::string description;
+	std::string_view type;
+	std::string_view cppType;
+	std::vector<std::string_view> options;
+	std::string_view description;
 };
 
 using UnionTypeList = std::vector<UnionType>;
@@ -163,14 +166,14 @@ constexpr std::string_view strApply = "apply";
 
 struct OutputField
 {
-	std::string type;
-	std::string name;
-	std::string cppName;
+	std::string_view type;
+	std::string_view name;
+	std::string_view cppName;
 	InputFieldList arguments;
 	OutputFieldType fieldType = OutputFieldType::Builtin;
 	TypeModifierStack modifiers;
-	std::string description;
-	std::optional<std::string> deprecationReason;
+	std::string_view description;
+	std::optional<std::string_view> deprecationReason;
 	std::optional<tao::graphqlpeg::position> position;
 	bool interfaceField = false;
 	bool inheritedField = false;
@@ -185,10 +188,10 @@ using OutputFieldList = std::vector<OutputField>;
 // conditions. The fields can include any output type.
 struct InterfaceType
 {
-	std::string type;
-	std::string cppType;
+	std::string_view type;
+	std::string_view cppType;
 	OutputFieldList fields;
-	std::string description;
+	std::string_view description;
 };
 
 using InterfaceTypeList = std::vector<InterfaceType>;
@@ -197,22 +200,22 @@ using InterfaceTypeList = std::vector<InterfaceType>;
 // may inherit multiple interfaces.
 struct ObjectType
 {
-	std::string type;
-	std::string cppType;
-	std::vector<std::string> interfaces;
-	std::vector<std::string> unions;
+	std::string_view type;
+	std::string_view cppType;
+	std::vector<std::string_view> interfaces;
+	std::vector<std::string_view> unions;
 	OutputFieldList fields;
-	std::string description;
+	std::string_view description;
 };
 
 using ObjectTypeList = std::vector<ObjectType>;
 
 // The schema maps operation types to named types.
 struct OperationType
 {
-	std::string type;
-	std::string cppType;
-	std::string operation;
+	std::string_view type;
+	std::string_view cppType;
+	std::string_view operation;
 };
 
 using OperationTypeList = std::vector<OperationType>;
@@ -318,17 +321,16 @@ class Generator
 	void visitObjectTypeExtension(const peg::ast_node& objectTypeExtension);
 	void visitDirectiveDefinition(const peg::ast_node& directiveDefinition);
 
-	static const std::string& getSafeCppName(const std::string& type) noexcept;
-	static OutputFieldList getOutputFields(
-		const std::vector<std::unique_ptr<peg::ast_node>>& fields);
-	static InputFieldList getInputFields(const std::vector<std::unique_ptr<peg::ast_node>>& fields);
+	static std::string_view getSafeCppName(std::string_view type) noexcept;
+	static OutputFieldList getOutputFields(const peg::ast_node::children_t& fields);
+	static InputFieldList getInputFields(const peg::ast_node::children_t& fields);
 
 	// Recursively visit a Type node until we reach a NamedType and we've
 	// taken stock of all of the modifier wrappers.
 	class TypeVisitor
 	{
 	public:
-		std::pair<std::string, TypeModifierStack> getType();
+		std::pair<std::string_view, TypeModifierStack> getType();
 
 		void visit(const peg::ast_node& typeName);
 
@@ -337,7 +339,7 @@ class Generator
 		void visitListType(const peg::ast_node& listType);
 		void visitNonNullType(const peg::ast_node& nonNullType);
 
-		std::string _type;
+		std::string_view _type;
 		TypeModifierStack _modifiers;
 		bool _nonNull = false;
 	};
@@ -366,11 +368,11 @@ class Generator
 
 	void validateSchema();
 	void fixupOutputFieldList(OutputFieldList& fields,
-		const std::optional<std::unordered_set<std::string>>& interfaceFields,
+		const std::optional<std::unordered_set<std::string_view>>& interfaceFields,
 		const std::optional<std::string_view>& accessor);
 	void fixupInputFieldList(InputFieldList& fields);
 
-	const std::string& getCppType(const std::string& type) const noexcept;
+	std::string_view getCppType(std::string_view type) const noexcept;
 	std::string getInputCppType(const InputField& field) const noexcept;
 	std::string getOutputCppType(const OutputField& field) const noexcept;
 
@@ -393,14 +395,14 @@ class Generator
 	std::string getResultAccessType(const OutputField& result) const noexcept;
 	std::string getTypeModifiers(const TypeModifierStack& modifiers) const noexcept;
 	std::string getIntrospectionType(
-		const std::string& type, const TypeModifierStack& modifiers) const noexcept;
+		std::string_view type, const TypeModifierStack& modifiers) const noexcept;
 
 	std::vector<std::string> outputSeparateFiles() const noexcept;
 
-	static const std::string s_introspectionNamespace;
+	static const std::string_view s_introspectionNamespace;
 	static const BuiltinTypeMap s_builtinTypes;
 	static const CppTypeMap s_builtinCppTypes;
-	static const std::string s_scalarCppType;
+	static const std::string_view s_scalarCppType;
 	static const std::string s_currentDirectory;
 
 	const GeneratorOptions _options;
@@ -411,6 +413,7 @@ class Generator
 	const std::string _headerPath;
 	const std::string _objectHeaderPath;
 	const std::string _sourcePath;
+	peg::ast _ast;
 
 	SchemaTypeMap _schemaTypes;
 	PositionMap _typePositions;