expressir 1.3.0.pre.5 → 1.3.1

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.noarch.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>ANTLR4.Runtime.cpp.vs$vs$.noarch</id>
+    <version>$version$$pre$</version>
+    <title>ANTLR4 Runtime c++ vs$vs$ $link$</title>
+    <authors>Terence Parr &amp; Contributors</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type='expression'>BSL-1.0</license>
+    <icon>image\antlr4.jpg</icon>
+    <projectUrl>https://www.antlr.org/</projectUrl>
+    <description>ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files. It's widely used to build languages, tools, and frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees..</description>
+    <releaseNotes>See project URL</releaseNotes>
+    <copyright>Copyright 2014-2022</copyright>
+    <language></language>
+	<repository type='git' url='git@github.com:antlr/antlr4.git' branch='$version$' />
+  </metadata>
+  <files>
+    <file src="antlr4.jpg" 							target="image\antlr4.jpg" />
+    <file src="..\src\**\*.h" 						target="build\native\inc\" />
+    <file src="ANTLR4.Runtime.cpp.noarch.targets" 	target="build\native\ANTLR4.Runtime.cpp.vs$vs$.noarch.targets" />
+  </files>
+</package>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.noarch.targets

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.shared.nuspec

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>ANTLR4.Runtime.cpp.vs$vs$.shared</id>
+    <version>$version$$pre$</version>
+    <title>ANTLR4 Runtime c++ vs$vs$ shared</title>
+    <authors>Terence Parr &amp; Contributors</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type='expression'>BSL-1.0</license>
+    <icon>image\antlr4.jpg</icon>
+    <projectUrl>https://www.antlr.org/</projectUrl>
+    <description>ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files. It's widely used to build languages, tools, and frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees..</description>
+    <releaseNotes>releaseNotes</releaseNotes>
+    <copyright>Copyright 2006-2022</copyright>
+    <language></language>
+	<repository type='git' url='git@github.com:antlr/antlr4.git' branch='$version$' />
+	<dependencies>
+        <dependency id="ANTLR4.Runtime.cpp.vs$vs$.noarch" version='$version$$pre$'/>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="antlr4.jpg" 							target="image\antlr4.jpg" />
+    <file src="..\bin\vs-$vs$\x86\Debug DLL\*" 		target="build\native\x86\dbg\" />
+    <file src="..\bin\vs-$vs$\x86\Release DLL\*" 	target="build\native\x86\rel\" />
+    <file src="..\bin\vs-$vs$\x64\Debug DLL\*" 		target="build\native\x64\dbg\" />
+	<file src="..\bin\vs-$vs$\x64\Release DLL\*" 	target="build\native\x64\rel\" />
+    <file src="ANTLR4.Runtime.cpp.shared.targets" 	target="build\native\ANTLR4.Runtime.cpp.vs$vs$.shared.targets" />
+    <file src="ANTLR4.Runtime.cpp.shared.props" 	target="build\native\ANTLR4.Runtime.cpp.vs$vs$.shared.props" />
+  </files>
+</package>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.shared.props

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup Label="UserMacros" Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">
+        <ANTLR4>$(MSBuildThisFileDirectory)x86\dbg</ANTLR4>
+    </PropertyGroup>
+    <PropertyGroup Label="UserMacros" Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x86'">
+        <ANTLR4>$(MSBuildThisFileDirectory)x86\dbg</ANTLR4>
+    </PropertyGroup>
+    <PropertyGroup Label="UserMacros" Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">
+        <ANTLR4>$(MSBuildThisFileDirectory)x64\dbg</ANTLR4>
+    </PropertyGroup>
+    <PropertyGroup Label="UserMacros" Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">
+        <ANTLR4>$(MSBuildThisFileDirectory)x86\rel</ANTLR4>
+    </PropertyGroup>
+    <PropertyGroup Label="UserMacros" Condition="'$(Configuration)|$(Platform)'=='Release DLL|x86'">
+        <ANTLR4>$(MSBuildThisFileDirectory)x86\rel</ANTLR4>
+    </PropertyGroup>
+    <PropertyGroup Label="UserMacros" Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">
+        <ANTLR4>$(MSBuildThisFileDirectory)x64\rel</ANTLR4>
+    </PropertyGroup>
+</Project>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.shared.targets

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <Lib>
+        <AdditionalDependencies>antlr4-runtime.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Release DLL|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Release DLL|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.static.nuspec

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>ANTLR4.Runtime.cpp.vs$vs$.static</id>
+    <version>$version$$pre$</version>
+    <title>ANTLR4 Runtime c++ vs$vs$ static</title>
+    <authors>Terence Parr &amp; Contributors</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type='expression'>BSL-1.0</license>
+    <icon>image\antlr4.jpg</icon>
+    <projectUrl>https://www.antlr.org/</projectUrl>
+    <description>ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files. It's widely used to build languages, tools, and frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees..</description>
+    <releaseNotes>releaseNotes</releaseNotes>
+    <copyright>Copyright 2006-2022</copyright>
+    <language></language>
+	<repository type='git' url='git@github.com:antlr/antlr4.git' branch='$version$' />
+	<dependencies>
+        <dependency id="ANTLR4.Runtime.cpp.vs$vs$.noarch" version='$version$$pre$'/>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="antlr4.jpg" 								target="image\antlr4.jpg" />
+    <file src="..\bin\vs-$vs$\x86\Debug Static\*" 		target="build\native\x86\dbg\" />
+    <file src="..\bin\vs-$vs$\x86\Release Static\*" 	target="build\native\x86\rel\" />
+    <file src="..\bin\vs-$vs$\x64\Debug Static\*" 		target="build\native\x64\dbg\" />
+    <file src="..\bin\vs-$vs$\x64\Release Static\*" 	target="build\native\x64\rel\" />
+	<file src="ANTLR4.Runtime.cpp.static.targets" 		target="build\native\ANTLR4.Runtime.cpp.vs$vs$.static.targets" />
+  </files>
+</package>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/ANTLR4.Runtime.cpp.static.targets

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <Lib>
+        <AdditionalDependencies>antlr4-runtime.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Debug Static|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Release Static|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Lib  Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Debug Static|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Release Static|x86'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x86\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link  Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
+        <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)x64\rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/nuget/pack.cmd

