Skip to content

Replace the GraphQL parser with a PEGTL implementation #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Nov 24, 2018
Merged

Replace the GraphQL parser with a PEGTL implementation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
77e5696
Initial tao::pegtl grammar
wravery Nov 19, 2018
7bce233
Tidy up formatting and add links to spec in comments
wravery Nov 19, 2018
7735ebc
Switch all GraphQL parsing over to GraphQLGrammar
wravery Nov 21, 2018
75bc67d
Update TODO comments
wravery Nov 21, 2018
4286260
Merge changes from master to pegtl
wravery Nov 21, 2018
f1c61cc
Fix the merge with master
wravery Nov 21, 2018
e1a5fd3
Use must-rules as much as possible for better parse errors
wravery Nov 22, 2018
6ceea9c
Switch to the pegtl parse_tree
wravery Nov 23, 2018
448d491
Remove graphqlparser dependency
wravery Nov 23, 2018
415a80e
Simplify parse tree traversal
wravery Nov 23, 2018
e5b3815
Update the README to describe new dependencies
wravery Nov 23, 2018
9bb198e
Fix implements interface handling
wravery Nov 24, 2018
be92b75
Minimize exported public headers
wravery Nov 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ 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_library(GRAPHQLPARSER graphqlparser)
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)
Expand All @@ -23,8 +27,8 @@ if(UNIX)
endif()

target_include_directories(graphqlservice INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
target_link_libraries(graphqlservice ${CPPRESTSDK} ${GRAPHQLPARSER})
target_link_libraries(schemagen ${CPPRESTSDK} ${GRAPHQLPARSER})
target_link_libraries(graphqlservice ${CPPRESTSDK} graphqlpeg)
target_link_libraries(schemagen ${CPPRESTSDK} graphqlpeg)

add_custom_command(
OUTPUT IntrospectionSchema.cpp IntrospectionSchema.h
Expand All @@ -34,6 +38,7 @@ add_custom_command(
)

if(UNIX)
target_compile_options(graphqlpeg PRIVATE -std=c++11)
target_compile_options(graphqlservice PRIVATE -std=c++11)
target_compile_options(schemagen PRIVATE -std=c++11)
endif()
Expand All @@ -56,15 +61,14 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)

target_link_libraries(todaygraphql
${CPPRESTSDK}
${GRAPHQLPARSER}
graphqlservice)
target_include_directories(todaygraphql SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})

add_executable(test_today test_today.cpp)

target_link_libraries(test_today
${CPPRESTSDK}
${GRAPHQLPARSER}
graphqlpeg
graphqlservice
todaygraphql)
target_include_directories(test_today SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
Expand All @@ -74,7 +78,7 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)
find_package(GTest REQUIRED)
target_link_libraries(tests
${CPPRESTSDK}
${GRAPHQLPARSER}
graphqlpeg
graphqlservice
todaygraphql
GTest::GTest
Expand All @@ -96,18 +100,18 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)
endif()
endif()

install(TARGETS graphqlservice schemagen
install(TARGETS graphqlpeg graphqlservice schemagen
EXPORT cppgraphqlgen-config
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib)

install(FILES GraphQLService.h Introspection.h IntrospectionSchema.h
install(FILES GraphQLService.h GraphQLTree.h Introspection.h IntrospectionSchema.h
DESTINATION include/graphqlservice)

if(WIN32)
set(GRAPHQLSERVICE_DIR $<TARGET_FILE_DIR:graphqlservice>)
install(FILES ${GRAPHQLSERVICE_DIR}/graphqlservice.lib
install(FILES ${GRAPHQLSERVICE_DIR}/graphqlservice.lib ${GRAPHQLSERVICE_DIR}/graphqlpeg.lib
DESTINATION lib)
endif()

Expand Down
Loading