diff --git a/.circleci/scripts/install-linux-dotnet.sh b/.circleci/scripts/install-linux-dotnet.sh index 1e23257e42..a20dc796e3 100755 --- a/.circleci/scripts/install-linux-dotnet.sh +++ b/.circleci/scripts/install-linux-dotnet.sh @@ -12,8 +12,3 @@ sudo apt-get update; \ export PATH=$PATH:~/.dotnet echo "done installing .Net SDK" -# we need to build the runtime before test run, since we used "--no-dependencies" -# when we call dotnet cli for restore and build, in order to speed up -echo "building runtime..." -dotnet build -c Release -f netstandard2.0 runtime/CSharp/src/Antlr4.csproj -echo "done building runtime" diff --git a/.github/scripts-macosx/run-tests-dotnet.sh b/.github/scripts-macosx/run-tests-dotnet.sh index 32788e1c85..481b66d897 100755 --- a/.github/scripts-macosx/run-tests-dotnet.sh +++ b/.github/scripts-macosx/run-tests-dotnet.sh @@ -6,11 +6,6 @@ set -euo pipefail export PATH=$PATH:~/.dotnet -# we need to build the runtime before test run, since we used "--no-dependencies" -# when we call dotnet cli for restore and build, in order to speed up - -dotnet build -c Release -f netstandard2.0 runtime/CSharp/Antlr4.csproj - # run tests pushd runtime-testsuite/ export MAVEN_OPTS="-Xmx8g" diff --git a/.github/scripts-windows/run-tests-cpp.cmd b/.github/scripts-windows/run-tests-cpp.cmd new file mode 100644 index 0000000000..8c2cde49aa --- /dev/null +++ b/.github/scripts-windows/run-tests-cpp.cmd @@ -0,0 +1,6 @@ +set ChocolateyInstall=C:\tools\chocolatey +C:\ProgramData\chocolatey\bin\cinst.exe visualstudio2022-workload-vctools -y + +cd runtime-testsuite +mvn -Dparallel=classes -DthreadCount=2 -Dtest=cpp.** test +cd .. diff --git a/.github/scripts-windows/run-tests-csharp.cmd b/.github/scripts-windows/run-tests-csharp.cmd index c5e1fb0a77..8017393c0a 100644 --- a/.github/scripts-windows/run-tests-csharp.cmd +++ b/.github/scripts-windows/run-tests-csharp.cmd @@ -1,5 +1,3 @@ -dotnet build runtime/CSharp/src/Antlr4.csproj -c Release -dotnet pack runtime/CSharp/src/Antlr4.csproj -c Release cd runtime-testsuite mvn -Dparallel=classes -DthreadCount=2 -Dtest=csharp.** test cd .. diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bd11f8b05a..71028e1045 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,21 +23,21 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@v4 with: - maven-version: 3.5.4 + maven-version: 3.5.4 # fails due to permissions, use global install # - name: Set up Python 2 # if: matrix.TARGET == 'python2' # uses: actions/setup-python@v2 # with: -# python-version: '2.x' -# architecture: 'x64' +# python-version: '2.x' +# architecture: 'x64' # fails due to permissions, use global install # - name: Set up Python 3 # if: matrix.TARGET == 'python3' # uses: actions/setup-python@v2 # with: -# python-version: '3.x' -# architecture: 'x64' +# python-version: '3.x' +# architecture: 'x64' - name: Set up Node 14 if: matrix.TARGET == 'javascript' uses: actions/setup-node@v2 @@ -59,7 +59,7 @@ jobs: if: matrix.TARGET == 'go' uses: actions/setup-go@v2 with: - go-version: '^1.13.1' + go-version: '^1.13.1' # requires manually setting up pwsh # fails due to incorrect script (missing printf) # - name: Setup PHP 8.2 @@ -67,7 +67,7 @@ jobs: # uses: shivammathur/setup-php@v2 # with: # php-version: '8.2' -# extensions: mbstring +# extensions: mbstring # tools: composer - name: Build tool with Maven run: mvn install -DskipTests=true -Darguments="-Dmaven.javadoc.skip=true" -B -V diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/CppVisualStudioProject.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/CppVisualStudioProject.stg new file mode 100644 index 0000000000..5a3822b41e --- /dev/null +++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/CppVisualStudioProject.stg @@ -0,0 +1,85 @@ +\ +\ + \ + \ + \Release\ + \x64\ + \ + \ + \ + \16.0\ + \Win32Proj\ + \{f3708606-c8fb-45ca-ae36-b729f91e972b}\ + \Test\ + \10.0\ + \ + \ + + \ + \Application\ + \false\ + \\ + \false\ \ + \Unicode\ + \ + + \ + \ + \ + \ + + \ + \false\ + \;$(IncludePath)\ + \$(VC_ReferencesPath_x64);\ + \$(SolutionDir)\ + \ + + \ + \ + \TurnOffAllWarnings\ + \false\ + \false\ + \false\ + \NDEBUG;_CONSOLE;%(PreprocessorDefinitions)\ + \true\ + \stdcpp17\ + \None\ + \ + \ + \Console\ + \true\ + \false\ + \false\ + \"\\antlr4-runtime.lib";%(AdditionalDependencies)\ + \ + \ + + \ + \ + \ + + + \ + \ + + + + \ + \ + \ + \ + + + + \ + \ + \ + \ + + + \ + \ + + \ +\ diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/BaseRuntimeTestSupport.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/BaseRuntimeTestSupport.java index 578e0cf3e1..c472587623 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/BaseRuntimeTestSupport.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/BaseRuntimeTestSupport.java @@ -8,6 +8,7 @@ import org.antlr.v4.runtime.atn.ATNSerializer; import org.antlr.v4.runtime.misc.IntegerList; import org.antlr.v4.semantics.SemanticPipeline; +import org.antlr.v4.test.runtime.cpp.BaseCppTest; import org.antlr.v4.tool.Grammar; import org.antlr.v4.tool.LexerGrammar; import org.junit.rules.TestRule; @@ -17,6 +18,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Paths; import java.util.*; import java.util.logging.Logger; @@ -202,9 +204,14 @@ else if (os.contains("nux")) { return detectedOS; } + private static Boolean isWindows; public static boolean isWindows() { - return getOS().equalsIgnoreCase("windows"); + if (isWindows == null) { + isWindows = getOS().equalsIgnoreCase("windows"); + } + + return isWindows; } protected ATN createATN(Grammar g, boolean useSerializer) { @@ -242,4 +249,12 @@ protected void semanticProcess(Grammar g) { } } + protected static String getTextFromResource(String name) { + try { + return new String(Files.readAllBytes(Paths.get(BaseCppTest.class.getClassLoader().getResource(name).toURI()))); + } + catch (Exception ex) { + return null; + } + } } diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java index 9f0f93b522..bce0f9128c 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java @@ -33,6 +33,85 @@ protected String getLanguage() { return "Cpp"; } + private static Boolean runtimeBuiltOnce = false; + + private static String runtimePath; + private static String runtimeSourcePath; + private static String runtimeBinaryPath; + private static String runtimeLibraryFileName; + + private static String compilerPath; + private static String visualStudioVersion; + private static String visualStudioProjectContent; + private static String visualStudioPlatformToolset; + + static { + initCompilerFileName(); + initRuntimePath(); + initBinaryPath(); + + if (isWindows()) { + visualStudioProjectContent = getTextFromResource("org/antlr/v4/test/runtime/helpers/CppVisualStudioProject.stg"); + } + } + + private static void initRuntimePath() { + final ClassLoader loader = Thread.currentThread().getContextClassLoader(); + final URL runtimeURL = loader.getResource("Cpp"); + if (runtimeURL == null) { + throw new RuntimeException("Cannot find runtime"); + } + // Windows not getting runtime right. See: + // http://stackoverflow.com/questions/6164448/convert-url-to-normal-windows-filename-java + // it was coming back "/C:/projects/antlr4-l7imv/runtime-testsuite/target/classes/Cpp" + try { + runtimePath = Paths.get(runtimeURL.toURI()).toFile().toString(); + runtimeSourcePath = Paths.get(runtimePath, "runtime", "src").toString(); + } catch (URISyntaxException use) { + runtimePath = "Can't find runtime at " + runtimeURL; + } + } + + private static void initCompilerFileName() { + if (isWindows()) { + visualStudioPlatformToolset = "v143"; + visualStudioVersion = "2022"; + String[] visualStudioVersions = new String[]{"2022", "2019"}; + String[] visualStudioEditions = new String[]{"BuildTools", "Community", "Professional", "Enterprise"}; + String[] programFilesPaths = new String[]{"Program Files", "Program Files (x86)"}; + + for (String version : visualStudioVersions) { + for (String edition : visualStudioEditions) { + for (String programFilesPath : programFilesPaths) { + String file = "C:\\" + programFilesPath + "\\Microsoft Visual Studio\\" + version + "\\" + + edition + "\\Msbuild\\Current\\Bin\\MSBuild.exe"; + if (new File(file).exists()) { + visualStudioPlatformToolset = version.equals("2022") ? "v143" : "v142"; + visualStudioVersion = version; + compilerPath = file; + return; + } + } + } + } + compilerPath = "MSBuild"; + } + else { + compilerPath = "clang++"; + } + } + + private static void initBinaryPath() { + if (isWindows()) { + runtimeBinaryPath = Paths.get(runtimePath, "runtime", "bin", "vs-" + visualStudioVersion, "x64", "Release DLL").toString(); + runtimeLibraryFileName = Paths.get(runtimeBinaryPath, "antlr4-runtime.dll").toString(); + } + else { + runtimeBinaryPath = Paths.get(runtimePath, "dist").toString(); + runtimeLibraryFileName = Paths.get(runtimeBinaryPath, "libantlr4-runtime." + (getOS().equals("mac") ? "dylib" : "so")).toString(); + } + } + protected String execLexer(String grammarFileName, String grammarStr, String lexerName, @@ -55,11 +134,9 @@ public String execLexer(String grammarFileName, assertTrue(success); writeFile(getTempDirPath(), "input", input); writeLexerTestFile(lexerName, showDFA); - String output = execModule("Test.cpp"); - return output; + return execModule("Test.cpp"); } - @Override public String execParser(String grammarFileName, String grammarStr, @@ -112,7 +189,7 @@ protected boolean rawGenerateAndBuildRecognizer(String grammarFileName, return false; } - List files = new ArrayList(); + List files = new ArrayList<>(); if ( lexerName!=null ) { files.add(lexerName+".cpp"); files.add(lexerName+".h"); @@ -159,7 +236,6 @@ public String execRecognizer() { return execModule("Test.cpp"); } - public List allCppFiles(String path) { ArrayList files = new ArrayList(); File folder = new File(path); @@ -173,104 +249,25 @@ public List allCppFiles(String path) { return files; } - private String runProcess(ProcessBuilder builder, String description, boolean showStderr) throws Exception { - // System.out.println("BUILDER: " + builder.command() + " @ " + builder.directory().toString()); - Process process = builder.start(); - StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream()); - StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream()); - stdoutVacuum.start(); - stderrVacuum.start(); - int errcode = process.waitFor(); - stdoutVacuum.join(); - stderrVacuum.join(); - String output = stdoutVacuum.toString(); - if ( stderrVacuum.toString().length()>0 ) { - setParseErrors(stderrVacuum.toString()); - if ( showStderr ) System.err.println(getParseErrors()); - } - if (errcode != 0) { - String err = "execution of '"+description+"' failed with error code: "+errcode; - if ( getParseErrors()!=null ) { - setParseErrors(getParseErrors() + err); - } - else { - setParseErrors(err); - } - } - - return output; - } - - private String runCommand(String[] command, String workPath, String description, boolean showStderr) throws Exception { - ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new File(workPath)); - - return runProcess(builder, description, showStderr); - } - - // TODO: add a buildRuntimeOnWindows variant. - private boolean buildRuntime() { - String runtimePath = locateRuntime(); - System.out.println("Building ANTLR4 C++ runtime (if necessary) at "+ runtimePath); - - try { - String[] command = { "cmake", ".", "-DCMAKE_BUILD_TYPE=Debug" }; - if (runCommand(command, runtimePath, "antlr runtime cmake", false) == null) { - return false; - } - } - catch (Exception e) { - System.err.println("can't configure antlr cpp runtime cmake file"); - } - - try { - String[] command = { "make", "-j", Integer.toString(Runtime.getRuntime().availableProcessors()) }; - if (runCommand(command, runtimePath, "building antlr runtime", true) == null) - return false; - } - catch (Exception e) { - System.err.println("can't compile antlr cpp runtime"); - e.printStackTrace(System.err); - try { - String[] command = { "ls", "-la" }; - String output = runCommand(command, runtimePath + "/dist/", "printing library folder content", true); - System.out.println(output); - } - catch (Exception e2) { - System.err.println("can't even list folder content"); - e2.printStackTrace(System.err); - } + public String execModule(String fileName) { + if (!buildRuntimeIfRequired()) { + return null; } -/* for debugging - try { - String command[] = { "ls", "-la" }; - String output = runCommand(command, runtimePath + "/dist/", "printing library folder content"); - System.out.println(output); - } - catch (Exception e) { - System.err.println("can't print folder content"); + if (!buildTestProject()) { + return null; } -*/ - return true; + return runTestProject(fileName); } - static Boolean runtimeBuiltOnce = false; - - public String execModule(String fileName) { - String runtimePath = locateRuntime(); - String includePath = runtimePath + "/runtime/src"; - String binPath = new File(getTempTestDir(), "a.out").getAbsolutePath(); - String inputPath = new File(getTempTestDir(), "input").getAbsolutePath(); - - // Build runtime using cmake once per VM. + private boolean buildRuntimeIfRequired() { synchronized (BaseCppTest.class) { if ( !runtimeBuiltOnce ) { try { - String[] command = {"clang++", "--version"}; - String output = runCommand(command, getTempDirPath(), "printing compiler version", false); - System.out.println("Compiler version is: "+output); + String output = runCommand(new String[] {compilerPath, "--version"}, + getTempDirPath(), "printing compiler version", false); + System.out.println("Compiler version is: " + output); } catch (Exception e) { System.err.println("Can't get compiler version"); @@ -279,87 +276,162 @@ public String execModule(String fileName) { runtimeBuiltOnce = true; if ( !buildRuntime() ) { System.out.println("C++ runtime build failed\n"); - return null; + return false; } System.out.println("C++ runtime build succeeded\n"); } } + return true; + } - // Create symlink to the runtime. Currently only used on OSX. - String libExtension = (getOS().equals("mac")) ? "dylib" : "so"; - try { - String[] command = { "ln", "-s", runtimePath + "/dist/libantlr4-runtime." + libExtension }; - if (runCommand(command, getTempDirPath(), "sym linking C++ runtime", true) == null) - return null; + private boolean buildRuntime() { + System.out.println("Building ANTLR4 C++ runtime (if necessary) at "+ runtimePath); + + if (isWindows()) { + String[] command = {compilerPath, "antlr4cpp-vs" + visualStudioVersion + ".vcxproj", "/p:configuration=Release DLL", "/p:platform=x64" }; + try { + runCommand(command, runtimePath + "\\runtime", "build ANTLR runtime using MSBuild", false); + } catch (Exception e) { + System.err.println("can't build antlr cpp runtime using MSBuild"); + } } - catch (Exception e) { - System.err.println("can't create link to " + runtimePath + "/dist/libantlr4-runtime." + libExtension); - e.printStackTrace(System.err); - return null; + else { + try { + String[] command = {"cmake", ".", "-DCMAKE_BUILD_TYPE=Release"}; + runCommand(command, runtimePath, "antlr runtime cmake", false); + } catch (Exception e) { + System.err.println("can't configure antlr cpp runtime cmake file"); + } + + try { + String[] command = {"make", "-j", Integer.toString(Runtime.getRuntime().availableProcessors())}; + runCommand(command, runtimePath, "building antlr runtime", true); + } catch (Exception e) { + System.err.println("can't compile antlr cpp runtime"); + e.printStackTrace(System.err); + try { + String[] command = {"ls", "-la"}; + String output = runCommand(command, runtimeBinaryPath, "printing library folder content", true); + System.out.println(output); + } catch (Exception e2) { + System.err.println("can't even list folder content"); + e2.printStackTrace(System.err); + } + } } - try { - List command2 = new ArrayList(Arrays.asList("clang++", "-std=c++17", "-I", includePath, "-L.", "-lantlr4-runtime", "-pthread", "-o", "a.out")); - command2.addAll(allCppFiles(getTempDirPath())); - if (runCommand(command2.toArray(new String[0]), getTempDirPath(), "building test binary", true) == null) { - return null; + return true; + } + + private boolean buildTestProject() { + if (!isWindows()) { + try { + String[] linkCommand = new String[]{"ln", "-s", runtimeLibraryFileName}; + runCommand(linkCommand, getTempDirPath(), "sym linking C++ runtime", true); + } catch (Exception e) { + System.err.println("can't create link to " + runtimeLibraryFileName); + e.printStackTrace(System.err); + return false; } } - catch (Exception e) { + + try { + List buildCommand = new ArrayList<>(); + buildCommand.add(compilerPath); + if (isWindows()) { + buildCommand.add("Test.vcxproj"); + buildCommand.add("/p:configuration=Release"); + buildCommand.add("/p:platform=x64"); + } + else { + buildCommand.add("-std=c++17"); + buildCommand.add("-I"); + buildCommand.add(runtimeSourcePath); + buildCommand.add("-L."); + buildCommand.add("-lantlr4-runtime"); + buildCommand.add("-pthread"); + buildCommand.add("-o"); + buildCommand.add("Test.out"); + buildCommand.addAll(allCppFiles(getTempDirPath())); + } + runCommand(buildCommand.toArray(new String[0]), getTempDirPath(), "building test binary", true); + } catch (Exception e) { System.err.println("can't compile test module: " + e.getMessage()); e.printStackTrace(System.err); - return null; + return false; } + return true; + } + + private String runTestProject(String fileName) { // Now run the newly minted binary. Reset the error output, as we could have got compiler warnings which are not relevant here. setParseErrors(null); try { - ProcessBuilder builder = new ProcessBuilder(binPath, inputPath); + String inputPath = new File(getTempTestDir(), "input").getAbsolutePath(); + String exePath = new File(getTempTestDir(), "Test." + (isWindows() ? "exe" : "out")).getAbsolutePath(); + ProcessBuilder builder = new ProcessBuilder(exePath, inputPath); builder.directory(getTempTestDir()); + Map env = builder.environment(); - env.put("LD_PRELOAD", runtimePath + "/dist/libantlr4-runtime." + libExtension); + if (isWindows()) { + env.put("PATH", runtimeBinaryPath); + } else { + env.put("LD_PRELOAD", runtimeLibraryFileName); + } + String output = runProcess(builder, "running test binary", false); if ( output.length()==0 ) { output = null; } - /* for debugging - System.out.println("========================================================="); - System.out.println(output); - System.out.println("========================================================="); - */ return output; } catch (Exception e) { System.err.println("can't exec module: " + fileName); e.printStackTrace(System.err); } - return null; } - protected String locateRuntime() { - final ClassLoader loader = Thread.currentThread().getContextClassLoader(); - final URL runtimeURL = loader.getResource("Cpp"); - if (runtimeURL == null) { - throw new RuntimeException("Cannot find runtime"); - } - // Windows not getting runtime right. See: - // http://stackoverflow.com/questions/6164448/convert-url-to-normal-windows-filename-java - // it was coming back "/C:/projects/antlr4-l7imv/runtime-testsuite/target/classes/Cpp" - String p; - try { - p = Paths.get(runtimeURL.toURI()).toFile().toString(); + private String runCommand(String[] command, String workPath, String description, boolean showStderr) throws Exception { + ProcessBuilder builder = new ProcessBuilder(command); + builder.directory(new File(workPath)); + return runProcess(builder, description, showStderr); + } + + private String runProcess(ProcessBuilder builder, String description, boolean showStderr) throws Exception { + Process process = builder.start(); + StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream()); + StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream()); + stdoutVacuum.start(); + stderrVacuum.start(); + int errcode = process.waitFor(); + stdoutVacuum.join(); + stderrVacuum.join(); + String output = stdoutVacuum.toString(); + if ( stderrVacuum.toString().length()>0 ) { + setParseErrors(stderrVacuum.toString()); + if ( showStderr ) System.err.println(getParseErrors()); } - catch (URISyntaxException use) { - p = "Can't find runtime at " + runtimeURL; + if (errcode != 0) { + String err = "execution of '"+description+"' failed with error code: "+errcode; + if ( getParseErrors()!=null ) { + setParseErrors(getParseErrors() + err); + } + else { + setParseErrors(err); + } } - return p; + + return output; } - protected void writeParserTestFile(String parserName, String lexerName, + private void writeParserTestFile(String parserName, String lexerName, String listenerName, String visitorName, String parserStartRuleName, boolean debug, boolean trace) { + writeVisualStudioProjectFile(lexerName, parserName, listenerName, visitorName); + if(!parserStartRuleName.endsWith(")")) parserStartRuleName += "()"; ST outputFileST = new ST( @@ -421,7 +493,9 @@ protected void writeParserTestFile(String parserName, String lexerName, writeFile(getTempDirPath(), "Test.cpp", outputFileST.render()); } - protected void writeLexerTestFile(String lexerName, boolean showDFA) { + private void writeLexerTestFile(String lexerName, boolean showDFA) { + writeVisualStudioProjectFile(lexerName, null, null, null); + ST outputFileST = new ST( "#include \\\n" + "\n" @@ -447,5 +521,24 @@ protected void writeLexerTestFile(String lexerName, boolean showDFA) { writeFile(getTempDirPath(), "Test.cpp", outputFileST.render()); } + private void writeVisualStudioProjectFile(String lexerName, String parserName, String listenerName, String visitorName) { + if (isWindows()) { + ST projectFileST = new ST(visualStudioProjectContent); + projectFileST.add("platformToolset", visualStudioPlatformToolset); + projectFileST.add("runtimeSourcePath", runtimeSourcePath); + projectFileST.add("runtimeBinaryPath", runtimeBinaryPath); + projectFileST.add("lexerName", lexerName); + if (parserName != null) { + projectFileST.add("parserName", parserName); + String grammarName = parserName.endsWith("Parser") + ? parserName.substring(0, parserName.length() - "Parser".length()) + : parserName; + projectFileST.add("grammarName", grammarName); + projectFileST.add("useListener", listenerName != null); + projectFileST.add("useVisitor", visitorName != null); + } + writeFile(getTempDirPath(), "Test.vcxproj", projectFileST.render()); + } + } } diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/php/BasePHPTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/php/BasePHPTest.java index ec6d4fda8e..064641c357 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/php/BasePHPTest.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/php/BasePHPTest.java @@ -252,7 +252,7 @@ private String locateTool(String tool) { } } - throw new RuntimeException("Could not locate " + tool); + return "php"; } protected String locatePhp() { @@ -266,7 +266,7 @@ protected String locatePhp() { File file = new File(prop); if (!file.exists()) { - throw new RuntimeException("Missing system property:" + propName); + return "php"; } return file.getAbsolutePath(); diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/python/BasePythonTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/python/BasePythonTest.java index 126e2e0552..dba628f155 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/python/BasePythonTest.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/python/BasePythonTest.java @@ -205,7 +205,7 @@ private String locateTool(List tools) { } } } - throw new RuntimeException("Could not locate " + tools); + return "python"; } protected String locatePython() { @@ -215,7 +215,7 @@ protected String locatePython() { prop = locateTool(getPythonExecutables()); File file = new File(prop); if(!file.exists()) - throw new RuntimeException("Missing system property:" + propName); + return "python"; return file.getAbsolutePath(); } diff --git a/runtime/Cpp/README.md b/runtime/Cpp/README.md index 7ce591ca50..622289ba77 100644 --- a/runtime/Cpp/README.md +++ b/runtime/Cpp/README.md @@ -43,9 +43,9 @@ If you are compiling with cmake, the minimum version required is cmake 2.8. By default, the libraries produced by the CMake build target C++11. If you want to target a different C++ standard, you can explicitly pass the standard - e.g. `-DCMAKE_CXX_STANDARD=17`. #### Compiling on Windows with Visual Studio using he Visual Studio projects -Simply open the VS project from the runtime folder (VS 2013+) and build it. +Simply open the VS project from the runtime folder (VS 2019+) and build it. -#### Compiling on Windows using cmake with Visual Studio VS2017 and later +#### Compiling on Windows using cmake with Visual Studio VS2019 and later Use the "Open Folder" Feature from the File->Open->Folder menu to open the runtime/Cpp directory. It will automatically use the CMake description to open up a Visual Studio Solution. diff --git a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2015.vcxproj b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2022.vcxproj similarity index 94% rename from runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2015.vcxproj rename to runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2022.vcxproj index f004fb06ce..ef29a4ecce 100644 --- a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2015.vcxproj +++ b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2022.vcxproj @@ -39,58 +39,58 @@ Win32Proj antlr4cppdemo antlr4cpp-demo - 8.1 + 10.0 Application true - v140 + v143 Unicode Application true - v140 + v143 Unicode Application true - v140 + v143 Unicode Application true - v140 + v143 Unicode Application false - v140 + v143 true Unicode Application false - v140 + v143 true Unicode Application false - v140 + v143 true Unicode Application false - v140 + v143 true Unicode @@ -124,42 +124,42 @@ true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ @@ -216,6 +216,7 @@ 4251 true false + stdcpp17 Console @@ -236,6 +237,7 @@ 4251 true false + stdcpp17 Console @@ -350,9 +352,10 @@ + - + {a9762991-1b57-4dce-90c0-ee42b96947be} diff --git a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2015.vcxproj.filters b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2022.vcxproj.filters similarity index 96% rename from runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2015.vcxproj.filters rename to runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2022.vcxproj.filters index ed56184124..e191b9354b 100644 --- a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2015.vcxproj.filters +++ b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo-vs2022.vcxproj.filters @@ -59,5 +59,8 @@ generated + + Header Files + \ No newline at end of file diff --git a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo.vcxproj b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo.vcxproj deleted file mode 100644 index ec6240de0e..0000000000 --- a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo.vcxproj +++ /dev/null @@ -1,349 +0,0 @@ - - - - - Debug DLL - Win32 - - - Debug DLL - x64 - - - Debug Static - Win32 - - - Debug Static - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - Release Static - Win32 - - - Release Static - x64 - - - - {24EC5104-7402-4C76-B66B-27ADBE062D68} - Win32Proj - antlr4cppdemo - antlr4cpp-demo - - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - $(SolutionDir)..\generated;$(SolutionDir)..\..\runtime\src;$(SolutionDir)..\..\runtime\src\atn;$(SolutionDir)..\..\runtime\src\dfa;$(SolutionDir)..\..\runtime\src\misc;$(SolutionDir)..\..\runtime\src\support;$(SolutionDir)..\..\runtime\src\tree;$(SolutionDir)..\..\runtime\src\tree\xpath;$(SolutionDir)..\..\runtime\src\tree\pattern;%(AdditionalIncludeDirectories) - - - 4251 - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - - - - {a9762991-1b57-4dce-90c0-ee42b96947be} - - - - - - \ No newline at end of file diff --git a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo.vcxproj.filters b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo.vcxproj.filters deleted file mode 100644 index ed56184124..0000000000 --- a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/antlr4-cpp-demo.vcxproj.filters +++ /dev/null @@ -1,63 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {ef397b7b-1192-4d44-93ed-fadaec7622e8} - - - - - Source Files - - - generated - - - generated - - - generated - - - generated - - - generated - - - generated - - - - - generated - - - generated - - - generated - - - generated - - - generated - - - generated - - - \ No newline at end of file diff --git a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/main.cpp b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/main.cpp index fa470e5ed6..b620ad018b 100644 --- a/runtime/Cpp/demo/Windows/antlr4-cpp-demo/main.cpp +++ b/runtime/Cpp/demo/Windows/antlr4-cpp-demo/main.cpp @@ -25,17 +25,15 @@ using namespace antlr4; int main(int argc, const char * argv[]) { - ANTLRInputStream input("🍴 = 🍐 + \"😎\";(((x * π))) * µ + ∰; a + (x * (y ? 0 : 1) + z);"); + ANTLRInputStream input("a = b + \"c\";(((x * d))) * e + f; a + (x * (y ? 0 : 1) + z);"); TLexer lexer(&input); CommonTokenStream tokens(&lexer); TParser parser(&tokens); tree::ParseTree *tree = parser.main(); - std::wstring s = antlrcpp::s2ws(tree->toStringTree(&parser)) + L"\n"; - - OutputDebugString(s.data()); // Only works properly since VS 2015. - //std::wcout << "Parse Tree: " << s << std::endl; Unicode output in the console is very limited. + auto s = tree->toStringTree(&parser); + std::cout << "Parse Tree: " << s << std::endl; return 0; } diff --git a/runtime/Cpp/demo/Windows/antlr4cpp-vs2013.sln b/runtime/Cpp/demo/Windows/antlr4cpp-vs2013.sln deleted file mode 100644 index 931aeb3eb2..0000000000 --- a/runtime/Cpp/demo/Windows/antlr4cpp-vs2013.sln +++ /dev/null @@ -1,58 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr4cpp-demo", "antlr4-cpp-demo\antlr4-cpp-demo.vcxproj", "{24EC5104-7402-4C76-B66B-27ADBE062D68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr4cpp-vs2013", "..\..\runtime\antlr4cpp-vs2013.vcxproj", "{A9762991-1B57-4DCE-90C0-EE42B96947BE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug DLL|Win32 = Debug DLL|Win32 - Debug DLL|x64 = Debug DLL|x64 - Debug Static|Win32 = Debug Static|Win32 - Debug Static|x64 = Debug Static|x64 - Release DLL|Win32 = Release DLL|Win32 - Release DLL|x64 = Release DLL|x64 - Release Static|Win32 = Release Static|Win32 - Release Static|x64 = Release Static|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|x64.ActiveCfg = Debug DLL|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|x64.Build.0 = Debug DLL|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug Static|Win32.Build.0 = Debug Static|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug Static|x64.ActiveCfg = Debug Static|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug Static|x64.Build.0 = Debug Static|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release DLL|Win32.Build.0 = Release DLL|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release DLL|x64.Build.0 = Release DLL|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release Static|Win32.ActiveCfg = Release Static|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release Static|Win32.Build.0 = Release Static|Win32 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release Static|x64.ActiveCfg = Release Static|x64 - {24EC5104-7402-4C76-B66B-27ADBE062D68}.Release Static|x64.Build.0 = Release Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|x64.ActiveCfg = Debug DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|x64.Build.0 = Debug DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|Win32.Build.0 = Debug Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|x64.ActiveCfg = Debug Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|x64.Build.0 = Debug Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|Win32.Build.0 = Release DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|x64.Build.0 = Release DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|Win32.ActiveCfg = Release Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|Win32.Build.0 = Release Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|x64.ActiveCfg = Release Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|x64.Build.0 = Release Static|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/runtime/Cpp/demo/Windows/antlr4cpp-vs2015.sln b/runtime/Cpp/demo/Windows/antlr4cpp-vs2022.sln similarity index 65% rename from runtime/Cpp/demo/Windows/antlr4cpp-vs2015.sln rename to runtime/Cpp/demo/Windows/antlr4cpp-vs2022.sln index 6bf253d08d..bcda88e1e6 100644 --- a/runtime/Cpp/demo/Windows/antlr4cpp-vs2015.sln +++ b/runtime/Cpp/demo/Windows/antlr4cpp-vs2022.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr4cpp-vs2015", "..\..\runtime\antlr4cpp-vs2015.vcxproj", "{A9762991-1B57-4DCE-90C0-EE42B96947BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr4cpp-vs2022", "..\..\runtime\antlr4cpp-vs2022.vcxproj", "{52618D4B-6EC4-49AD-8B83-52686244E8F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr4cpp-demo", "antlr4-cpp-demo\antlr4-cpp-demo-vs2015.vcxproj", "{24EC5104-7402-4C76-B66B-27ADBE062D68}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr4cpp-demo", "antlr4-cpp-demo\antlr4-cpp-demo-vs2022.vcxproj", "{24EC5104-7402-4C76-B66B-27ADBE062D68}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,22 +19,22 @@ Global Release Static|x86 = Release Static|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|x64.ActiveCfg = Debug DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|x64.Build.0 = Debug DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|x86.ActiveCfg = Debug DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug DLL|x86.Build.0 = Debug DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|x64.ActiveCfg = Debug Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|x64.Build.0 = Debug Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|x86.ActiveCfg = Debug Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Debug Static|x86.Build.0 = Debug Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|x64.Build.0 = Release DLL|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|x86.ActiveCfg = Release DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release DLL|x86.Build.0 = Release DLL|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|x64.ActiveCfg = Release Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|x64.Build.0 = Release Static|x64 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|x86.ActiveCfg = Release Static|Win32 - {A9762991-1B57-4DCE-90C0-EE42B96947BE}.Release Static|x86.Build.0 = Release Static|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug DLL|x64.ActiveCfg = Debug DLL|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug DLL|x64.Build.0 = Debug DLL|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug DLL|x86.ActiveCfg = Debug DLL|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug DLL|x86.Build.0 = Debug DLL|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug Static|x64.ActiveCfg = Debug Static|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug Static|x64.Build.0 = Debug Static|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug Static|x86.ActiveCfg = Debug Static|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Debug Static|x86.Build.0 = Debug Static|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release DLL|x64.ActiveCfg = Release DLL|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release DLL|x64.Build.0 = Release DLL|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release DLL|x86.ActiveCfg = Release DLL|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release DLL|x86.Build.0 = Release DLL|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release Static|x64.ActiveCfg = Release Static|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release Static|x64.Build.0 = Release Static|x64 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release Static|x86.ActiveCfg = Release Static|Win32 + {52618D4B-6EC4-49AD-8B83-52686244E8F3}.Release Static|x86.Build.0 = Release Static|Win32 {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|x64.ActiveCfg = Debug DLL|x64 {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|x64.Build.0 = Debug DLL|x64 {24EC5104-7402-4C76-B66B-27ADBE062D68}.Debug DLL|x86.ActiveCfg = Debug DLL|Win32 @@ -55,4 +55,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {93CE9298-807C-4EAD-B1E6-7109DD1A78FA} + EndGlobalSection EndGlobal diff --git a/runtime/Cpp/deploy-windows.cmd b/runtime/Cpp/deploy-windows.cmd index 8fc22ab5b1..0a7b3564c0 100644 --- a/runtime/Cpp/deploy-windows.cmd +++ b/runtime/Cpp/deploy-windows.cmd @@ -8,58 +8,58 @@ if exist bin rmdir /S /Q runtime\bin if exist obj rmdir /S /Q runtime\obj if exist lib rmdir /S /Q lib if exist antlr4-runtime rmdir /S /Q antlr4-runtime -if exist antlr4-cpp-runtime-vs2017.zip erase antlr4-cpp-runtime-vs2017.zip if exist antlr4-cpp-runtime-vs2019.zip erase antlr4-cpp-runtime-vs2019.zip +if exist antlr4-cpp-runtime-vs2022.zip erase antlr4-cpp-runtime-vs2022.zip rem Headers echo Copying header files ... xcopy runtime\src\*.h antlr4-runtime\ /s /q rem Binaries -rem VS 2017 disabled by default. Change the X to a C to enable it. -if exist "X:\Program Files (x86)\Microsoft Visual Studio\2017\%1\Common7\Tools\VsDevCmd.bat" ( +rem VS 2019 disabled by default. Change the X to a C to enable it. +if exist "X:\Program Files (x86)\Microsoft Visual Studio\2019\%1\Common7\Tools\VsDevCmd.bat" ( echo. - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\%1\Common7\Tools\VsDevCmd.bat" + + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\%1\Common7\Tools\VsDevCmd.bat" pushd runtime - msbuild antlr4cpp-vs2017.vcxproj /p:configuration="Release DLL" /p:platform=Win32 - msbuild antlr4cpp-vs2017.vcxproj /p:configuration="Release DLL" /p:platform=x64 + msbuild antlr4cpp-vs2019.vcxproj /p:configuration="Release DLL" /p:platform=Win32 + msbuild antlr4cpp-vs2019.vcxproj /p:configuration="Release DLL" /p:platform=x64 popd - - 7z a antlr4-cpp-runtime-vs2017.zip antlr4-runtime + + 7z a antlr4-cpp-runtime-vs2019.zip antlr4-runtime xcopy runtime\bin\*.dll lib\ /s xcopy runtime\bin\*.lib lib\ /s - 7z a antlr4-cpp-runtime-vs2017.zip lib - + 7z a antlr4-cpp-runtime-vs2019.zip lib + rmdir /S /Q lib rmdir /S /Q runtime\bin rmdir /S /Q runtime\obj - - rem if exist antlr4-cpp-runtime-vs2017.zip copy antlr4-cpp-runtime-vs2017.zip ~/antlr/sites/website-antlr4/download + + rem if exist antlr4-cpp-runtime-vs2019.zip copy antlr4-cpp-runtime-vs2019.zip ~/antlr/sites/website-antlr4/download ) -set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2019\%1\MSBuild\Microsoft\VC\v160\ -if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\%1\Common7\Tools\VsDevCmd.bat" ( +set VCTargetsPath=C:\Program Files\Microsoft Visual Studio\2022\%1\MSBuild\Microsoft\VC\v170\ +if exist "C:\Program Files\Microsoft Visual Studio\2022\%1\Common7\Tools\VsDevCmd.bat" ( echo. - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\%1\Common7\Tools\VsDevCmd.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\%1\Common7\Tools\VsDevCmd.bat" pushd runtime - msbuild antlr4cpp-vs2019.vcxproj /p:configuration="Release DLL" /p:platform=Win32 - msbuild antlr4cpp-vs2019.vcxproj /p:configuration="Release DLL" /p:platform=x64 + msbuild antlr4cpp-vs2022.vcxproj /p:configuration="Release DLL" /p:platform=Win32 + msbuild antlr4cpp-vs2022.vcxproj /p:configuration="Release DLL" /p:platform=x64 popd - - 7z a antlr4-cpp-runtime-vs2019.zip antlr4-runtime + + 7z a antlr4-cpp-runtime-vs2022.zip antlr4-runtime xcopy runtime\bin\*.dll lib\ /s xcopy runtime\bin\*.lib lib\ /s - 7z a antlr4-cpp-runtime-vs2019.zip lib - + 7z a antlr4-cpp-runtime-vs2022.zip lib + rmdir /S /Q lib rmdir /S /Q runtime\bin rmdir /S /Q runtime\obj - - rem if exist antlr4-cpp-runtime-vs2019.zip copy antlr4-cpp-runtime-vs2019.zip ~/antlr/sites/website-antlr4/download + + rem if exist antlr4-cpp-runtime-vs2022.zip copy antlr4-cpp-runtime-vs2022.zip ~/antlr/sites/website-antlr4/download ) rmdir /S /Q antlr4-runtime @@ -70,7 +70,7 @@ goto end :Usage -echo This script builds Visual Studio 2017 and/or 2019 libraries of the ANTLR4 runtime. +echo This script builds Visual Studio 2019 and/or 2022 libraries of the ANTLR4 runtime. echo You have to specify the type of your VS installation (Community, Professional etc.) to construct echo the correct build tools path. echo. diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj b/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj deleted file mode 100644 index 83f76113ef..0000000000 --- a/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj +++ /dev/null @@ -1,643 +0,0 @@ - - - - - Debug Static - Win32 - - - Debug Static - x64 - - - Debug DLL - Win32 - - - Debug DLL - x64 - - - Release Static - Win32 - - - Release Static - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - - {229A61DC-1207-4E4E-88B0-F4CB7205672D} - Win32Proj - antlr4cpp - - - - DynamicLibrary - true - Unicode - v120 - - - StaticLibrary - true - Unicode - v120 - - - DynamicLibrary - true - Unicode - v120 - - - StaticLibrary - true - Unicode - v120 - - - DynamicLibrary - false - true - Unicode - v120 - - - StaticLibrary - false - true - Unicode - v120 - - - DynamicLibrary - false - true - Unicode - v120 - - - StaticLibrary - false - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - true - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2013\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - - Level4 - Disabled - ANTLR4CPP_DLL;ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - - - - - Level4 - Disabled - ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - - - - - Level4 - Disabled - ANTLR4CPP_DLL;ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - - - - - Level4 - Disabled - ANTLR4CPP_STATIC;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_DLL;ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - true - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - true - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_DLL;ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - true - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_STATIC;%(PreprocessorDefinitions) - src/tree;src;%(AdditionalIncludeDirectories) - - - - - 4251 - stdcpp17 - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters b/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters deleted file mode 100644 index 8573ee8373..0000000000 --- a/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj.filters +++ /dev/null @@ -1,987 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {587a2726-4856-4d21-937a-fbaebaa90232} - - - {2662156f-1508-4dad-b991-a8298a6db9bf} - - - {5b1e59b1-7fa5-46a5-8d92-965bd709cca0} - - - {9de9fe74-5d67-441d-a972-3cebe6dfbfcc} - - - {89fd3896-0ab1-476d-8d64-a57f10a5e73b} - - - {23939d7b-8e11-421e-80eb-b2cfdfdd64e9} - - - {05f2bacb-b5b2-4ca3-abe1-ca9a7239ecaa} - - - {d3b2ae2d-836b-4c73-8180-aca4ebb7d658} - - - {6674a0f0-c65d-4a00-a9e5-1f243b89d0a2} - - - {1893fffe-7a2b-4708-8ce5-003aa9b749f7} - - - {053a0632-27bc-4043-b5e8-760951b3b5b9} - - - {048c180d-44cf-49ca-a7aa-d0053fea07f5} - - - {3181cae5-cc15-4050-8c45-22af44a823de} - - - {290632d2-c56e-4005-a417-eb83b9531e1a} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\dfa - - - Header Files\dfa - - - Header Files\dfa - - - Header Files\dfa - - - Header Files\misc - - - Header Files\misc - - - Header Files\misc - - - Header Files\misc - - - Header Files\support - - - Header Files\support - - - Header Files\support - - - Header Files\support - - - Header Files\support - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\xpath - - - Header Files - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\misc - - - Header Files - - - Header Files - - - Header Files\support - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files - - - Header Files - - - Source Files\support - - - Header Files\tree - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\dfa - - - Source Files\dfa - - - Source Files\dfa - - - Source Files\dfa - - - Source Files\misc - - - Source Files\misc - - - Source Files\misc - - - Source Files\support - - - Source Files\support - - - Source Files\support - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files - - - Source Files - - - Source Files\support - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files - - - Source Files\tree - - - Source Files\tree - - - Source Files - - - Source Files - - - Source Files - - - Source Files\atn - - - Source Files\atn - - - Source Files\misc - - - Source Files - - - Source Files - - - Source Files - - - Source Files\support - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree\pattern - - - \ No newline at end of file diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj b/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj deleted file mode 100644 index 8ad1d01b6f..0000000000 --- a/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj +++ /dev/null @@ -1,659 +0,0 @@ - - - - - Debug Static - Win32 - - - Debug Static - x64 - - - Debug DLL - Win32 - - - Debug DLL - x64 - - - Release Static - Win32 - - - Release Static - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - - {83BE66CD-9C4F-4F84-B72A-DD1855C8FC8A} - Win32Proj - antlr4cpp - 10.0.16299.0 - - - - DynamicLibrary - true - Unicode - v141 - - - StaticLibrary - true - Unicode - v141 - - - DynamicLibrary - true - Unicode - v141 - - - StaticLibrary - true - Unicode - v141 - - - DynamicLibrary - false - true - Unicode - v141 - - - StaticLibrary - false - true - Unicode - v141 - - - DynamicLibrary - false - true - Unicode - v141 - - - StaticLibrary - false - true - Unicode - v141 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - true - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - true - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - true - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - false - $(SolutionDir)bin\vs-2017\$(PlatformTarget)\$(Configuration)\ - $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - antlr4-runtime - - - - Level4 - Disabled - ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - false - stdcpp17 - - - Windows - true - - - - - Level4 - Disabled - ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - false - stdcpp17 - - - Windows - true - - - - - Level4 - Disabled - ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - false - stdcpp17 - - - Windows - true - - - - - Level4 - Disabled - ANTLR4CPP_STATIC;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - false - stdcpp17 - - - Windows - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_DLL;ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - stdcpp17 - - - Windows - true - true - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - stdcpp17 - - - Windows - true - true - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_DLL;ANTLR4CPP_EXPORTS;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - stdcpp17 - - - Windows - true - true - true - - - - - Level4 - MaxSpeed - true - true - ANTLR4CPP_STATIC;%(PreprocessorDefinitions) - src;%(AdditionalIncludeDirectories) - - - - - 4251 - true - stdcpp17 - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters b/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters deleted file mode 100644 index 8573ee8373..0000000000 --- a/runtime/Cpp/runtime/antlr4cpp-vs2017.vcxproj.filters +++ /dev/null @@ -1,987 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {587a2726-4856-4d21-937a-fbaebaa90232} - - - {2662156f-1508-4dad-b991-a8298a6db9bf} - - - {5b1e59b1-7fa5-46a5-8d92-965bd709cca0} - - - {9de9fe74-5d67-441d-a972-3cebe6dfbfcc} - - - {89fd3896-0ab1-476d-8d64-a57f10a5e73b} - - - {23939d7b-8e11-421e-80eb-b2cfdfdd64e9} - - - {05f2bacb-b5b2-4ca3-abe1-ca9a7239ecaa} - - - {d3b2ae2d-836b-4c73-8180-aca4ebb7d658} - - - {6674a0f0-c65d-4a00-a9e5-1f243b89d0a2} - - - {1893fffe-7a2b-4708-8ce5-003aa9b749f7} - - - {053a0632-27bc-4043-b5e8-760951b3b5b9} - - - {048c180d-44cf-49ca-a7aa-d0053fea07f5} - - - {3181cae5-cc15-4050-8c45-22af44a823de} - - - {290632d2-c56e-4005-a417-eb83b9531e1a} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\dfa - - - Header Files\dfa - - - Header Files\dfa - - - Header Files\dfa - - - Header Files\misc - - - Header Files\misc - - - Header Files\misc - - - Header Files\misc - - - Header Files\support - - - Header Files\support - - - Header Files\support - - - Header Files\support - - - Header Files\support - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\pattern - - - Header Files\tree\xpath - - - Header Files - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\atn - - - Header Files\misc - - - Header Files - - - Header Files - - - Header Files\support - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files\tree\xpath - - - Header Files - - - Header Files - - - Source Files\support - - - Header Files\tree - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\dfa - - - Source Files\dfa - - - Source Files\dfa - - - Source Files\dfa - - - Source Files\misc - - - Source Files\misc - - - Source Files\misc - - - Source Files\support - - - Source Files\support - - - Source Files\support - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\tree\pattern - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - - - Source Files - - - Source Files - - - Source Files\support - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files\tree\xpath - - - Source Files - - - Source Files\tree - - - Source Files\tree - - - Source Files - - - Source Files - - - Source Files - - - Source Files\atn - - - Source Files\atn - - - Source Files\misc - - - Source Files - - - Source Files - - - Source Files - - - Source Files\support - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree - - - Source Files\tree\pattern - - - \ No newline at end of file diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj b/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj index d5df910b8a..468c33a666 100644 --- a/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj +++ b/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj @@ -354,7 +354,6 @@ - @@ -363,19 +362,13 @@ - - - - - - @@ -393,30 +386,24 @@ - - - + + - - - - - @@ -436,6 +423,7 @@ + @@ -460,13 +448,12 @@ - + - @@ -481,7 +468,6 @@ - @@ -501,12 +487,10 @@ - - @@ -523,12 +507,10 @@ - - @@ -558,6 +540,9 @@ + + + @@ -590,6 +575,7 @@ + @@ -601,7 +587,6 @@ - @@ -615,10 +600,12 @@ + - + + @@ -641,8 +628,6 @@ - - @@ -664,4 +649,4 @@ - + \ No newline at end of file diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters b/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters index 8573ee8373..f2cd0aa9d4 100644 --- a/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters +++ b/runtime/Cpp/runtime/antlr4cpp-vs2019.vcxproj.filters @@ -55,6 +55,12 @@ {290632d2-c56e-4005-a417-eb83b9531e1a} + + {b4b32b3f-e97a-448a-98e6-cbf901862bd4} + + + {f8c2bdf9-7e81-4f31-ba17-06b16ba2f081} + @@ -177,9 +183,6 @@ Header Files\atn - - Header Files\atn - Header Files\atn @@ -261,9 +264,6 @@ Header Files\atn - - Header Files\atn - Header Files\atn @@ -309,9 +309,6 @@ Header Files\atn - - Header Files\atn - Header Files\dfa @@ -333,9 +330,6 @@ Header Files\misc - - Header Files\misc - Header Files\support @@ -348,9 +342,6 @@ Header Files\support - - Header Files\support - Header Files\tree @@ -375,12 +366,6 @@ Header Files\tree - - Header Files\tree - - - Header Files\tree - Header Files\tree @@ -525,18 +510,36 @@ Header Files - - Header Files - - - Source Files\support - Header Files\tree Header Files + + Header Files\internal + + + Header Files\support + + + Header Files\support + + + Header Files\support + + + Header Files\support + + + Header Files\atn + + + Header Files\atn + + + Header Files\atn + @@ -638,9 +641,6 @@ Source Files - - Source Files\atn - Source Files\atn @@ -662,9 +662,6 @@ Source Files\atn - - Source Files\atn - Source Files\atn @@ -674,21 +671,9 @@ Source Files\atn - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - Source Files\atn - - Source Files\atn - Source Files\atn @@ -701,9 +686,6 @@ Source Files\atn - - Source Files\atn - Source Files\atn @@ -713,12 +695,6 @@ Source Files\atn - - Source Files\atn - - - Source Files\atn - Source Files\atn @@ -734,12 +710,6 @@ Source Files\atn - - Source Files\atn - - - Source Files\atn - Source Files\atn @@ -752,18 +722,9 @@ Source Files\atn - - Source Files\atn - Source Files\atn - - Source Files\atn - - - Source Files\atn - Source Files\atn @@ -797,9 +758,6 @@ Source Files\support - - Source Files\support - Source Files\tree @@ -947,9 +905,6 @@ Source Files - - Source Files\atn - Source Files\atn @@ -968,20 +923,26 @@ Source Files\support - - Source Files\tree - Source Files\tree Source Files\tree - - Source Files\tree - Source Files\tree\pattern + + Source Files\internal + + + Source Files\support + + + Source Files\atn + + + Source Files\atn + \ No newline at end of file diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj b/runtime/Cpp/runtime/antlr4cpp-vs2022.vcxproj similarity index 92% rename from runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj rename to runtime/Cpp/runtime/antlr4cpp-vs2022.vcxproj index 8fb5cf9806..9813fd61ef 100644 --- a/runtime/Cpp/runtime/antlr4cpp-vs2015.vcxproj +++ b/runtime/Cpp/runtime/antlr4cpp-vs2022.vcxproj @@ -1,5 +1,5 @@  - + Debug Static @@ -35,63 +35,63 @@ - {A9762991-1B57-4DCE-90C0-EE42B96947BE} + {52618D4B-6EC4-49AD-8B83-52686244E8F3} Win32Proj antlr4cpp - 8.1 + 10.0 DynamicLibrary true Unicode - v140 + v143 StaticLibrary true Unicode - v140 + v143 DynamicLibrary true Unicode - v140 + v143 StaticLibrary true Unicode - v140 + v143 DynamicLibrary false true Unicode - v140 + v143 StaticLibrary false true Unicode - v140 + v143 DynamicLibrary false true Unicode - v140 + v143 StaticLibrary false true Unicode - v140 + v143 @@ -123,49 +123,49 @@ true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime true - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime false - $(SolutionDir)bin\vs-2015\$(PlatformTarget)\$(Configuration)\ + $(SolutionDir)bin\vs-2022\$(PlatformTarget)\$(Configuration)\ $(SolutionDir)obj\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ antlr4-runtime @@ -182,6 +182,7 @@ 4251 true false + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -202,6 +203,7 @@ 4251 true false + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -222,6 +224,7 @@ 4251 true false + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -242,6 +245,7 @@ 4251 true false + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -263,6 +267,7 @@ 4251 true + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -286,6 +291,7 @@ 4251 true + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -309,6 +315,7 @@ 4251 true + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -332,6 +339,7 @@ 4251 true + /Zc:__cplusplus %(AdditionalOptions) stdcpp17 @@ -346,7 +354,6 @@ - @@ -355,19 +362,13 @@ - - - - - - @@ -385,30 +386,24 @@ - - - + + - - - - - @@ -428,6 +423,7 @@ + @@ -452,13 +448,12 @@ - + - @@ -473,7 +468,6 @@ - @@ -493,12 +487,10 @@ - - @@ -515,12 +507,10 @@ - - @@ -550,6 +540,9 @@ + + + @@ -582,6 +575,7 @@ + @@ -593,7 +587,6 @@ - @@ -607,10 +600,12 @@ + - + + @@ -633,8 +628,6 @@ - - @@ -656,4 +649,4 @@ - + \ No newline at end of file diff --git a/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters b/runtime/Cpp/runtime/antlr4cpp-vs2022.vcxproj.filters similarity index 93% rename from runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters rename to runtime/Cpp/runtime/antlr4cpp-vs2022.vcxproj.filters index 0105b80e74..f2cd0aa9d4 100644 --- a/runtime/Cpp/runtime/antlr4cpp-vs2013.vcxproj.filters +++ b/runtime/Cpp/runtime/antlr4cpp-vs2022.vcxproj.filters @@ -55,6 +55,12 @@ {290632d2-c56e-4005-a417-eb83b9531e1a} + + {b4b32b3f-e97a-448a-98e6-cbf901862bd4} + + + {f8c2bdf9-7e81-4f31-ba17-06b16ba2f081} + @@ -177,9 +183,6 @@ Header Files\atn - - Header Files\atn - Header Files\atn @@ -261,9 +264,6 @@ Header Files\atn - - Header Files\atn - Header Files\atn @@ -309,9 +309,6 @@ Header Files\atn - - Header Files\atn - Header Files\dfa @@ -333,9 +330,6 @@ Header Files\misc - - Header Files\misc - Header Files\support @@ -348,9 +342,6 @@ Header Files\support - - Header Files\support - Header Files\tree @@ -375,21 +366,12 @@ Header Files\tree - - Header Files\tree - - - Header Files\tree - Header Files\tree Header Files\tree - - Header Files\tree - Header Files\tree @@ -528,12 +510,36 @@ Header Files - - Header Files - Header Files\tree + + Header Files + + + Header Files\internal + + + Header Files\support + + + Header Files\support + + + Header Files\support + + + Header Files\support + + + Header Files\atn + + + Header Files\atn + + + Header Files\atn + @@ -635,9 +641,6 @@ Source Files - - Source Files\atn - Source Files\atn @@ -659,9 +662,6 @@ Source Files\atn - - Source Files\atn - Source Files\atn @@ -671,21 +671,9 @@ Source Files\atn - - Source Files\atn - - - Source Files\atn - - - Source Files\atn - Source Files\atn - - Source Files\atn - Source Files\atn @@ -698,9 +686,6 @@ Source Files\atn - - Source Files\atn - Source Files\atn @@ -710,12 +695,6 @@ Source Files\atn - - Source Files\atn - - - Source Files\atn - Source Files\atn @@ -731,12 +710,6 @@ Source Files\atn - - Source Files\atn - - - Source Files\atn - Source Files\atn @@ -749,18 +722,9 @@ Source Files\atn - - Source Files\atn - Source Files\atn - - Source Files\atn - - - Source Files\atn - Source Files\atn @@ -794,9 +758,6 @@ Source Files\support - - Source Files\support - Source Files\tree @@ -935,12 +896,21 @@ Source Files\tree + + Source Files + Source Files Source Files + + Source Files\atn + + + Source Files\misc + Source Files @@ -950,8 +920,8 @@ Source Files - - Source Files\tree + + Source Files\support Source Files\tree @@ -959,23 +929,20 @@ Source Files\tree - - Source Files\tree + + Source Files\tree\pattern - + + Source Files\internal + + Source Files\support - + Source Files\atn - + Source Files\atn - - Source Files\tree\pattern - - - Source Files\misc - \ No newline at end of file