@@ -0,0 +1,93 @@
+echo off
+rem echo Usage:
+rem echo ------
+rem echo pack vsvers version [pre]      // pack 2019 4.9.1 -beta
+rem echo ------
+setlocal enableextensions enabledelayedexpansion
+
+if "%1"=="" goto usage
+if "%2"=="" goto usage
+set PRE=%3
+set PLATFORM=Win32
+
+rem -version ^^[16.0^^,17.0^^)
+set VS_VERSION=vs%1
+rem  should be set "VSWHERE='%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe  -property installationPath -version ^[16.0^,17.0^)'"
+if %VS_VERSION%==vs2019 (
+  set "VSWHERE='C:\PROGRA~2\"Microsoft Visual Studio"\Installer\vswhere.exe  -latest -property installationPath -version ^[16.0^,17.0^)'"
+) else (
+if %VS_VERSION%==vs2022 (
+  set "VSWHERE='C:\PROGRA~2\"Microsoft Visual Studio"\Installer\vswhere.exe  -latest -property installationPath -version ^[17.0^,18.0^)'"
+)
+)
+for /f " delims=" %%a in (%VSWHERE%) do @set "VSCOMNTOOLS=%%a"
+
+echo ============= %VSCOMNTOOLS% =============
+
+if %VS_VERSION%==vs2019 (
+  set VS_VARSALL=..\..\VC\Auxiliary\Build\vcvarsall.bat
+  set "VS160COMNTOOLS=%VSCOMNTOOLS%\Common7\Tools\"
+) else (
+  if %VS_VERSION%==vs2022 (
+    set VS_VARSALL=..\..\VC\Auxiliary\Build\vcvarsall.bat
+    set "VS170COMNTOOLS=%VSCOMNTOOLS%\Common7\Tools\"
+  ) else (
+    set VS_VARSALL=..\..\VC\vcvarsall.bat
+  )
+)
+
+if not defined VCINSTALLDIR (
+  if %VS_VERSION%==vs2019 (
+    if %PLATFORM%==x64 (
+      call "%VS160COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
+    ) else (
+      call "%VS160COMNTOOLS%%VS_VARSALL%" x86 8.1
+    )
+  ) else (
+    if %VS_VERSION%==vs2022 (
+      if %PLATFORM%==x64 (
+        call "%VS170COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
+      ) else (
+        call "%VS170COMNTOOLS%%VS_VARSALL%" x86 8.1
+      )
+    )
+  )
+)
+
+if not defined VSINSTALLDIR (
+  echo Error: No Visual cpp environment found.
+  echo Please run this script from a Visual Studio Command Prompt
+  echo or run "%%VSnnCOMNTOOLS%%\vsvars32.bat" first.
+  goto :buildfailed
+)
+
+
+pushd ..\
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=Win32 	-p:Configuration="Debug DLL"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=Win32 	-p:Configuration="Release DLL"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=Win32 	-p:Configuration="Debug Static"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=Win32 	-p:Configuration="Release Static"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=x64 		-p:Configuration="Debug DLL"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=x64 		-p:Configuration="Release DLL"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=x64 		-p:Configuration="Debug Static"
+call msbuild antlr4cpp-vs%1.vcxproj -t:rebuild -p:Platform=x64 		-p:Configuration="Release Static"
+popd
+
+del *nupkg
+echo nuget pack ANTLR4.Runtime.cpp.noarch.nuspec 				-p vs=%1 -p version=%2 -p pre=%pre%
+call nuget pack ANTLR4.Runtime.cpp.noarch.nuspec 				-p vs=%1 -p version=%2 -p pre=%pre%
+echo nuget pack ANTLR4.Runtime.cpp.shared.nuspec 	-symbols 	-p vs=%1 -p version=%2 -p pre=%pre%
+call nuget pack ANTLR4.Runtime.cpp.shared.nuspec 	-symbols 	-p vs=%1 -p version=%2 -p pre=%pre%
+echo nuget pack ANTLR4.Runtime.cpp.static.nuspec 	-symbols 	-p vs=%1 -p version=%2 -p pre=%pre%
+call nuget pack ANTLR4.Runtime.cpp.static.nuspec 	-symbols 	-p vs=%1 -p version=%2 -p pre=%pre%
+
+goto exit
+:usage
+echo Usage:
+echo ------
+echo "pack vsvers version [pre]"      // pack 2019 4.9.1 -beta
+echo ------
+:exit
+:buildfailed
+endlocal
+rem echo on

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/src/FlatHashMap.h

