Simplify parse tree traversal

Author: wravery

CMakeLists.txt

@@ -9,9 +9,15 @@ if(WIN32)
   SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 endif()
 
+add_library(graphqlpeg GraphQLTree.cpp)
 add_library(graphqlservice GraphQLService.cpp Introspection.cpp IntrospectionSchema.cpp)
 add_executable(schemagen SchemaGenerator.cpp)
 
+find_package(pegtl CONFIG REQUIRED)
+
+target_include_directories(graphqlpeg INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
+target_link_libraries(graphqlpeg taocpp::pegtl)
+
 find_package(cpprestsdk REQUIRED)
 set(CPPRESTSDK cpprestsdk::cpprest)
 
@@ -20,12 +26,6 @@ if(UNIX)
   list(APPEND CPPRESTSDK ${BOOST_SYSTEM})
 endif()
 
-find_package(pegtl CONFIG REQUIRED)
-
-add_library(graphqlpeg GraphQLGrammar.cpp)
-target_include_directories(graphqlpeg INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
-target_link_libraries(graphqlpeg taocpp::pegtl)
-
 target_include_directories(graphqlservice INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
 target_link_libraries(graphqlservice ${CPPRESTSDK} graphqlpeg)
 target_link_libraries(schemagen ${CPPRESTSDK} graphqlpeg)

GraphQLGrammar.h

@@ -6,13 +6,11 @@
 
 #pragma once
 
-#include "GraphQLService.h"
-
 #include <tao/pegtl.hpp>
 
 namespace facebook {
 namespace graphql {
-namespace grammar {
+namespace peg {
 
 using namespace tao::pegtl;
 
@@ -797,9 +795,6 @@ struct document
 {
 };
 
-std::unique_ptr<ast_node> parseString(const char* text);
-std::unique_ptr<ast_node> parseFile(file_input<>&& in);
-
-} /* namespace grammar */
+} /* namespace peg */
 } /* namespace graphql */
 } /* namespace facebook */