expressir 1.3.0 → 1.3.2

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt

@@ -0,0 +1,191 @@
+option(ANTLR_BUILD_CPP_TESTS "Build C++ tests." ON)
+option(TRACE_ATN "Trace ATN simulation" OFF)
+option(ANTLR_BUILD_SHARED "Build the shared library of the ANTLR runtime" ON)
+option(ANTLR_BUILD_STATIC "Build the static library of the ANTLR runtime" ON)
+
+if (NOT ANTLR_BUILD_SHARED AND NOT ANTLR_BUILD_STATIC)
+  message(FATAL_ERROR "Options ANTLR_BUILD_SHARED and ANTLR_BUILD_STATIC can't both be OFF")
+endif()
+
+include_directories(
+  ${PROJECT_SOURCE_DIR}/runtime/src
+  ${PROJECT_SOURCE_DIR}/runtime/src/atn
+  ${PROJECT_SOURCE_DIR}/runtime/src/dfa
+  ${PROJECT_SOURCE_DIR}/runtime/src/internal
+  ${PROJECT_SOURCE_DIR}/runtime/src/misc
+  ${PROJECT_SOURCE_DIR}/runtime/src/support
+  ${PROJECT_SOURCE_DIR}/runtime/src/tree
+  ${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern
+  ${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath
+)
+
+
+file(GLOB libantlrcpp_SRC
+  "${PROJECT_SOURCE_DIR}/runtime/src/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/atn/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/dfa/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/internal/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/misc/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/support/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/tree/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern/*.cpp"
+  "${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath/*.cpp"
+)
+
+if (ANTLR_BUILD_SHARED)
+  add_library(antlr4_shared SHARED ${libantlrcpp_SRC})
+endif()
+if (ANTLR_BUILD_STATIC)
+  add_library(antlr4_static STATIC ${libantlrcpp_SRC})
+endif()
+
+if (CMAKE_HOST_UNIX)
+  # Make sure to link against threads (pthreads) library in order to be able to
+  # make use of std::call_once in the code without producing runtime errors
+  # (see also https://github.com/antlr/antlr4/issues/3708 and/or https://stackoverflow.com/q/51584960).
+  find_package(Threads REQUIRED)
+
+  if (TARGET antlr4_shared)
+    target_link_libraries(antlr4_shared Threads::Threads)
+  endif()
+  if (TARGET antlr4_static)
+    target_link_libraries(antlr4_static Threads::Threads)
+  endif()
+endif()
+
+IF(TRACE_ATN)
+    ADD_DEFINITIONS(-DTRACE_ATN_SIM=1)
+ENDIF(TRACE_ATN)
+
+if (ANTLR_BUILD_CPP_TESTS)
+  include(FetchContent)
+
+  FetchContent_Declare(
+    googletest
+    URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.zip
+  )
+
+  if(WITH_STATIC_CRT)
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+  endif()
+
+  FetchContent_MakeAvailable(googletest)
+
+  file(GLOB libantlrcpp_TESTS
+    "${PROJECT_SOURCE_DIR}/runtime/tests/*.cpp"
+  )
+
+  add_executable(
+    antlr4_tests
+    ${libantlrcpp_TESTS}
+  )
+
+  target_link_libraries(
+    antlr4_tests
+	$<IF:$<TARGET_EXISTS:antlr4_static>,antlr4_static,antlr4_shared>
+    gtest_main
+  )
+
+  include(GoogleTest)
+
+  gtest_discover_tests(antlr4_tests)
+endif()
+
+if(APPLE)
+  if (TARGET antlr4_shared)
+    target_link_libraries(antlr4_shared ${COREFOUNDATION_LIBRARY})
+  endif()
+  if (TARGET antlr4_static)
+    target_link_libraries(antlr4_static ${COREFOUNDATION_LIBRARY})
+  endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+  set(disabled_compile_warnings "/wd4251")
+else()
+  set(disabled_compile_warnings "-Wno-overloaded-virtual")
+endif()
+
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  set(disabled_compile_warnings "${disabled_compile_warnings} -Wno-dollar-in-identifier-extension -Wno-four-char-constants")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+  set(disabled_compile_warnings "${disabled_compile_warnings} -Wno-multichar")
+endif()
+
+set(extra_share_compile_flags "")
+set(extra_static_compile_flags "")
+set(static_lib_suffix "")
+
+if (WIN32)
+  set(static_lib_suffix "-static")
+  if (TARGET antlr4_shared)
+    target_compile_definitions(antlr4_shared PUBLIC ANTLR4CPP_EXPORTS)
+  endif()
+  if (TARGET antlr4_static)
+    target_compile_definitions(antlr4_static PUBLIC ANTLR4CPP_STATIC)
+  endif()
+  if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    set(extra_share_compile_flags "-MP /wd4251")
+    set(extra_static_compile_flags "-MP")
+  endif()
+endif()
+
+if (TARGET antlr4_shared)
+  set_target_properties(antlr4_shared
+                        PROPERTIES VERSION   ${ANTLR_VERSION}
+                                   SOVERSION ${ANTLR_VERSION}
+                                   OUTPUT_NAME antlr4-runtime
+                                   COMPILE_FLAGS "${disabled_compile_warnings} ${extra_share_compile_flags}")
+endif()
+
+if (TARGET antlr4_static)
+  set_target_properties(antlr4_static
+                        PROPERTIES VERSION   ${ANTLR_VERSION}
+                                   SOVERSION ${ANTLR_VERSION}
+                                   OUTPUT_NAME "antlr4-runtime${static_lib_suffix}"
+                                   COMPILE_PDB_NAME "antlr4-runtime${static_lib_suffix}"
+                                   COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
+endif()
+
+if (ANTLR_BUILD_CPP_TESTS)
+  # Copy the generated binaries to dist folder (required by test suite)
+  if (TARGET antlr4_shared)
+  add_custom_command(
+      TARGET antlr4_shared
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/dist
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:antlr4_shared> ${CMAKE_HOME_DIRECTORY}/dist
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_LINKER_FILE:antlr4_shared> ${CMAKE_HOME_DIRECTORY}/dist)
+  endif()
+  
+  if (TARGET antlr4_static)
+    add_custom_command(
+      TARGET antlr4_static
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/dist
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:antlr4_static> ${CMAKE_HOME_DIRECTORY}/dist)
+  endif()
+endif()
+
+if (TARGET antlr4_shared)
+  install(TARGETS antlr4_shared
+          EXPORT antlr4-targets
+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+if (TARGET antlr4_static)
+  install(TARGETS antlr4_static
+          EXPORT antlr4-targets
+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
+        DESTINATION "include/antlr4-runtime"
+        COMPONENT dev
+        FILES_MATCHING PATTERN "*.h"
+        )

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj

@@ -354,7 +354,6 @@
     <ClCompile Include="src\ANTLRErrorStrategy.cpp" />
     <ClCompile Include="src\ANTLRFileStream.cpp" />
     <ClCompile Include="src\ANTLRInputStream.cpp" />
-    <ClCompile Include="src\atn\AbstractPredicateTransition.cpp" />
     <ClCompile Include="src\atn\ActionTransition.cpp" />
     <ClCompile Include="src\atn\AmbiguityInfo.cpp" />
     <ClCompile Include="src\atn\ArrayPredictionContext.cpp" />
@@ -363,19 +362,13 @@
     <ClCompile Include="src\atn\ATNConfigSet.cpp" />
     <ClCompile Include="src\atn\ATNDeserializationOptions.cpp" />
     <ClCompile Include="src\atn\ATNDeserializer.cpp" />
-    <ClCompile Include="src\atn\ATNSerializer.cpp" />
     <ClCompile Include="src\atn\ATNSimulator.cpp" />
     <ClCompile Include="src\atn\ATNState.cpp" />
     <ClCompile Include="src\atn\AtomTransition.cpp" />
-    <ClCompile Include="src\atn\BasicBlockStartState.cpp" />
-    <ClCompile Include="src\atn\BasicState.cpp" />
-    <ClCompile Include="src\atn\BlockEndState.cpp" />
-    <ClCompile Include="src\atn\BlockStartState.cpp" />
     <ClCompile Include="src\atn\ContextSensitivityInfo.cpp" />
     <ClCompile Include="src\atn\DecisionEventInfo.cpp" />
     <ClCompile Include="src\atn\DecisionInfo.cpp" />
     <ClCompile Include="src\atn\DecisionState.cpp" />
-    <ClCompile Include="src\atn\EmptyPredictionContext.cpp" />
     <ClCompile Include="src\atn\EpsilonTransition.cpp" />
     <ClCompile Include="src\atn\ErrorInfo.cpp" />
     <ClCompile Include="src\atn\LexerAction.cpp" />
@@ -393,30 +386,24 @@
     <ClCompile Include="src\atn\LexerTypeAction.cpp" />
     <ClCompile Include="src\atn\LL1Analyzer.cpp" />
     <ClCompile Include="src\atn\LookaheadEventInfo.cpp" />
-    <ClCompile Include="src\atn\LoopEndState.cpp" />
     <ClCompile Include="src\atn\NotSetTransition.cpp" />
     <ClCompile Include="src\atn\OrderedATNConfigSet.cpp" />
     <ClCompile Include="src\atn\ParseInfo.cpp" />
     <ClCompile Include="src\atn\ParserATNSimulator.cpp" />
-    <ClCompile Include="src\atn\PlusBlockStartState.cpp" />
-    <ClCompile Include="src\atn\PlusLoopbackState.cpp" />
     <ClCompile Include="src\atn\PrecedencePredicateTransition.cpp" />
     <ClCompile Include="src\atn\PredicateEvalInfo.cpp" />
     <ClCompile Include="src\atn\PredicateTransition.cpp" />
     <ClCompile Include="src\atn\PredictionContext.cpp" />
+    <ClCompile Include="src\atn\PredictionContextCache.cpp" />
+    <ClCompile Include="src\atn\PredictionContextMergeCache.cpp" />
     <ClCompile Include="src\atn\PredictionMode.cpp" />
     <ClCompile Include="src\atn\ProfilingATNSimulator.cpp" />
     <ClCompile Include="src\atn\RangeTransition.cpp" />
-    <ClCompile Include="src\atn\RuleStartState.cpp" />
-    <ClCompile Include="src\atn\RuleStopState.cpp" />
     <ClCompile Include="src\atn\RuleTransition.cpp" />
     <ClCompile Include="src\atn\SemanticContext.cpp" />
     <ClCompile Include="src\atn\SetTransition.cpp" />
     <ClCompile Include="src\atn\SingletonPredictionContext.cpp" />
-    <ClCompile Include="src\atn\StarBlockStartState.cpp" />
     <ClCompile Include="src\atn\StarLoopbackState.cpp" />
-    <ClCompile Include="src\atn\StarLoopEntryState.cpp" />
-    <ClCompile Include="src\atn\TokensStartState.cpp" />
     <ClCompile Include="src\atn\Transition.cpp" />
     <ClCompile Include="src\atn\WildcardTransition.cpp" />
     <ClCompile Include="src\BailErrorStrategy.cpp" />
@@ -436,6 +423,7 @@
     <ClCompile Include="src\Exceptions.cpp" />
     <ClCompile Include="src\FailedPredicateException.cpp" />
     <ClCompile Include="src\InputMismatchException.cpp" />
+    <ClCompile Include="src\internal\Synchronization.cpp" />
     <ClCompile Include="src\InterpreterRuleContext.cpp" />
     <ClCompile Include="src\IntStream.cpp" />
     <ClCompile Include="src\Lexer.cpp" />
@@ -460,13 +448,12 @@
     <ClCompile Include="src\support\Any.cpp" />
     <ClCompile Include="src\support\Arrays.cpp" />
     <ClCompile Include="src\support\CPPUtils.cpp" />
-    <ClCompile Include="src\support\Guid.cpp" />
     <ClCompile Include="src\support\StringUtils.cpp" />
+    <ClCompile Include="src\support\Utf8.cpp" />
     <ClCompile Include="src\Token.cpp" />
     <ClCompile Include="src\TokenSource.cpp" />
     <ClCompile Include="src\TokenStream.cpp" />
     <ClCompile Include="src\TokenStreamRewriter.cpp" />
-    <ClCompile Include="src\tree\ErrorNode.cpp" />
     <ClCompile Include="src\tree\ErrorNodeImpl.cpp" />
     <ClCompile Include="src\tree\IterativeParseTreeWalker.cpp" />
     <ClCompile Include="src\tree\ParseTree.cpp" />
@@ -481,7 +468,6 @@
     <ClCompile Include="src\tree\pattern\TagChunk.cpp" />
     <ClCompile Include="src\tree\pattern\TextChunk.cpp" />
     <ClCompile Include="src\tree\pattern\TokenTagToken.cpp" />
-    <ClCompile Include="src\tree\TerminalNode.cpp" />
     <ClCompile Include="src\tree\TerminalNodeImpl.cpp" />
     <ClCompile Include="src\tree\Trees.cpp" />
     <ClCompile Include="src\tree\xpath\XPath.cpp" />
@@ -501,12 +487,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\antlr4-common.h" />
-    <ClInclude Include="src\antlr4-runtime.h" />
     <ClInclude Include="src\ANTLRErrorListener.h" />
     <ClInclude Include="src\ANTLRErrorStrategy.h" />
     <ClInclude Include="src\ANTLRFileStream.h" />
     <ClInclude Include="src\ANTLRInputStream.h" />
-    <ClInclude Include="src\atn\AbstractPredicateTransition.h" />
     <ClInclude Include="src\atn\ActionTransition.h" />
     <ClInclude Include="src\atn\AmbiguityInfo.h" />
     <ClInclude Include="src\atn\ArrayPredictionContext.h" />
@@ -523,12 +507,10 @@
     <ClInclude Include="src\atn\BasicState.h" />
     <ClInclude Include="src\atn\BlockEndState.h" />
     <ClInclude Include="src\atn\BlockStartState.h" />
-    <ClInclude Include="src\atn\ConfigLookup.h" />
     <ClInclude Include="src\atn\ContextSensitivityInfo.h" />
     <ClInclude Include="src\atn\DecisionEventInfo.h" />
     <ClInclude Include="src\atn\DecisionInfo.h" />
     <ClInclude Include="src\atn\DecisionState.h" />
-    <ClInclude Include="src\atn\EmptyPredictionContext.h" />
     <ClInclude Include="src\atn\EpsilonTransition.h" />
     <ClInclude Include="src\atn\ErrorInfo.h" />
     <ClInclude Include="src\atn\LexerAction.h" />
@@ -558,6 +540,9 @@
     <ClInclude Include="src\atn\PredicateEvalInfo.h" />
     <ClInclude Include="src\atn\PredicateTransition.h" />
     <ClInclude Include="src\atn\PredictionContext.h" />
+    <ClInclude Include="src\atn\PredictionContextCache.h" />
+    <ClInclude Include="src\atn\PredictionContextMergeCache.h" />
+    <ClInclude Include="src\atn\PredictionContextMergeCacheOptions.h" />
     <ClInclude Include="src\atn\PredictionMode.h" />
     <ClInclude Include="src\atn\ProfilingATNSimulator.h" />
     <ClInclude Include="src\atn\RangeTransition.h" />
@@ -590,6 +575,7 @@
     <ClInclude Include="src\Exceptions.h" />
     <ClInclude Include="src\FailedPredicateException.h" />
     <ClInclude Include="src\InputMismatchException.h" />
+    <ClInclude Include="src\internal\Synchronization.h" />
     <ClInclude Include="src\InterpreterRuleContext.h" />
     <ClInclude Include="src\IntStream.h" />
     <ClInclude Include="src\Lexer.h" />
@@ -601,7 +587,6 @@
     <ClInclude Include="src\misc\IntervalSet.h" />
     <ClInclude Include="src\misc\MurmurHash.h" />
     <ClInclude Include="src\misc\Predicate.h" />
-    <ClInclude Include="src\misc\TestRig.h" />
     <ClInclude Include="src\NoViableAltException.h" />
     <ClInclude Include="src\Parser.h" />
     <ClInclude Include="src\ParserInterpreter.h" />
@@ -615,10 +600,12 @@
     <ClInclude Include="src\support\Any.h" />
     <ClInclude Include="src\support\Arrays.h" />
     <ClInclude Include="src\support\BitSet.h" />
+    <ClInclude Include="src\support\Casts.h" />
     <ClInclude Include="src\support\CPPUtils.h" />
     <ClInclude Include="src\support\Declarations.h" />
-    <ClInclude Include="src\support\Guid.h" />
     <ClInclude Include="src\support\StringUtils.h" />
+    <ClInclude Include="src\support\Unicode.h" />
+    <ClInclude Include="src\support\Utf8.h" />
     <ClInclude Include="src\Token.h" />
     <ClInclude Include="src\TokenFactory.h" />
     <ClInclude Include="src\TokenSource.h" />
@@ -641,8 +628,6 @@
     <ClInclude Include="src\tree\pattern\TagChunk.h" />
     <ClInclude Include="src\tree\pattern\TextChunk.h" />
     <ClInclude Include="src\tree\pattern\TokenTagToken.h" />
-    <ClInclude Include="src\tree\RuleNode.h" />
-    <ClInclude Include="src\tree\SyntaxTree.h" />
     <ClInclude Include="src\tree\TerminalNode.h" />
     <ClInclude Include="src\tree\TerminalNodeImpl.h" />
     <ClInclude Include="src\tree\Trees.h" />

data/ext/{express-parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters → express_parser/antlr4-upstream/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters}

@@ -55,6 +55,12 @@
     <Filter Include="Source Files\tree\xpath">
       <UniqueIdentifier>{290632d2-c56e-4005-a417-eb83b9531e1a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\internal">
+      <UniqueIdentifier>{b4b32b3f-e97a-448a-98e6-cbf901862bd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\internal">
+      <UniqueIdentifier>{f8c2bdf9-7e81-4f31-ba17-06b16ba2f081}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\ANTLRErrorListener.h">
@@ -177,9 +183,6 @@
     <ClInclude Include="src\atn\DecisionState.h">
       <Filter>Header Files\atn</Filter>
     </ClInclude>
-    <ClInclude Include="src\atn\EmptyPredictionContext.h">
-      <Filter>Header Files\atn</Filter>
-    </ClInclude>
     <ClInclude Include="src\atn\EpsilonTransition.h">
       <Filter>Header Files\atn</Filter>
     </ClInclude>
@@ -261,9 +264,6 @@
     <ClInclude Include="src\atn\WildcardTransition.h">
       <Filter>Header Files\atn</Filter>
     </ClInclude>
-    <ClInclude Include="src\atn\AbstractPredicateTransition.h">
-      <Filter>Header Files\atn</Filter>
-    </ClInclude>
     <ClInclude Include="src\atn\ActionTransition.h">
       <Filter>Header Files\atn</Filter>
     </ClInclude>
@@ -309,9 +309,6 @@
     <ClInclude Include="src\atn\BlockStartState.h">
       <Filter>Header Files\atn</Filter>
     </ClInclude>
-    <ClInclude Include="src\atn\ConfigLookup.h">
-      <Filter>Header Files\atn</Filter>
-    </ClInclude>
     <ClInclude Include="src\dfa\LexerDFASerializer.h">
       <Filter>Header Files\dfa</Filter>
     </ClInclude>
@@ -333,9 +330,6 @@
     <ClInclude Include="src\misc\MurmurHash.h">
       <Filter>Header Files\misc</Filter>
     </ClInclude>
-    <ClInclude Include="src\misc\TestRig.h">
-      <Filter>Header Files\misc</Filter>
-    </ClInclude>
     <ClInclude Include="src\support\Arrays.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
@@ -348,9 +342,6 @@
     <ClInclude Include="src\support\Declarations.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
-    <ClInclude Include="src\support\guid.h">
-      <Filter>Header Files\support</Filter>
-    </ClInclude>
     <ClInclude Include="src\tree\AbstractParseTreeVisitor.h">
       <Filter>Header Files\tree</Filter>
     </ClInclude>
@@ -375,21 +366,12 @@
     <ClInclude Include="src\tree\ParseTreeWalker.h">
       <Filter>Header Files\tree</Filter>
     </ClInclude>
-    <ClInclude Include="src\tree\RuleNode.h">
-      <Filter>Header Files\tree</Filter>
-    </ClInclude>
-    <ClInclude Include="src\tree\SyntaxTree.h">
-      <Filter>Header Files\tree</Filter>
-    </ClInclude>
     <ClInclude Include="src\tree\TerminalNode.h">
       <Filter>Header Files\tree</Filter>
     </ClInclude>
     <ClInclude Include="src\tree\TerminalNodeImpl.h">
       <Filter>Header Files\tree</Filter>
     </ClInclude>
-    <ClInclude Include="src\tree\Tree.h">
-      <Filter>Header Files\tree</Filter>
-    </ClInclude>
     <ClInclude Include="src\tree\Trees.h">
       <Filter>Header Files\tree</Filter>
     </ClInclude>
@@ -528,12 +510,36 @@
     <ClInclude Include="src\antlr4-common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\antlr4-runtime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\tree\IterativeParseTreeWalker.h">
       <Filter>Header Files\tree</Filter>
     </ClInclude>
+    <ClInclude Include="src\misc\InterpreterDataReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\internal\Synchronization.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="src\support\Casts.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
+    <ClInclude Include="src\support\Unicode.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
+    <ClInclude Include="src\support\Any.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
+    <ClInclude Include="src\support\Utf8.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
+    <ClInclude Include="src\atn\PredictionContextMergeCache.h">
+      <Filter>Header Files\atn</Filter>
+    </ClInclude>
+    <ClInclude Include="src\atn\PredictionContextMergeCacheOptions.h">
+      <Filter>Header Files\atn</Filter>
+    </ClInclude>
+    <ClInclude Include="src\atn\PredictionContextCache.h">
+      <Filter>Header Files\atn</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\ANTLRFileStream.cpp">
@@ -635,9 +641,6 @@
     <ClCompile Include="src\UnbufferedTokenStream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\AbstractPredicateTransition.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\ActionTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -659,9 +662,6 @@
     <ClCompile Include="src\atn\ATNDeserializer.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\ATNSerializer.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\ATNSimulator.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -671,21 +671,9 @@
     <ClCompile Include="src\atn\AtomTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\BasicBlockStartState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
-    <ClCompile Include="src\atn\BasicState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
-    <ClCompile Include="src\atn\BlockEndState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\DecisionState.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\EmptyPredictionContext.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\EpsilonTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -698,9 +686,6 @@
     <ClCompile Include="src\atn\LL1Analyzer.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\LoopEndState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\NotSetTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -710,12 +695,6 @@
     <ClCompile Include="src\atn\ParserATNSimulator.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\PlusBlockStartState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
-    <ClCompile Include="src\atn\PlusLoopbackState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\PrecedencePredicateTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -731,12 +710,6 @@
     <ClCompile Include="src\atn\RangeTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\RuleStartState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
-    <ClCompile Include="src\atn\RuleStopState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\RuleTransition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -749,18 +722,9 @@
     <ClCompile Include="src\atn\SingletonPredictionContext.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\StarBlockStartState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\StarLoopbackState.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\StarLoopEntryState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
-    <ClCompile Include="src\atn\TokensStartState.cpp">
-      <Filter>Source Files\atn</Filter>
-    </ClCompile>
     <ClCompile Include="src\atn\Transition.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
@@ -794,9 +758,6 @@
     <ClCompile Include="src\support\CPPUtils.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
-    <ClCompile Include="src\support\guid.cpp">
-      <Filter>Source Files\support</Filter>
-    </ClCompile>
     <ClCompile Include="src\tree\ErrorNodeImpl.cpp">
       <Filter>Source Files\tree</Filter>
     </ClCompile>
@@ -935,12 +896,21 @@
     <ClCompile Include="src\tree\IterativeParseTreeWalker.cpp">
       <Filter>Source Files\tree</Filter>
     </ClCompile>
+    <ClCompile Include="src\misc\InterpreterDataReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\ANTLRErrorListener.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\ANTLRErrorStrategy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\atn\LexerAction.cpp">
+      <Filter>Source Files\atn</Filter>
+    </ClCompile>
+    <ClCompile Include="src\misc\Predicate.cpp">
+      <Filter>Source Files\misc</Filter>
+    </ClCompile>
     <ClCompile Include="src\Token.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -950,8 +920,8 @@
     <ClCompile Include="src\WritableToken.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\tree\ErrorNode.cpp">
-      <Filter>Source Files\tree</Filter>
+    <ClCompile Include="src\support\Any.cpp">
+      <Filter>Source Files\support</Filter>
     </ClCompile>
     <ClCompile Include="src\tree\ParseTreeListener.cpp">
       <Filter>Source Files\tree</Filter>
@@ -959,23 +929,20 @@
     <ClCompile Include="src\tree\ParseTreeVisitor.cpp">
       <Filter>Source Files\tree</Filter>
     </ClCompile>
-    <ClCompile Include="src\tree\TerminalNode.cpp">
-      <Filter>Source Files\tree</Filter>
+    <ClCompile Include="src\tree\pattern\Chunk.cpp">
+      <Filter>Source Files\tree\pattern</Filter>
     </ClCompile>
-    <ClCompile Include="src\support\Any.cpp">
+    <ClCompile Include="src\internal\Synchronization.cpp">
+      <Filter>Source Files\internal</Filter>
+    </ClCompile>
+    <ClCompile Include="src\support\Utf8.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\BlockStartState.cpp">
+    <ClCompile Include="src\atn\PredictionContextMergeCache.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\atn\LexerAction.cpp">
+    <ClCompile Include="src\atn\PredictionContextCache.cpp">
       <Filter>Source Files\atn</Filter>
     </ClCompile>
-    <ClCompile Include="src\tree\pattern\Chunk.cpp">
-      <Filter>Source Files\tree\pattern</Filter>
-    </ClCompile>
-    <ClCompile Include="src\misc\Predicate.cpp">
-      <Filter>Source Files\misc</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>