@@ -0,0 +1,57 @@
+// Copyright 2012-2022 The ANTLR Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions
+//    and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//    conditions and the following disclaimer in the documentation and/or other materials provided
+//    with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to
+//    endorse or promote products derived from this software without specific prior written
+//    permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "antlr4-common.h"
+
+#if ANTLR4CPP_USING_ABSEIL
+#include "absl/container/flat_hash_map.h"
+#else
+#include <unordered_map>
+#endif
+
+// By default ANTLRv4 uses containers provided by the C++ standard library. In most deployments this
+// is fine, however in some using custom containers may be preferred. This header allows that by
+// optionally supporting some alternative implementations and allowing for more easier patching of
+// other alternatives.
+
+namespace antlr4 {
+
+#if ANTLR4CPP_USING_ABSEIL
+  template <typename Key, typename Value,
+            typename Hash = typename absl::flat_hash_map<Key, Value>::hasher,
+            typename Equal = typename absl::flat_hash_map<Key, Value>::key_equal,
+            typename Allocator = typename absl::flat_hash_map<Key, Value>::allocator_type>
+  using FlatHashMap = absl::flat_hash_map<Key, Value, Hash, Equal, Allocator>;
+#else
+  template <typename Key, typename Value,
+            typename Hash = std::hash<Key>,
+            typename Equal = std::equal_to<Key>,
+            typename Allocator = std::allocator<std::pair<const Key, Value>>>
+  using FlatHashMap = std::unordered_map<Key, Value, Hash, Equal, Allocator>;
+#endif
+
+} // namespace antlr4

data/ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/src/FlatHashSet.h

@@ -0,0 +1,57 @@
+// Copyright 2012-2022 The ANTLR Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted
+// provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions
+//    and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+//    conditions and the following disclaimer in the documentation and/or other materials provided
+//    with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to
+//    endorse or promote products derived from this software without specific prior written
+//    permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include "antlr4-common.h"
+
+#if ANTLR4CPP_USING_ABSEIL
+#include "absl/container/flat_hash_set.h"
+#else
+#include <unordered_set>
+#endif
+
+// By default ANTLRv4 uses containers provided by the C++ standard library. In most deployments this
+// is fine, however in some using custom containers may be preferred. This header allows that by
+// optionally supporting some alternative implementations and allowing for more easier patching of
+// other alternatives.
+
+namespace antlr4 {
+
+#if ANTLR4CPP_USING_ABSEIL
+  template <typename Key,
+            typename Hash = typename absl::flat_hash_set<Key>::hasher,
+            typename Equal = typename absl::flat_hash_set<Key>::key_equal,
+            typename Allocator = typename absl::flat_hash_set<Key>::allocator_type>
+  using FlatHashSet = absl::flat_hash_set<Key, Hash, Equal, Allocator>;
+#else
+  template <typename Key,
+            typename Hash = std::hash<Key>,
+            typename Equal = std::equal_to<Key>,
+            typename Allocator = std::allocator<Key>>
+  using FlatHashSet = std::unordered_set<Key, Hash, Equal, Allocator>;
+#endif
+
+} // namespace antlr4

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/Parser.cpp

@@ -20,6 +20,7 @@
 #include "Exceptions.h"
 #include "ANTLRErrorListener.h"
 #include "tree/pattern/ParseTreePattern.h"
+#include "internal/Synchronization.h"
 
 #include "atn/ProfilingATNSimulator.h"
 #include "atn/ParseInfo.h"
@@ -28,6 +29,7 @@
 
 using namespace antlr4;
 using namespace antlr4::atn;
+using namespace antlr4::internal;
 using namespace antlrcpp;
 
 namespace {
@@ -573,7 +575,7 @@ std::vector<std::string> Parser::getRuleInvocationStack(RuleContext *p) {
 std::vector<std::string> Parser::getDFAStrings() {
   atn::ParserATNSimulator *simulator = getInterpreter<atn::ParserATNSimulator>();
   if (!simulator->decisionToDFA.empty()) {
-    std::lock_guard<std::mutex> lck(_mutex);
+    UniqueLock<Mutex> lck(_mutex);
 
     std::vector<std::string> s;
     for (size_t d = 0; d < simulator->decisionToDFA.size(); d++) {
@@ -588,7 +590,7 @@ std::vector<std::string> Parser::getDFAStrings() {
 void Parser::dumpDFA() {
   atn::ParserATNSimulator *simulator = getInterpreter<atn::ParserATNSimulator>();
   if (!simulator->decisionToDFA.empty()) {
-    std::lock_guard<std::mutex> lck(_mutex);
+    UniqueLock<Mutex> lck(_mutex);
     bool seenOne = false;
     for (size_t d = 0; d < simulator->decisionToDFA.size(); d++) {
       dfa::DFA &dfa = simulator->decisionToDFA[d];

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.cpp

@@ -18,6 +18,7 @@
 
 using namespace antlr4;
 using namespace antlr4::atn;
+using namespace antlr4::internal;
 
 std::map<const dfa::Vocabulary*, std::map<std::string_view, size_t>> Recognizer::_tokenTypeMapCache;
 std::map<std::vector<std::string>, std::map<std::string, size_t>> Recognizer::_ruleIndexMapCache;
@@ -33,7 +34,7 @@ Recognizer::~Recognizer() {
 std::map<std::string_view, size_t> Recognizer::getTokenTypeMap() {
   const dfa::Vocabulary& vocabulary = getVocabulary();
 
-  std::lock_guard<std::mutex> lck(_mutex);
+  UniqueLock<Mutex> lck(_mutex);
   std::map<std::string_view, size_t> result;
   auto iterator = _tokenTypeMapCache.find(&vocabulary);
   if (iterator != _tokenTypeMapCache.end()) {
@@ -63,7 +64,7 @@ std::map<std::string, size_t> Recognizer::getRuleIndexMap() {
     throw "The current recognizer does not provide a list of rule names.";
   }
 
-  std::lock_guard<std::mutex> lck(_mutex);
+  UniqueLock<Mutex> lck(_mutex);
   std::map<std::string, size_t> result;
   auto iterator = _ruleIndexMapCache.find(ruleNames);
   if (iterator != _ruleIndexMapCache.end()) {

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/Recognizer.h

@@ -8,6 +8,7 @@
 #include "ProxyErrorListener.h"
 #include "support/Casts.h"
 #include "atn/SerializedATNView.h"
+#include "internal/Synchronization.h"
 
 namespace antlr4 {
 
@@ -142,7 +143,7 @@ namespace antlr4 {
     atn::ATNSimulator *_interpreter; // Set and deleted in descendants (or the profiler).
 
     // Mutex to manage synchronized access for multithreading.
-    std::mutex _mutex;
+    internal::Mutex _mutex;
 
   private:
     static std::map<const dfa::Vocabulary*, std::map<std::string_view, size_t>> _tokenTypeMapCache;

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/Version.h

@@ -28,7 +28,7 @@
 #include "antlr4-common.h"
 
 #define ANTLRCPP_VERSION_MAJOR 4
-#define ANTLRCPP_VERSION_MINOR 10
+#define ANTLRCPP_VERSION_MINOR 13
 #define ANTLRCPP_VERSION_PATCH 1
 
 #define ANTLRCPP_MAKE_VERSION(major, minor, patch) ((major) * 100000 + (minor) * 1000 + (patch))

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-common.h

@@ -21,9 +21,7 @@
 #include <limits>
 #include <map>
 #include <memory>
-#include <mutex>
 #include <set>
-#include <shared_mutex>
 #include <sstream>
 #include <stack>
 #include <string>
@@ -86,6 +84,11 @@
 #define ANTLR4CPP_INTERNAL_STRINGIFY(x) #x
 #define ANTLR4CPP_STRINGIFY(x) ANTLR4CPP_INTERNAL_STRINGIFY(x)
 
+// We use everything from the C++ standard library by default.
+#ifndef ANTLR4CPP_USING_ABSEIL
+#define ANTLR4CPP_USING_ABSEIL 0
+#endif
+
 #include "support/Declarations.h"
 
 // We have to undefine this symbol as ANTLR will use this name for own members and even

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/antlr4-runtime.h

@@ -165,5 +165,4 @@
 #include "tree/xpath/XPathTokenElement.h"
 #include "tree/xpath/XPathWildcardAnywhereElement.h"
 #include "tree/xpath/XPathWildcardElement.h"
-
-
+#include "internal/Synchronization.h"

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.cpp

@@ -18,6 +18,7 @@
 
 using namespace antlr4;
 using namespace antlr4::atn;
+using namespace antlr4::internal;
 using namespace antlrcpp;
 
 ATN::ATN() : ATN(ATNType::LEXER, 0) {}
@@ -38,7 +39,7 @@ misc::IntervalSet ATN::nextTokens(ATNState *s, RuleContext *ctx) const {
 
 misc::IntervalSet const& ATN::nextTokens(ATNState *s) const {
   if (!s->_nextTokenUpdated) {
-    std::unique_lock<std::mutex> lock(_mutex);
+    UniqueLock<Mutex> lock(_mutex);
     if (!s->_nextTokenUpdated) {
       s->_nextTokenWithinRule = nextTokens(s, nullptr);
       s->_nextTokenUpdated = true;

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATN.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include "RuleContext.h"
+#include "internal/Synchronization.h"
 
 // GCC generates a warning when forward-declaring ATN if ATN has already been
 // declared due to the attributes added by ANTLR4CPP_PUBLIC.
@@ -123,9 +124,9 @@ namespace atn {
     friend class LexerATNSimulator;
     friend class ParserATNSimulator;
 
-    mutable std::mutex _mutex;
-    mutable std::shared_mutex _stateMutex;
-    mutable std::shared_mutex _edgeMutex;
+    mutable internal::Mutex _mutex;
+    mutable internal::SharedMutex _stateMutex;
+    mutable internal::SharedMutex _edgeMutex;
   };
 
 } // namespace atn

data/ext/{express-parser → express_parser}/antlr4-upstream/runtime/Cpp/runtime/src/atn/ATNConfig.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+/* Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
@@ -23,7 +23,7 @@ inline constexpr size_t SUPPRESS_PRECEDENCE_FILTER = 0x40000000;
 }
 
 ATNConfig::ATNConfig(ATNState *state, size_t alt, Ref<const PredictionContext> context)
-    : ATNConfig(state, alt, std::move(context), 0, SemanticContext::NONE) {}
+    : ATNConfig(state, alt, std::move(context), 0, SemanticContext::Empty::Instance) {}
 
 ATNConfig::ATNConfig(ATNState *state, size_t alt, Ref<const PredictionContext> context, Ref<const SemanticContext> semanticContext)
     : ATNConfig(state, alt, std::move(context), 0, std::move(semanticContext)) {}
@@ -94,8 +94,8 @@ std::string ATNConfig::toString(bool showAlt) const {
   if (context) {
     ss << ",[" << context->toString() << "]";
   }
-  if (semanticContext != nullptr && semanticContext != SemanticContext::NONE) {
-    ss << ",[" << semanticContext->toString() << "]";
+  if (semanticContext != nullptr && semanticContext != SemanticContext::Empty::Instance) {
+    ss << "," << semanticContext->toString();
   }
   if (getOuterContextDepth() > 0) {
     ss << ",up=" << getOuterContextDepth();