From e4fddc8e37d4298b1dfb7e546d6f143be0644199 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 6 Dec 2024 11:35:29 -0500 Subject: [PATCH 1/7] CMP0051: Remove support for OLD behavior --- Help/policy/CMP0051.rst | 9 ++-- Source/cmGeneratorTarget.cxx | 2 +- Source/cmPolicies.h | 2 +- Source/cmTarget.cxx | 48 ++----------------- Source/cmTargetPropertyComputer.h | 4 +- Tests/RunCMake/CMP0051/CMP0051-NEW.cmake | 3 -- Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt | 12 ----- Tests/RunCMake/CMP0051/CMP0051-OLD.cmake | 10 ---- .../CMP0051/CMP0051-WARN-Dir/CMakeLists.txt | 1 - .../RunCMake/CMP0051/CMP0051-WARN-result.txt | 1 - .../RunCMake/CMP0051/CMP0051-WARN-stderr.txt | 31 ------------ Tests/RunCMake/CMP0051/CMP0051-WARN.cmake | 14 ------ Tests/RunCMake/CMP0051/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0051/RunCMakeTest.cmake | 3 -- 14 files changed, 14 insertions(+), 128 deletions(-) delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-OLD.cmake delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-WARN-Dir/CMakeLists.txt delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-WARN.cmake diff --git a/Help/policy/CMP0051.rst b/Help/policy/CMP0051.rst index e049bbaf1a..ae4498ad32 100644 --- a/Help/policy/CMP0051.rst +++ b/Help/policy/CMP0051.rst @@ -1,6 +1,9 @@ CMP0051 ------- +.. |REMOVED_IN_CMAKE_VERSION| replace:: 4.0 +.. include:: REMOVED_PROLOGUE.txt + .. versionadded:: 3.1 List :genex:`TARGET_OBJECTS` in SOURCES target property. @@ -21,7 +24,5 @@ behavior for this policy is to include ``TARGET_OBJECTS`` expressions in the output. .. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.1 -.. |WARNS_OR_DOES_NOT_WARN| replace:: warns -.. include:: STANDARD_ADVICE.txt - -.. include:: DEPRECATED.txt +.. |WARNED_OR_DID_NOT_WARN| replace:: warned +.. include:: REMOVED_EPILOGUE.txt diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index b6d14e8cfc..39f6966f85 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -60,7 +60,7 @@ using UseTo = cmGeneratorTarget::UseTo; template <> cmValue cmTargetPropertyComputer::GetSources( - cmGeneratorTarget const* tgt, cmMakefile const& /* mf */) + cmGeneratorTarget const* tgt) { return tgt->GetSourcesProperty(); } diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index a7ae22eebb..d546aa6417 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -151,7 +151,7 @@ class cmMakefile; SELECT(POLICY, CMP0050, "Disallow add_custom_command SOURCE signatures.", \ 3, 0, 0, NEW) \ SELECT(POLICY, CMP0051, "List TARGET_OBJECTS in SOURCES target property.", \ - 3, 1, 0, WARN) \ + 3, 1, 0, NEW) \ SELECT(POLICY, CMP0052, \ "Reject source and build dirs in installed " \ "INTERFACE_INCLUDE_DIRECTORIES.", \ diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index c75462820f..530967efbe 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -55,8 +55,7 @@ const std::string& cmTargetPropertyComputer::ImportedLocation( } template <> -cmValue cmTargetPropertyComputer::GetSources(cmTarget const* tgt, - cmMakefile const& mf) +cmValue cmTargetPropertyComputer::GetSources(cmTarget const* tgt) { cmBTStringRange entries = tgt->GetSourceEntries(); if (entries.empty()) { @@ -68,48 +67,9 @@ cmValue cmTargetPropertyComputer::GetSources(cmTarget const* tgt, for (auto const& entry : entries) { cmList files{ entry.Value }; for (std::string const& file : files) { - if (cmHasLiteralPrefix(file, "$') { - std::string objLibName = file.substr(17, file.size() - 18); - - if (cmGeneratorExpression::Find(objLibName) != std::string::npos) { - ss << sep; - sep = ";"; - ss << file; - continue; - } - - bool addContent = false; - bool noMessage = true; - std::ostringstream e; - MessageType messageType = MessageType::AUTHOR_WARNING; - switch (mf.GetPolicyStatus(cmPolicies::CMP0051)) { - case cmPolicies::WARN: - e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0051) << "\n"; - noMessage = false; - CM_FALLTHROUGH; - case cmPolicies::OLD: - break; - case cmPolicies::NEW: - addContent = true; - break; - } - if (!noMessage) { - e << "Target \"" << tgt->GetName() - << "\" contains $ generator expression in its " - "sources list. This content was not previously part of the " - "SOURCES property when that property was read at configure " - "time. Code reading that property needs to be adapted to " - "ignore the generator expression using the string(GENEX_STRIP) " - "command."; - mf.IssueMessage(messageType, e.str()); - } - if (addContent) { - ss << sep; - sep = ";"; - ss << file; - } - } else if (cmGeneratorExpression::Find(file) == std::string::npos) { + if ((cmHasLiteralPrefix(file, "$') || + cmGeneratorExpression::Find(file) == std::string::npos) { ss << sep; sep = ";"; ss << file; diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h index ea50f290fc..248ea03b89 100644 --- a/Source/cmTargetPropertyComputer.h +++ b/Source/cmTargetPropertyComputer.h @@ -27,7 +27,7 @@ public: return nullptr; } if (prop == "SOURCES") { - return GetSources(tgt, mf); + return GetSources(tgt); } return nullptr; } @@ -88,5 +88,5 @@ private: } template - static cmValue GetSources(Target const* tgt, cmMakefile const& mf); + static cmValue GetSources(Target const* tgt); }; diff --git a/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake b/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake index f304bf186c..144c98247c 100644 --- a/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake +++ b/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake @@ -1,6 +1,3 @@ - -cmake_policy(SET CMP0051 NEW) - add_library(objects OBJECT empty.cpp) add_library(empty empty.cpp $) diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt b/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt deleted file mode 100644 index e1c44e507f..0000000000 --- a/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Deprecation Warning at CMP0051-OLD.cmake:2 \(cmake_policy\): - The OLD behavior for policy CMP0051 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -+ -Sources: "empty.cpp"$ diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD.cmake b/Tests/RunCMake/CMP0051/CMP0051-OLD.cmake deleted file mode 100644 index 0243e944cf..0000000000 --- a/Tests/RunCMake/CMP0051/CMP0051-OLD.cmake +++ /dev/null @@ -1,10 +0,0 @@ - -cmake_policy(SET CMP0051 OLD) - -add_library(objects OBJECT empty.cpp) - -add_library(empty empty.cpp $) - -get_target_property(srcs empty SOURCES) - -message("Sources: \"${srcs}\"") diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN-Dir/CMakeLists.txt b/Tests/RunCMake/CMP0051/CMP0051-WARN-Dir/CMakeLists.txt deleted file mode 100644 index 77cbad53ef..0000000000 --- a/Tests/RunCMake/CMP0051/CMP0051-WARN-Dir/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_library(empty2 ../empty.cpp $) diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt b/Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt deleted file mode 100644 index 573541ac97..0000000000 --- a/Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt b/Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt deleted file mode 100644 index 78c6b6d30f..0000000000 --- a/Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt +++ /dev/null @@ -1,31 +0,0 @@ -CMake Warning \(dev\) at CMP0051-WARN.cmake:6 \(get_target_property\): - Policy CMP0051 is not set: List TARGET_OBJECTS in SOURCES target property. - Run "cmake --help-policy CMP0051" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - Target "empty" contains \$ generator expression in its - sources list. This content was not previously part of the SOURCES property - when that property was read at configure time. Code reading that property - needs to be adapted to ignore the generator expression using the - string\(GENEX_STRIP\) command. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -Sources: "empty.cpp" -* -CMake Warning \(dev\) at CMP0051-WARN.cmake:12 \(get_target_property\): - Policy CMP0051 is not set: List TARGET_OBJECTS in SOURCES target property. - Run "cmake --help-policy CMP0051" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - - Target "empty2" contains \$ generator expression in its - sources list. This content was not previously part of the SOURCES property - when that property was read at configure time. Code reading that property - needs to be adapted to ignore the generator expression using the - string\(GENEX_STRIP\) command. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -Sources: "../empty.cpp"$ diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN.cmake b/Tests/RunCMake/CMP0051/CMP0051-WARN.cmake deleted file mode 100644 index 744598fcbf..0000000000 --- a/Tests/RunCMake/CMP0051/CMP0051-WARN.cmake +++ /dev/null @@ -1,14 +0,0 @@ - -add_library(objects OBJECT empty.cpp) - -add_library(empty empty.cpp $) - -get_target_property(srcs empty SOURCES) - -message("Sources: \"${srcs}\"") - -add_subdirectory(CMP0051-WARN-Dir) - -get_target_property(srcs empty2 SOURCES) - -message("Sources: \"${srcs}\"") diff --git a/Tests/RunCMake/CMP0051/CMakeLists.txt b/Tests/RunCMake/CMP0051/CMakeLists.txt index 3482e6baf2..c814f14935 100644 --- a/Tests/RunCMake/CMP0051/CMakeLists.txt +++ b/Tests/RunCMake/CMP0051/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.10) project(${RunCMake_TEST} CXX) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/CMP0051/RunCMakeTest.cmake b/Tests/RunCMake/CMP0051/RunCMakeTest.cmake index 955d8987ce..74015c386e 100644 --- a/Tests/RunCMake/CMP0051/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMP0051/RunCMakeTest.cmake @@ -1,6 +1,3 @@ include(RunCMake) -set(RunCMake_IGNORE_POLICY_VERSION_DEPRECATION ON) -run_cmake(CMP0051-OLD) run_cmake(CMP0051-NEW) -run_cmake(CMP0051-WARN) From f0b1ca4d708049413b5957786f59e80ab54a12ea Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 6 Dec 2024 11:44:45 -0500 Subject: [PATCH 2/7] CMP0052: Remove support for OLD behavior --- Help/policy/CMP0052.rst | 9 ++-- Source/cmExportInstallFileGenerator.cxx | 39 ++------------ Source/cmPolicies.h | 2 +- .../BinInInstallPrefix-CMP0052-NEW-result.txt | 1 - .../BinInInstallPrefix-CMP0052-OLD-result.txt | 1 - .../BinInInstallPrefix-CMP0052-OLD-stderr.txt | 16 ------ ...BinInInstallPrefix-CMP0052-WARN-result.txt | 1 - ...MP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt | 20 -------- ...tallPrefix-stderr_INCLUDE_DIRECTORIES.txt} | 2 +- Tests/RunCMake/IfacePaths/CMakeLists.txt | 6 +-- Tests/RunCMake/IfacePaths/RunCMakeTest.cmake | 51 +++++++------------ .../SrcInInstallPrefix-CMP0052-NEW-result.txt | 1 - .../SrcInInstallPrefix-CMP0052-OLD-result.txt | 1 - .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt | 16 ------ ...SrcInInstallPrefix-CMP0052-WARN-result.txt | 1 - ...MP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt | 20 -------- ...tallPrefix-stderr_INCLUDE_DIRECTORIES.txt} | 0 17 files changed, 29 insertions(+), 158 deletions(-) delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-result.txt delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-result.txt delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt rename Tests/RunCMake/IfacePaths/{BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt => BinInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt} (89%) delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-result.txt delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-result.txt delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt rename Tests/RunCMake/IfacePaths/{SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt => SrcInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt} (100%) diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst index c710262024..c4cd981862 100644 --- a/Help/policy/CMP0052.rst +++ b/Help/policy/CMP0052.rst @@ -1,6 +1,9 @@ CMP0052 ------- +.. |REMOVED_IN_CMAKE_VERSION| replace:: 4.0 +.. include:: REMOVED_PROLOGUE.txt + .. versionadded:: 3.1 Reject source and build dirs in installed @@ -22,7 +25,5 @@ directory. The ``NEW`` behavior for this policy is to issue an error if such a directory is used. .. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.1 -.. |WARNS_OR_DOES_NOT_WARN| replace:: warns -.. include:: STANDARD_ADVICE.txt - -.. include:: DEPRECATED.txt +.. |WARNED_OR_DID_NOT_WARN| replace:: warned +.. include:: REMOVED_EPILOGUE.txt diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index e00636c1d7..437da7aead 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -19,7 +19,6 @@ #include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmMessageType.h" -#include "cmPolicies.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmTarget.h" @@ -456,43 +455,11 @@ bool cmExportInstallFileGenerator::CheckInterfaceDirs( bool inSource = isSubDirectory(li, topSourceDir); if (isSubDirectory(li, installDir)) { // The include directory is inside the install tree. If the - // install tree is not inside the source tree or build tree then + // install tree is inside the source tree or build tree then do not // fall through to the checks below that the include directory is not // also inside the source tree or build tree. - bool shouldContinue = - (!inBinary || isSubDirectory(installDir, topBinaryDir)) && - (!inSource || isSubDirectory(installDir, topSourceDir)); - - if (prop == "INTERFACE_INCLUDE_DIRECTORIES") { - if (!shouldContinue) { - switch (target->GetPolicyStatusCMP0052()) { - case cmPolicies::WARN: { - std::ostringstream s; - s << cmPolicies::GetPolicyWarning(cmPolicies::CMP0052) << "\n"; - s << "Directory:\n \"" << li - << "\"\nin " - "INTERFACE_INCLUDE_DIRECTORIES of target \"" - << target->GetName() - << "\" is a subdirectory of the install " - "directory:\n \"" - << installDir - << "\"\nhowever it is also " - "a subdirectory of the " - << (inBinary ? "build" : "source") << " tree:\n \"" - << (inBinary ? topBinaryDir : topSourceDir) << "\"\n"; - target->GetLocalGenerator()->IssueMessage( - MessageType::AUTHOR_WARNING, s.str()); - CM_FALLTHROUGH; - } - case cmPolicies::OLD: - shouldContinue = true; - break; - case cmPolicies::NEW: - break; - } - } - } - if (shouldContinue) { + if ((!inBinary || isSubDirectory(installDir, topBinaryDir)) && + (!inSource || isSubDirectory(installDir, topSourceDir))) { continue; } } diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index d546aa6417..f5d7d41e83 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -155,7 +155,7 @@ class cmMakefile; SELECT(POLICY, CMP0052, \ "Reject source and build dirs in installed " \ "INTERFACE_INCLUDE_DIRECTORIES.", \ - 3, 1, 0, WARN) \ + 3, 1, 0, NEW) \ SELECT(POLICY, CMP0053, \ "Simplify variable reference and escape sequence evaluation.", 3, 1, \ 0, WARN) \ diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-result.txt deleted file mode 100644 index 573541ac97..0000000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt deleted file mode 100644 index a08f80fb9e..0000000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt +++ /dev/null @@ -1,16 +0,0 @@ -^CMake Deprecation Warning at CMakeLists\.txt:[0-9]+ \(cmake_minimum_required\): - Compatibility with CMake < 3\.10 will be removed from a future version of - CMake\. - - Update the VERSION argument value\. Or, use the \.\.\. syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier\. -+ -CMake Deprecation Warning at CMakeLists.txt:[0-9]+ \(cmake_minimum_required\): - The OLD behavior for policy CMP0052 will be removed from a future version - of CMake\. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD.$ diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-result.txt deleted file mode 100644 index 573541ac97..0000000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt deleted file mode 100644 index eb4d56d5e5..0000000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt +++ /dev/null @@ -1,20 +0,0 @@ -CMake Warning \(dev\) in CMakeLists.txt: - Policy CMP0052 is not set: Reject source and build dirs in installed - INTERFACE_INCLUDE_DIRECTORIES. Run "cmake --help-policy CMP0052" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. - - Directory: - - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo" - - in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory - of the install directory: - - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix" - - however it is also a subdirectory of the build tree: - - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix/BinInInstallPrefix-CMP0052-WARN-build" - -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt similarity index 89% rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt index d5c480d79b..e6e57678e7 100644 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt +++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt @@ -1,6 +1,6 @@ CMake Error in CMakeLists.txt: Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo" + ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix/BinInInstallPrefix-build/foo" which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/CMakeLists.txt b/Tests/RunCMake/IfacePaths/CMakeLists.txt index 5ee2bef6c3..0dc68ee6a5 100644 --- a/Tests/RunCMake/IfacePaths/CMakeLists.txt +++ b/Tests/RunCMake/IfacePaths/CMakeLists.txt @@ -1,8 +1,4 @@ -if(RunCMake_TEST MATCHES "-CMP0052") - cmake_minimum_required(VERSION 3.0) # old enough to not set CMP0052 -else() - cmake_minimum_required(VERSION 3.10) -endif() +cmake_minimum_required(VERSION 3.10) project(${RunCMake_TEST} NONE) if(NOT TEST_FILE) set(TEST_FILE ${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake index c84e95e00a..a02bbfe24d 100644 --- a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake +++ b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake @@ -68,40 +68,25 @@ configure_file( COPYONLY ) -foreach(policyStatus NEW OLD "") - if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES) - if (NOT "${policyStatus}" STREQUAL "") - set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus}) - else() - unset(policyOption) - set(policyStatus WARN) - endif() - set(policySuffix -CMP0052-${policyStatus}) - endif() - set(RunCMake_TEST_OPTIONS - "--install-prefix ${RunCMake_BINARY_DIR}/prefix" ${policyOption} - "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake" - ) - # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run - # the test suite in-source properly. Otherwise the install directory would be - # a subdirectory or the source directory, which is allowed and tested separately - # below. - set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src") - set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix${policySuffix}-build") - run_cmake(BinInInstallPrefix${policySuffix}) - unset(RunCMake_TEST_BINARY_DIR) +set(RunCMake_TEST_OPTIONS + "--install-prefix ${RunCMake_BINARY_DIR}/prefix" ${policyOption} + "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake" + ) +# Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run +# the test suite in-source properly. Otherwise the install directory would be +# a subdirectory or the source directory, which is allowed and tested separately +# below. +set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src") +set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-build") +run_cmake(BinInInstallPrefix) +unset(RunCMake_TEST_BINARY_DIR) - set(RunCMake_TEST_OPTIONS - "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption} - "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake" - ) - run_cmake(SrcInInstallPrefix${policySuffix}) - unset(RunCMake_TEST_SOURCE_DIR) - - if (NOT TEST_PROP STREQUAL INCLUDE_DIRECTORIES) - break() - endif() -endforeach() +set(RunCMake_TEST_OPTIONS + "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption} + "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake" + ) +run_cmake(SrcInInstallPrefix) +unset(RunCMake_TEST_SOURCE_DIR) set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix") run_cmake(InstallPrefixInInterface) diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-result.txt deleted file mode 100644 index 573541ac97..0000000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt deleted file mode 100644 index 38acbdd8b1..0000000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt +++ /dev/null @@ -1,16 +0,0 @@ -^CMake Deprecation Warning at CMakeLists\.txt:[0-9]+ \(cmake_minimum_required\): - Compatibility with CMake < 3\.10 will be removed from a future version of - CMake\. - - Update the VERSION argument value\. Or, use the \.\.\. syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier\. -+ -CMake Deprecation Warning at CMakeLists\.txt:[0-9]+ \(cmake_minimum_required\): - The OLD behavior for policy CMP0052 will be removed from a future version - of CMake\. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD.$ diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-result.txt deleted file mode 100644 index 573541ac97..0000000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt deleted file mode 100644 index fd6e3726db..0000000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt +++ /dev/null @@ -1,20 +0,0 @@ -CMake Warning \(dev\) in CMakeLists.txt: - Policy CMP0052 is not set: Reject source and build dirs in installed - INTERFACE_INCLUDE_DIRECTORIES. Run "cmake --help-policy CMP0052" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. - - Directory: - - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix/src/foo" - - in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory - of the install directory: - - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix" - - however it is also a subdirectory of the source tree: - - ".*Tests/RunCMake/IfacePaths_INCDIRS/prefix/src" - -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_INCLUDE_DIRECTORIES.txt From 1150fae89aabc1247550eaebc8a23ea0a072baa9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 6 Dec 2024 11:57:32 -0500 Subject: [PATCH 3/7] CMP0053: Remove support for OLD behavior --- Help/policy/CMP0053.rst | 9 +- Modules/CMakeParseImplicitLinkInfo.cmake | 1 - Modules/CMakeParseLibraryArchitecture.cmake | 1 - Modules/Internal/CMakeDetermineLinkerId.cmake | 1 - Source/cmMakefile.cxx | 168 +----------------- Source/cmMakefile.h | 20 +-- Source/cmPolicies.h | 2 +- Tests/CMakeTests/StringTest.cmake.in | 2 +- Tests/CMakeTests/StringTestScript.cmake | 15 +- Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt | 13 -- Tests/RunCMake/CMP0053/CMP0053-OLD.cmake | 8 - .../RunCMake/CMP0053/CMP0053-WARN-stderr.txt | 2 - Tests/RunCMake/CMP0053/CMP0053-WARN.cmake | 6 - Tests/RunCMake/CMP0053/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0053/RunCMakeTest.cmake | 3 - .../RunCMake/CMakePresets/RunCMakeTest.cmake | 2 +- .../trace-expand-warn-uninitialized.cmake | 3 - .../CommandLine/warn-uninitialized-stderr.txt | 38 +--- .../CommandLine/warn-uninitialized.cmake | 13 -- ...MP0053-At-NEW-stderr.txt => At-stderr.txt} | 0 .../Syntax/{CMP0053-At-NEW.cmake => At.cmake} | 2 - .../RunCMake/Syntax/AtWithVariable-stderr.txt | 2 +- .../RunCMake/Syntax/CMP0053-At-OLD-stderr.txt | 12 -- Tests/RunCMake/Syntax/CMP0053-At-OLD.cmake | 9 - .../CMP0053-At-WARN-newlines-stderr.txt | 27 --- .../Syntax/CMP0053-At-WARN-newlines.cmake | 6 - .../Syntax/CMP0053-At-WARN-stderr.txt | 21 --- Tests/RunCMake/Syntax/CMP0053-At-WARN.cmake | 4 - .../Syntax/CMP0053-Dollar-OLD-stderr.txt | 24 --- .../RunCMake/Syntax/CMP0053-Dollar-OLD.cmake | 6 - Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt | 56 ------ Tests/RunCMake/Syntax/CMP0053-NUL.cmake | 6 - .../CMP0053-NameWithCarriageReturn-stderr.txt | 4 - .../CMP0053-NameWithCarriageReturn.cmake | 2 - ...CMP0053-NameWithCarriageReturnQuoted.cmake | 2 - .../CMP0053-NameWithEscapedSpaces-result.txt | 1 - .../CMP0053-NameWithEscapedSpaces-stderr.txt | 4 - .../CMP0053-NameWithEscapedSpaces.cmake | 2 - .../CMP0053-NameWithEscapedSpacesQuoted.cmake | 2 - .../CMP0053-NameWithEscapedTabs-result.txt | 1 - .../CMP0053-NameWithEscapedTabs-stderr.txt | 4 - .../Syntax/CMP0053-NameWithEscapedTabs.cmake | 2 - .../CMP0053-NameWithEscapedTabsQuoted.cmake | 2 - .../Syntax/CMP0053-NameWithNewline-result.txt | 1 - .../Syntax/CMP0053-NameWithNewline-stderr.txt | 4 - .../Syntax/CMP0053-NameWithNewline.cmake | 2 - .../CMP0053-NameWithNewlineQuoted.cmake | 2 - .../Syntax/CMP0053-NameWithSpaces-result.txt | 1 - .../Syntax/CMP0053-NameWithSpaces-stderr.txt | 12 -- .../Syntax/CMP0053-NameWithSpaces.cmake | 2 - .../CMP0053-NameWithSpacesQuoted-result.txt | 1 - .../CMP0053-NameWithSpacesQuoted-stderr.txt | 12 -- .../Syntax/CMP0053-NameWithSpacesQuoted.cmake | 2 - .../Syntax/CMP0053-NameWithTabs-result.txt | 1 - .../Syntax/CMP0053-NameWithTabs-stderr.txt | 12 -- .../Syntax/CMP0053-NameWithTabs.cmake | 2 - .../CMP0053-NameWithTabsQuoted-result.txt | 1 - .../CMP0053-NameWithTabsQuoted-stderr.txt | 12 -- .../Syntax/CMP0053-NameWithTabsQuoted.cmake | 2 - Tests/RunCMake/Syntax/CMP0053-WARN-stderr.txt | 28 --- Tests/RunCMake/Syntax/CMP0053-WARN.cmake | 5 - Tests/RunCMake/Syntax/CMakeLists.txt | 2 +- ...ollar-NEW-stderr.txt => Dollar-stderr.txt} | 0 ...{CMP0053-Dollar-NEW.cmake => Dollar.cmake} | 2 - Tests/RunCMake/Syntax/Escape2-stderr.txt | 6 +- Tests/RunCMake/Syntax/Escape2.cmake | 2 - .../Syntax/EscapeChar-char-stderr.txt.in | 4 +- .../RunCMake/Syntax/EscapeChar-char.cmake.in | 2 - .../RunCMake/Syntax/EscapeCharsAllowed.cmake | 2 - Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt | 3 +- .../Syntax/NameWithCarriageReturn-stderr.txt | 10 +- .../NameWithCarriageReturnQuoted-result.txt | 1 - .../NameWithCarriageReturnQuoted-stderr.txt | 12 -- .../Syntax/NameWithEscapedSpaces-stderr.txt | 12 +- .../NameWithEscapedSpacesQuoted-result.txt | 1 - .../NameWithEscapedSpacesQuoted-stderr.txt | 12 -- .../Syntax/NameWithEscapedTabs-stderr.txt | 12 +- .../NameWithEscapedTabsQuoted-result.txt | 1 - .../NameWithEscapedTabsQuoted-stderr.txt | 12 -- .../Syntax/NameWithNewline-stderr.txt | 10 +- .../Syntax/NameWithNewlineQuoted-result.txt | 1 - .../Syntax/NameWithNewlineQuoted-stderr.txt | 12 -- .../RunCMake/Syntax/NameWithSpaces-stderr.txt | 2 +- .../Syntax/NameWithSpacesQuoted-stderr.txt | 2 +- Tests/RunCMake/Syntax/NameWithTabs-stderr.txt | 2 +- .../Syntax/NameWithTabsQuoted-stderr.txt | 2 +- Tests/RunCMake/Syntax/ParenInENV-result.txt | 1 - ...-OLD-result.txt => ParenInENV1-result.txt} | 0 ...nENV-stderr.txt => ParenInENV1-stderr.txt} | 8 +- .../{ParenInENV.cmake => ParenInENV1.cmake} | 0 ...nENV-stderr.txt => ParenInENV2-stderr.txt} | 0 ...053-ParenInENV.cmake => ParenInENV2.cmake} | 1 - .../Syntax/ParenInQuotedENV-stderr.txt | 1 - ...esult.txt => ParenInQuotedENV1-result.txt} | 0 .../Syntax/ParenInQuotedENV1-stderr.txt | 13 ++ ...uotedENV.cmake => ParenInQuotedENV1.cmake} | 0 ...tderr.txt => ParenInQuotedENV2-stderr.txt} | 0 ...uotedENV.cmake => ParenInQuotedENV2.cmake} | 1 - .../Syntax/ParenInVarName0-stderr.txt | 4 +- Tests/RunCMake/Syntax/ParenInVarName0.cmake | 2 - .../Syntax/ParenInVarName1-result.txt | 1 - .../Syntax/ParenInVarName1-stderr.txt | 12 -- Tests/RunCMake/Syntax/ParenInVarName1.cmake | 4 - Tests/RunCMake/Syntax/RunCMakeTest.cmake | 33 +--- Tests/RunCMake/Syntax/Unquoted2.cmake | 2 - .../Syntax/UnterminatedBrace0-result.txt | 1 - .../Syntax/UnterminatedBrace0-stderr.txt | 12 -- .../RunCMake/Syntax/UnterminatedBrace0.cmake | 1 - .../Syntax/UnterminatedBrace1-stderr.txt | 4 +- .../RunCMake/Syntax/UnterminatedBrace1.cmake | 1 - Tests/RunCMake/VsDotnetSdk/RunCMakeTest.cmake | 1 - .../VsNugetPackageRestore/RunCMakeTest.cmake | 1 - .../cmake_language/defer_call-stderr.txt | 11 +- .../cmake_language/defer_call/CMakeLists.txt | 1 - 114 files changed, 76 insertions(+), 779 deletions(-) delete mode 100644 Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0053/CMP0053-OLD.cmake delete mode 100644 Tests/RunCMake/CMP0053/CMP0053-WARN-stderr.txt delete mode 100644 Tests/RunCMake/CMP0053/CMP0053-WARN.cmake rename Tests/RunCMake/Syntax/{CMP0053-At-NEW-stderr.txt => At-stderr.txt} (100%) rename Tests/RunCMake/Syntax/{CMP0053-At-NEW.cmake => At.cmake} (83%) delete mode 100644 Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-At-OLD.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-At-WARN-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-At-WARN.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-Dollar-OLD-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-Dollar-OLD.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NUL.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake delete mode 100644 Tests/RunCMake/Syntax/CMP0053-WARN-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/CMP0053-WARN.cmake rename Tests/RunCMake/Syntax/{CMP0053-Dollar-NEW-stderr.txt => Dollar-stderr.txt} (100%) rename Tests/RunCMake/Syntax/{CMP0053-Dollar-NEW.cmake => Dollar.cmake} (71%) delete mode 100644 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt delete mode 100644 Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/ParenInENV-result.txt rename Tests/RunCMake/Syntax/{CMP0053-Dollar-OLD-result.txt => ParenInENV1-result.txt} (100%) rename Tests/RunCMake/Syntax/{ParenInENV-stderr.txt => ParenInENV1-stderr.txt} (66%) rename Tests/RunCMake/Syntax/{ParenInENV.cmake => ParenInENV1.cmake} (100%) rename Tests/RunCMake/Syntax/{CMP0053-ParenInENV-stderr.txt => ParenInENV2-stderr.txt} (100%) rename Tests/RunCMake/Syntax/{CMP0053-ParenInENV.cmake => ParenInENV2.cmake} (62%) delete mode 100644 Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt rename Tests/RunCMake/Syntax/{CMP0053-NameWithCarriageReturn-result.txt => ParenInQuotedENV1-result.txt} (100%) create mode 100644 Tests/RunCMake/Syntax/ParenInQuotedENV1-stderr.txt rename Tests/RunCMake/Syntax/{ParenInQuotedENV.cmake => ParenInQuotedENV1.cmake} (100%) rename Tests/RunCMake/Syntax/{CMP0053-ParenInQuotedENV-stderr.txt => ParenInQuotedENV2-stderr.txt} (100%) rename Tests/RunCMake/Syntax/{CMP0053-ParenInQuotedENV.cmake => ParenInQuotedENV2.cmake} (63%) delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName1-result.txt delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/ParenInVarName1.cmake delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt delete mode 100644 Tests/RunCMake/Syntax/UnterminatedBrace0.cmake diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst index 5a6f5cfb0f..82ab716435 100644 --- a/Help/policy/CMP0053.rst +++ b/Help/policy/CMP0053.rst @@ -1,6 +1,9 @@ CMP0053 ------- +.. |REMOVED_IN_CMAKE_VERSION| replace:: 4.0 +.. include:: REMOVED_PROLOGUE.txt + .. versionadded:: 3.1 Simplify variable reference and escape sequence evaluation. @@ -45,7 +48,5 @@ variable references and escape sequences. The ``NEW`` behavior is to use the simpler variable expansion and escape sequence evaluation rules. .. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.1 -.. |WARNS_OR_DOES_NOT_WARN| replace:: warns -.. include:: STANDARD_ADVICE.txt - -.. include:: DEPRECATED.txt +.. |WARNED_OR_DID_NOT_WARN| replace:: warned +.. include:: REMOVED_EPILOGUE.txt diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 2eeb375cf4..e470a99f3f 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -2,7 +2,6 @@ # file Copyright.txt or https://cmake.org/licensing for details. cmake_policy(PUSH) -cmake_policy(SET CMP0053 NEW) cmake_policy(SET CMP0054 NEW) # Function to parse implicit linker options. diff --git a/Modules/CMakeParseLibraryArchitecture.cmake b/Modules/CMakeParseLibraryArchitecture.cmake index f7a4b29c34..37990e12b7 100644 --- a/Modules/CMakeParseLibraryArchitecture.cmake +++ b/Modules/CMakeParseLibraryArchitecture.cmake @@ -2,7 +2,6 @@ # file Copyright.txt or https://cmake.org/licensing for details. cmake_policy(PUSH) -cmake_policy(SET CMP0053 NEW) cmake_policy(SET CMP0054 NEW) # Function parse implicit linker options. diff --git a/Modules/Internal/CMakeDetermineLinkerId.cmake b/Modules/Internal/CMakeDetermineLinkerId.cmake index 45499a5e37..d52d5940bf 100644 --- a/Modules/Internal/CMakeDetermineLinkerId.cmake +++ b/Modules/Internal/CMakeDetermineLinkerId.cmake @@ -7,7 +7,6 @@ # CMAKE__COMPILER_LINKER_VERSION cmake_policy(PUSH) -cmake_policy(SET CMP0053 NEW) cmake_policy(SET CMP0054 NEW) function(cmake_determine_linker_id lang linker) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7f41557ca2..6752537487 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -29,7 +29,6 @@ #include "cmsys/FStream.hxx" #include "cmsys/RegularExpression.hxx" -#include "cmCommandArgumentParserHelper.h" #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" #include "cmCustomCommandTypes.h" @@ -108,8 +107,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); - this->SuppressSideEffects = false; - // Setup the default include complaint regular expression (match nothing). this->ComplainFileRegularExpression = "^$"; @@ -117,7 +114,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, this->cmDefineRegex.compile("#([ \t]*)cmakedefine[ \t]+([A-Za-z_0-9]*)"); this->cmDefine01Regex.compile("#([ \t]*)cmakedefine01[ \t]+([A-Za-z_0-9]*)"); - this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)"); this->cmNamedCurly.compile("^[A-Za-z0-9/_.+-]+{"); this->StateSnapshot = @@ -2354,7 +2350,7 @@ cmValue cmMakefile::GetDefinition(const std::string& name) const } #ifndef CMAKE_BOOTSTRAP cmVariableWatch* vv = this->GetVariableWatch(); - if (vv && !this->SuppressSideEffects) { + if (vv) { bool const watch_function_executed = vv->VariableAccessed(name, def ? cmVariableWatch::VARIABLE_READ_ACCESS @@ -2398,11 +2394,6 @@ const std::string& cmMakefile::ExpandVariablesInString( std::string& source, bool escapeQuotes, bool noEscapes, bool atOnly, const char* filename, long line, bool removeEmpty, bool replaceAt) const { - bool compareResults = false; - MessageType mtype = MessageType::LOG; - std::string errorstr; - std::string original; - // Sanity check the @ONLY mode. if (atOnly && (!noEscapes || !removeEmpty)) { // This case should never be called. At-only is for @@ -2413,163 +2404,20 @@ const std::string& cmMakefile::ExpandVariablesInString( return source; } - // Variables used in the WARN case. - std::string newResult; - std::string newErrorstr; - MessageType newError = MessageType::LOG; - - switch (this->GetPolicyStatus(cmPolicies::CMP0053)) { - case cmPolicies::WARN: { - // Save the original string for the warning. - original = source; - newResult = source; - compareResults = true; - // Suppress variable watches to avoid calling hooks twice. Suppress new - // dereferences since the OLD behavior is still what is actually used. - this->SuppressSideEffects = true; - newError = this->ExpandVariablesInStringNew( - newErrorstr, newResult, escapeQuotes, noEscapes, atOnly, filename, - line, replaceAt); - this->SuppressSideEffects = false; - CM_FALLTHROUGH; - } - case cmPolicies::OLD: - mtype = this->ExpandVariablesInStringOld(errorstr, source, escapeQuotes, - noEscapes, atOnly, filename, - line, removeEmpty, true); - break; - // Messaging here would be *very* verbose. - case cmPolicies::NEW: - mtype = this->ExpandVariablesInStringNew(errorstr, source, escapeQuotes, - noEscapes, atOnly, filename, - line, replaceAt); - break; - } - - // If it's an error in either case, just report the error... + std::string errorstr; + MessageType mtype = this->ExpandVariablesInStringImpl( + errorstr, source, escapeQuotes, noEscapes, atOnly, filename, line, + replaceAt); if (mtype != MessageType::LOG) { if (mtype == MessageType::FATAL_ERROR) { cmSystemTools::SetFatalErrorOccurred(); } this->IssueMessage(mtype, errorstr); } - // ...otherwise, see if there's a difference that needs to be warned about. - else if (compareResults && (newResult != source || newError != mtype)) { - auto msg = - cmStrCat(cmPolicies::GetPolicyWarning(cmPolicies::CMP0053), '\n'); - - std::string msg_input = original; - cmSystemTools::ReplaceString(msg_input, "\n", "\n "); - - std::string msg_old = source; - cmSystemTools::ReplaceString(msg_old, "\n", "\n "); - - msg += cmStrCat("For input:\n '", msg_input, "'\n", - "the old evaluation rules produce:\n '", msg_old, "'\n"); - - if (newError == mtype) { - std::string msg_new = newResult; - cmSystemTools::ReplaceString(msg_new, "\n", "\n "); - msg += - cmStrCat("but the new evaluation rules produce:\n '", msg_new, "'\n"); - } else { - std::string msg_err = newErrorstr; - cmSystemTools::ReplaceString(msg_err, "\n", "\n "); - msg += cmStrCat("but the new evaluation rules produce an error:\n ", - msg_err, '\n'); - } - - msg += - "Using the old result for compatibility since the policy is not set."; - - this->IssueMessage(MessageType::AUTHOR_WARNING, msg); - } return source; } -MessageType cmMakefile::ExpandVariablesInStringOld( - std::string& errorstr, std::string& source, bool escapeQuotes, - bool noEscapes, bool atOnly, const char* filename, long line, - bool removeEmpty, bool replaceAt) const -{ - // Fast path strings without any special characters. - if (source.find_first_of("$@\\") == std::string::npos) { - return MessageType::LOG; - } - - // Special-case the @ONLY mode. - if (atOnly) { - // Store an original copy of the input. - std::string input = source; - - // Start with empty output. - source.clear(); - - // Look for one @VAR@ at a time. - const char* in = input.c_str(); - while (this->cmAtVarRegex.find(in)) { - // Get the range of the string to replace. - const char* first = in + this->cmAtVarRegex.start(); - const char* last = in + this->cmAtVarRegex.end(); - - // Store the unchanged part of the string now. - source.append(in, first - in); - - // Lookup the definition of VAR. - std::string var(first + 1, last - first - 2); - if (cmValue val = this->GetDefinition(var)) { - // Store the value in the output escaping as requested. - if (escapeQuotes) { - source.append(cmEscapeQuotes(*val)); - } else { - source.append(*val); - } - } - - // Continue looking for @VAR@ further along the string. - in = last; - } - - // Append the rest of the unchanged part of the string. - source.append(in); - - return MessageType::LOG; - } - - // This method replaces ${VAR} and @VAR@ where VAR is looked up - // with GetDefinition(), if not found in the map, nothing is expanded. - // It also supports the $ENV{VAR} syntax where VAR is looked up in - // the current environment variables. - - cmCommandArgumentParserHelper parser; - parser.SetMakefile(this); - parser.SetLineFile(line, filename); - parser.SetEscapeQuotes(escapeQuotes); - parser.SetNoEscapeMode(noEscapes); - parser.SetReplaceAtSyntax(replaceAt); - parser.SetRemoveEmpty(removeEmpty); - int res = parser.ParseString(source, 0); - const char* emsg = parser.GetError(); - MessageType mtype = MessageType::LOG; - if (res && !emsg[0]) { - source = parser.GetResult(); - } else { - // Construct the main error message. - std::string error = "Syntax error in cmake code "; - if (filename && line > 0) { - // This filename and line number may be more specific than the - // command context because one command invocation can have - // arguments on multiple lines. - error += cmStrCat("at\n ", filename, ':', line, '\n'); - } - error += cmStrCat("when parsing string\n ", source, '\n', emsg); - mtype = MessageType::FATAL_ERROR; - errorstr = std::move(error); - } - return mtype; -} - enum t_domain { NORMAL, @@ -2680,7 +2528,7 @@ cm::optional cmMakefile::DeferGetCall(std::string const& id) const return call; } -MessageType cmMakefile::ExpandVariablesInStringNew( +MessageType cmMakefile::ExpandVariablesInStringImpl( std::string& errorstr, std::string& source, bool escapeQuotes, bool noEscapes, bool atOnly, const char* filename, long line, bool replaceAt) const @@ -2743,7 +2591,7 @@ MessageType cmMakefile::ExpandVariablesInStringNew( } else { varresult = *value; } - } else if (!this->SuppressSideEffects) { + } else { this->MaybeWarnUninitialized(lookup, filename); } result.replace(var.loc, result.size() - var.loc, varresult); @@ -2859,7 +2707,7 @@ MessageType cmMakefile::ExpandVariablesInStringNew( cmValue def = this->GetDefinition(variable); if (def) { varresult = *def; - } else if (!this->SuppressSideEffects) { + } else { this->MaybeWarnUninitialized(variable, filename); } } diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 78a485d9df..d05421f59c 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -1197,7 +1197,6 @@ private: mutable cmsys::RegularExpression cmDefineRegex; mutable cmsys::RegularExpression cmDefine01Regex; - mutable cmsys::RegularExpression cmAtVarRegex; mutable cmsys::RegularExpression cmNamedCurly; std::vector UnConfiguredDirectories; @@ -1239,19 +1238,11 @@ private: class BuildsystemFileScope; friend class BuildsystemFileScope; - // CMP0053 == old - MessageType ExpandVariablesInStringOld(std::string& errorstr, - std::string& source, - bool escapeQuotes, bool noEscapes, - bool atOnly, const char* filename, - long line, bool removeEmpty, - bool replaceAt) const; - // CMP0053 == new - MessageType ExpandVariablesInStringNew(std::string& errorstr, - std::string& source, - bool escapeQuotes, bool noEscapes, - bool atOnly, const char* filename, - long line, bool replaceAt) const; + MessageType ExpandVariablesInStringImpl(std::string& errorstr, + std::string& source, + bool escapeQuotes, bool noEscapes, + bool atOnly, const char* filename, + long line, bool replaceAt) const; bool ValidateCustomCommand(const cmCustomCommandLines& commandLines) const; @@ -1270,6 +1261,5 @@ private: std::set WarnedCMP0074; std::set WarnedCMP0144; bool IsSourceFileTryCompile; - mutable bool SuppressSideEffects; ImportedTargetScope CurrentImportedTargetScope = ImportedTargetScope::Local; }; diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index f5d7d41e83..0ca09a9644 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -158,7 +158,7 @@ class cmMakefile; 3, 1, 0, NEW) \ SELECT(POLICY, CMP0053, \ "Simplify variable reference and escape sequence evaluation.", 3, 1, \ - 0, WARN) \ + 0, NEW) \ SELECT( \ POLICY, CMP0054, \ "Only interpret if() arguments as variables or keywords when unquoted.", \ diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 5f8b1117d2..6a94cc5852 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -84,7 +84,7 @@ check_cmake_test(String # Execute each test listed in StringTestScript.cmake: # set(scriptname "@CMAKE_CURRENT_SOURCE_DIR@/StringTestScript.cmake") -set(number_of_tests_expected 74) +set(number_of_tests_expected 72) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) diff --git a/Tests/CMakeTests/StringTestScript.cmake b/Tests/CMakeTests/StringTestScript.cmake index e069897b6b..7c4585791b 100644 --- a/Tests/CMakeTests/StringTestScript.cmake +++ b/Tests/CMakeTests/StringTestScript.cmake @@ -1,8 +1,6 @@ message(STATUS "testname='${testname}'") -function(test_configure_line_number EXPRESSION POLICY) - cmake_policy(PUSH) - cmake_policy(SET CMP0053 ${POLICY}) +function(test_configure_line_number EXPRESSION) string(CONFIGURE "${EXPRESSION}" v) # line should indicate string() call math(EXPR vplus3 "${v} + 3") @@ -10,7 +8,6 @@ function(test_configure_line_number EXPRESSION POLICY) message(SEND_ERROR "Couldn't configure CMAKE_CURRENT_LIST_LINE, evaluated into '${v}'") endif() message(STATUS "v='${v}'") - cmake_policy(POP) endfunction() if(testname STREQUAL empty) # fail @@ -45,16 +42,10 @@ elseif(testname STREQUAL configure_escape_quotes) # pass string(CONFIGURE "this is @testname@" v ESCAPE_QUOTES) message(STATUS "v='${v}'") -elseif(testname STREQUAL configure_line_number_CMP0053_old) # pass - test_configure_line_number("\${CMAKE_CURRENT_LIST_LINE}" OLD) - -elseif(testname STREQUAL configure_line_number_CMP0053_new) # pass +elseif(testname STREQUAL configure_line_number_curly) # pass test_configure_line_number("\${CMAKE_CURRENT_LIST_LINE}" NEW) -elseif(testname STREQUAL configure_line_number_CMP0053_old_use_at) # pass - test_configure_line_number("\@CMAKE_CURRENT_LIST_LINE\@" OLD) - -elseif(testname STREQUAL configure_line_number_CMP0053_new_use_at) # pass +elseif(testname STREQUAL configure_line_number_at) # pass test_configure_line_number("\@CMAKE_CURRENT_LIST_LINE\@" NEW) elseif(testname STREQUAL configure_bogus) # fail diff --git a/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt b/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt deleted file mode 100644 index 2a0ddbaafa..0000000000 --- a/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt +++ /dev/null @@ -1,13 +0,0 @@ -^CMake Deprecation Warning at CMP0053-OLD.cmake:1 \(cmake_policy\): - The OLD behavior for policy CMP0053 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -called ---><--$ diff --git a/Tests/RunCMake/CMP0053/CMP0053-OLD.cmake b/Tests/RunCMake/CMP0053/CMP0053-OLD.cmake deleted file mode 100644 index 41f534746b..0000000000 --- a/Tests/RunCMake/CMP0053/CMP0053-OLD.cmake +++ /dev/null @@ -1,8 +0,0 @@ -cmake_policy(SET CMP0053 OLD) - -function (watch_callback) - message("called") -endfunction () - -variable_watch(test watch_callback) -message("-->${test}<--") diff --git a/Tests/RunCMake/CMP0053/CMP0053-WARN-stderr.txt b/Tests/RunCMake/CMP0053/CMP0053-WARN-stderr.txt deleted file mode 100644 index 836b0ffe92..0000000000 --- a/Tests/RunCMake/CMP0053/CMP0053-WARN-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^called ---><--$ diff --git a/Tests/RunCMake/CMP0053/CMP0053-WARN.cmake b/Tests/RunCMake/CMP0053/CMP0053-WARN.cmake deleted file mode 100644 index b010d1319e..0000000000 --- a/Tests/RunCMake/CMP0053/CMP0053-WARN.cmake +++ /dev/null @@ -1,6 +0,0 @@ -function (watch_callback) - message("called") -endfunction () - -variable_watch(test watch_callback) -message("-->${test}<--") diff --git a/Tests/RunCMake/CMP0053/CMakeLists.txt b/Tests/RunCMake/CMP0053/CMakeLists.txt index 3482e6baf2..c814f14935 100644 --- a/Tests/RunCMake/CMP0053/CMakeLists.txt +++ b/Tests/RunCMake/CMP0053/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.10) project(${RunCMake_TEST} CXX) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/CMP0053/RunCMakeTest.cmake b/Tests/RunCMake/CMP0053/RunCMakeTest.cmake index de58c25723..6880ea0745 100644 --- a/Tests/RunCMake/CMP0053/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMP0053/RunCMakeTest.cmake @@ -1,6 +1,3 @@ include(RunCMake) -set(RunCMake_IGNORE_POLICY_VERSION_DEPRECATION ON) -run_cmake(CMP0053-OLD) run_cmake(CMP0053-NEW) -run_cmake(CMP0053-WARN) diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index b0833d3f54..5423702739 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.19) # CMP0053 +cmake_minimum_required(VERSION 3.19) include(RunCMake) diff --git a/Tests/RunCMake/CommandLine/trace-expand-warn-uninitialized.cmake b/Tests/RunCMake/CommandLine/trace-expand-warn-uninitialized.cmake index ec3e4d46de..f8f0c8f9f0 100644 --- a/Tests/RunCMake/CommandLine/trace-expand-warn-uninitialized.cmake +++ b/Tests/RunCMake/CommandLine/trace-expand-warn-uninitialized.cmake @@ -1,4 +1 @@ -cmake_policy(SET CMP0053 OLD) -message(STATUS "'${uninitialized_variable}'") -cmake_policy(SET CMP0053 NEW) message(STATUS "'${uninitialized_variable}'") diff --git a/Tests/RunCMake/CommandLine/warn-uninitialized-stderr.txt b/Tests/RunCMake/CommandLine/warn-uninitialized-stderr.txt index 41ba09898e..623b86dfb0 100644 --- a/Tests/RunCMake/CommandLine/warn-uninitialized-stderr.txt +++ b/Tests/RunCMake/CommandLine/warn-uninitialized-stderr.txt @@ -1,52 +1,22 @@ -^CMake Warning \(dev\) at warn-uninitialized.cmake:3 \(set\): - uninitialized variable 'OLD_WARN_FROM_NORMAL_CMAKE_FILE_INSIDE_BRACES' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at warn-uninitialized.cmake:4 \(set\): - uninitialized variable 'OLD_WARN_FROM_NORMAL_CMAKE_FILE_IN_ATS' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at warn-uninitialized.cmake:5 \(string\): - uninitialized variable 'OLD_WARN_FROM_STRING_CONFIGURE_INSIDE_BRACES' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at warn-uninitialized.cmake:7 \(configure_file\): - uninitialized variable 'OLD_WARN_FROM_CONFIGURE_FILE_INSIDE_AT' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at warn-uninitialized.cmake:8 \(string\): - uninitialized variable 'OLD_WARN_FROM_STRING_CONFIGURE_INSIDE_AT' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at warn-uninitialized.cmake:13 \(set\): +CMake Warning \(dev\) at warn-uninitialized.cmake:1 \(set\): uninitialized variable 'NEW_WARN_FROM_NORMAL_CMAKE_FILE_INSIDE_BRACES' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. -CMake Warning \(dev\) at warn-uninitialized.cmake:14 \(string\): +CMake Warning \(dev\) at warn-uninitialized.cmake:2 \(string\): uninitialized variable 'NEW_WARN_FROM_STRING_CONFIGURE_INSIDE_BRACES' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. -CMake Warning \(dev\) at warn-uninitialized.cmake:16 \(configure_file\): +CMake Warning \(dev\) at warn-uninitialized.cmake:4 \(configure_file\): uninitialized variable 'NEW_WARN_FROM_CONFIGURE_FILE_INSIDE_AT' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. -CMake Warning \(dev\) at warn-uninitialized.cmake:17 \(string\): +CMake Warning \(dev\) at warn-uninitialized.cmake:5 \(string\): uninitialized variable 'NEW_WARN_FROM_STRING_CONFIGURE_INSIDE_AT' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CommandLine/warn-uninitialized.cmake b/Tests/RunCMake/CommandLine/warn-uninitialized.cmake index ff65c1631c..41636549ba 100644 --- a/Tests/RunCMake/CommandLine/warn-uninitialized.cmake +++ b/Tests/RunCMake/CommandLine/warn-uninitialized.cmake @@ -1,18 +1,5 @@ -cmake_policy(PUSH) -cmake_policy(SET CMP0053 OLD) -set(FOO "${OLD_WARN_FROM_NORMAL_CMAKE_FILE_INSIDE_BRACES}") -set(FOO "@OLD_WARN_FROM_NORMAL_CMAKE_FILE_IN_ATS@") -string(CONFIGURE "\${OLD_WARN_FROM_STRING_CONFIGURE_INSIDE_BRACES}" OUT1) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/file1.in "\@OLD_WARN_FROM_CONFIGURE_FILE_INSIDE_AT\@") -configure_file(${CMAKE_CURRENT_BINARY_DIR}/file1.in file1.out) -string(CONFIGURE "\@OLD_WARN_FROM_STRING_CONFIGURE_INSIDE_AT\@" OUT2) -cmake_policy(POP) - -cmake_policy(PUSH) -cmake_policy(SET CMP0053 NEW) set(FOO "${NEW_WARN_FROM_NORMAL_CMAKE_FILE_INSIDE_BRACES}") string(CONFIGURE "\${NEW_WARN_FROM_STRING_CONFIGURE_INSIDE_BRACES}" OUT3) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/file2.in "\@NEW_WARN_FROM_CONFIGURE_FILE_INSIDE_AT\@") configure_file(${CMAKE_CURRENT_BINARY_DIR}/file2.in file2.out) string(CONFIGURE "@NEW_WARN_FROM_STRING_CONFIGURE_INSIDE_AT@" OUT4) -cmake_policy(POP) diff --git a/Tests/RunCMake/Syntax/CMP0053-At-NEW-stderr.txt b/Tests/RunCMake/Syntax/At-stderr.txt similarity index 100% rename from Tests/RunCMake/Syntax/CMP0053-At-NEW-stderr.txt rename to Tests/RunCMake/Syntax/At-stderr.txt diff --git a/Tests/RunCMake/Syntax/CMP0053-At-NEW.cmake b/Tests/RunCMake/Syntax/At.cmake similarity index 83% rename from Tests/RunCMake/Syntax/CMP0053-At-NEW.cmake rename to Tests/RunCMake/Syntax/At.cmake index 40dbe46c59..e8df7cd5e5 100644 --- a/Tests/RunCMake/Syntax/CMP0053-At-NEW.cmake +++ b/Tests/RunCMake/Syntax/At.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0053 NEW) - set(right "wrong") set(var "\${right}") # Not expanded here with the new policy. diff --git a/Tests/RunCMake/Syntax/AtWithVariable-stderr.txt b/Tests/RunCMake/Syntax/AtWithVariable-stderr.txt index 5dcd4d7a13..cbd1be4722 100644 --- a/Tests/RunCMake/Syntax/AtWithVariable-stderr.txt +++ b/Tests/RunCMake/Syntax/AtWithVariable-stderr.txt @@ -1 +1 @@ --->wrong<-- +-->\${right}<-- diff --git a/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt deleted file mode 100644 index 0dde1bc5ec..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Deprecation Warning at CMP0053-At-OLD.cmake:1 \(cmake_policy\): - The OLD behavior for policy CMP0053 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ --->wrong<--$ diff --git a/Tests/RunCMake/Syntax/CMP0053-At-OLD.cmake b/Tests/RunCMake/Syntax/CMP0053-At-OLD.cmake deleted file mode 100644 index 666f107b8d..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-At-OLD.cmake +++ /dev/null @@ -1,9 +0,0 @@ -cmake_policy(SET CMP0053 OLD) - -set(right "wrong") -set(var "\${right}") -# Expanded here with the old policy. -set(ref "@var@") - -string(CONFIGURE "${ref}" output) -message("-->${output}<--") diff --git a/Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines-stderr.txt deleted file mode 100644 index ec3702115d..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines-stderr.txt +++ /dev/null @@ -1,27 +0,0 @@ -^CMake Warning \(dev\) at CMP0053-At-WARN-newlines.cmake:4 \(set\): - Policy CMP0053 is not set: Simplify variable reference and escape sequence - evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the - cmake_policy command to set the policy and suppress this warning. - - For input: - - ' - @var@ - ' - - the old evaluation rules produce: - - ' - \${right} - ' - - but the new evaluation rules produce: - - ' - @var@ - ' - - Using the old result for compatibility since the policy is not set. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it.$ diff --git a/Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines.cmake b/Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines.cmake deleted file mode 100644 index c493505b1a..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-At-WARN-newlines.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(right "wrong") -set(var "\${right}") -# Expanded here with the old policy. -set(ref " -@var@ -") diff --git a/Tests/RunCMake/Syntax/CMP0053-At-WARN-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-At-WARN-stderr.txt deleted file mode 100644 index 697b7b38ab..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-At-WARN-stderr.txt +++ /dev/null @@ -1,21 +0,0 @@ -^CMake Warning \(dev\) at CMP0053-At-WARN.cmake:4 \(set\): - Policy CMP0053 is not set: Simplify variable reference and escape sequence - evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the - cmake_policy command to set the policy and suppress this warning. - - For input: - - '@var@' - - the old evaluation rules produce: - - '\${right}' - - but the new evaluation rules produce: - - '@var@' - - Using the old result for compatibility since the policy is not set. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it.$ diff --git a/Tests/RunCMake/Syntax/CMP0053-At-WARN.cmake b/Tests/RunCMake/Syntax/CMP0053-At-WARN.cmake deleted file mode 100644 index 19c7f53394..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-At-WARN.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(right "wrong") -set(var "\${right}") -# Expanded here with the old policy. -set(ref "@var@") diff --git a/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD-stderr.txt deleted file mode 100644 index 141d66d1e9..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD-stderr.txt +++ /dev/null @@ -1,24 +0,0 @@ -^CMake Deprecation Warning at CMP0053-Dollar-OLD.cmake:1 \(cmake_policy\): - The OLD behavior for policy CMP0053 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ --->value<-- -CMake Error at CMP0053-Dollar-OLD.cmake:6 \(message\): - Syntax error in cmake code at - - .*CMP0053-Dollar-OLD.cmake:6 - - when parsing string - - -->\${\$}<-- - - syntax error, unexpected \$, expecting } \(6\) -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD.cmake b/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD.cmake deleted file mode 100644 index 647f4648ba..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD.cmake +++ /dev/null @@ -1,6 +0,0 @@ -cmake_policy(SET CMP0053 OLD) - -set($ value) -set(dollar $) -message("-->${${dollar}}<--") -message("-->${$}<--") diff --git a/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt deleted file mode 100644 index 09c7e7c7c6..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt +++ /dev/null @@ -1,56 +0,0 @@ -^CMake Warning \(dev\) at CMP0053-NUL.cmake:1 \(set\): - Policy CMP0053 is not set: Simplify variable reference and escape sequence - evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the - cmake_policy command to set the policy and suppress this warning. - - For input: - - '\\0' - - the old evaluation rules produce: - - '' - - but the new evaluation rules produce an error: - - Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/CMP0053-NUL.cmake:1 - when parsing string - \\0 - Invalid character escape '\\0'. - - Using the old result for compatibility since the policy is not set. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at CMP0053-NUL.cmake:2 \(set\): - Policy CMP0053 is not set: Simplify variable reference and escape sequence - evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the - cmake_policy command to set the policy and suppress this warning. - - For input: - - '\\0' - - the old evaluation rules produce: - - '' - - but the new evaluation rules produce an error: - - Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/CMP0053-NUL.cmake:2 - when parsing string - \\0 - Invalid character escape '\\0'. - - Using the old result for compatibility since the policy is not set. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - ---><-- ---><-- ---><-- ---><--$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NUL.cmake b/Tests/RunCMake/Syntax/CMP0053-NUL.cmake deleted file mode 100644 index 9ae0906802..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NUL.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(qnul "\0") -set(nul \0) -message(-->${nul}<--) -message(-->${qnul}<--) -message("-->${nul}<--") -message("-->${qnul}<--") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt deleted file mode 100644 index 9575778513..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -^CMake Error at CMP0053-NameWithCarriageReturn.cmake:2 \(message\): - message called with incorrect number of arguments -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake deleted file mode 100644 index b8a403d181..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message(${var\rwith\rcarriagereturn}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake deleted file mode 100644 index bb0d93f09d..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message("${var\rwith\rcarriagereturn}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt deleted file mode 100644 index df67d37fe8..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -^CMake Error at CMP0053-NameWithEscapedSpaces.cmake:2 \(message\): - message called with incorrect number of arguments -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake deleted file mode 100644 index 805b2ca6f6..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpaces.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message(${var\ with\ escaped\ space}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake deleted file mode 100644 index 58d8e8ff72..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedSpacesQuoted.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message("${var\ with\ escaped\ space}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt deleted file mode 100644 index 059044fb8c..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -^CMake Error at CMP0053-NameWithEscapedTabs.cmake:2 \(message\): - message called with incorrect number of arguments -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake deleted file mode 100644 index 214ab5de2e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabs.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message(${var\ with\ escaped\ tab}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake deleted file mode 100644 index aa5123f56e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message("${var\ with\ escaped\ tab}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt deleted file mode 100644 index 41f86e69bd..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -^CMake Error at CMP0053-NameWithNewline.cmake:2 \(message\): - message called with incorrect number of arguments -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake deleted file mode 100644 index 45b532e103..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message(${var\nwith\nnewline}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake deleted file mode 100644 index 6fe568db27..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message("${var\nwith\nnewline}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt deleted file mode 100644 index 95e8684c9a..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at CMP0053-NameWithSpaces.cmake:2 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake:2 - - when parsing string - - \${var - - There is an unterminated variable reference. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake deleted file mode 100644 index dae7d25489..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message(${var with space}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt deleted file mode 100644 index c4f3cfe913..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at CMP0053-NameWithSpacesQuoted.cmake:2 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake:2 - - when parsing string - - \${var with space} - - Invalid character \(' '\) in a variable name: 'var' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake deleted file mode 100644 index e252cff574..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithSpacesQuoted.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message("${var with space}") diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt deleted file mode 100644 index b1678b3831..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at CMP0053-NameWithTabs.cmake:2 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake:2 - - when parsing string - - \${var - - There is an unterminated variable reference. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake deleted file mode 100644 index 45e30457fd..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message(${var with tab}) diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt deleted file mode 100644 index 78adb5e21f..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at CMP0053-NameWithTabsQuoted.cmake:2 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake:2 - - when parsing string - - \${var with tab} - - Invalid character \(' '\) in a variable name: 'var' -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake deleted file mode 100644 index 498675fe48..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-NameWithTabsQuoted.cmake +++ /dev/null @@ -1,2 +0,0 @@ -cmake_policy(SET CMP0053 NEW) -message("${var with tab}") diff --git a/Tests/RunCMake/Syntax/CMP0053-WARN-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-WARN-stderr.txt deleted file mode 100644 index c7069390da..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-WARN-stderr.txt +++ /dev/null @@ -1,28 +0,0 @@ -^CMake Warning \(dev\) at CMP0053-WARN.cmake:2 \(message\): - Policy CMP0053 is not set: Simplify variable reference and escape sequence - evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the - cmake_policy command to set the policy and suppress this warning. - - For input: - - '\\' - - the old evaluation rules produce: - - '\\' - - but the new evaluation rules produce an error: - - Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/CMP0053-WARN.cmake:2 - when parsing string - \\ - Invalid character escape '\\' \(at end of input\). - - Using the old result for compatibility since the policy is not set. -Call Stack \(most recent call first\): - CMP0053-WARN.cmake:5 \(escape\) - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -\\$ diff --git a/Tests/RunCMake/Syntax/CMP0053-WARN.cmake b/Tests/RunCMake/Syntax/CMP0053-WARN.cmake deleted file mode 100644 index 6e8b07bbee..0000000000 --- a/Tests/RunCMake/Syntax/CMP0053-WARN.cmake +++ /dev/null @@ -1,5 +0,0 @@ -macro (escape str) - message("${str}") -endmacro () - -escape("\\") diff --git a/Tests/RunCMake/Syntax/CMakeLists.txt b/Tests/RunCMake/Syntax/CMakeLists.txt index 2897109554..bf2ef1506e 100644 --- a/Tests/RunCMake/Syntax/CMakeLists.txt +++ b/Tests/RunCMake/Syntax/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.10) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/Syntax/CMP0053-Dollar-NEW-stderr.txt b/Tests/RunCMake/Syntax/Dollar-stderr.txt similarity index 100% rename from Tests/RunCMake/Syntax/CMP0053-Dollar-NEW-stderr.txt rename to Tests/RunCMake/Syntax/Dollar-stderr.txt diff --git a/Tests/RunCMake/Syntax/CMP0053-Dollar-NEW.cmake b/Tests/RunCMake/Syntax/Dollar.cmake similarity index 71% rename from Tests/RunCMake/Syntax/CMP0053-Dollar-NEW.cmake rename to Tests/RunCMake/Syntax/Dollar.cmake index b81fd56eb4..6b87064d5d 100644 --- a/Tests/RunCMake/Syntax/CMP0053-Dollar-NEW.cmake +++ b/Tests/RunCMake/Syntax/Dollar.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0053 NEW) - set($ value) set(dollar $) message("-->${${dollar}}<--") diff --git a/Tests/RunCMake/Syntax/Escape2-stderr.txt b/Tests/RunCMake/Syntax/Escape2-stderr.txt index cc3bdf07b0..7f10c3cce2 100644 --- a/Tests/RunCMake/Syntax/Escape2-stderr.txt +++ b/Tests/RunCMake/Syntax/Escape2-stderr.txt @@ -1,7 +1,7 @@ -CMake Error at Escape2.cmake:4 \(message\): +CMake Error at Escape2.cmake:2 \(message\): Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/Escape2.cmake:4 + .*/Tests/RunCMake/Syntax/Escape2.cmake:2 when parsing string @@ -9,5 +9,5 @@ CMake Error at Escape2.cmake:4 \(message\): Invalid character escape '\\' \(at end of input\). Call Stack \(most recent call first\): - Escape2.cmake:7 \(escape\) + Escape2.cmake:5 \(escape\) CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/Escape2.cmake b/Tests/RunCMake/Syntax/Escape2.cmake index 078a822892..6e8b07bbee 100644 --- a/Tests/RunCMake/Syntax/Escape2.cmake +++ b/Tests/RunCMake/Syntax/Escape2.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0053 NEW) - macro (escape str) message("${str}") endmacro () diff --git a/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in b/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in index d1d908cbbc..9e59b78fda 100644 --- a/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in +++ b/Tests/RunCMake/Syntax/EscapeChar-char-stderr.txt.in @@ -1,7 +1,7 @@ -CMake Error at EscapeChar-@char@-@testnum@.cmake:3 \(message\): +CMake Error at EscapeChar-@char@-@testnum@.cmake:1 \(message\): Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/EscapeChar-@char@-@testnum@.cmake:3 + .*/Tests/RunCMake/Syntax/EscapeChar-@char@-@testnum@.cmake:1 when parsing string diff --git a/Tests/RunCMake/Syntax/EscapeChar-char.cmake.in b/Tests/RunCMake/Syntax/EscapeChar-char.cmake.in index 6f265e5b22..2c3bc73755 100644 --- a/Tests/RunCMake/Syntax/EscapeChar-char.cmake.in +++ b/Tests/RunCMake/Syntax/EscapeChar-char.cmake.in @@ -1,3 +1 @@ -cmake_policy(SET CMP0053 NEW) - message("-->\@char@<--") diff --git a/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake b/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake index e9c568da05..1965791052 100644 --- a/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake +++ b/Tests/RunCMake/Syntax/EscapeCharsAllowed.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0053 NEW) - set("semicolon;in;name" semicolon) set("dollar$in$name" dollar) set("brace{in}name" brace) diff --git a/Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt b/Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt index 077272d4b4..bb8f5c62d9 100644 --- a/Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt +++ b/Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt @@ -1 +1,2 @@ --->"<-- +^-->\\"<-- +-->\\"<--$ diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt index 71b9c3cbde..c999d3ef46 100644 --- a/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt @@ -1,12 +1,4 @@ ^CMake Error at NameWithCarriageReturn.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake:1 - - when parsing string - - \${var\\rwith\\rcarriagereturn} - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) + message called with incorrect number of arguments Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt deleted file mode 100644 index c43e1be972..0000000000 --- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at NameWithCarriageReturnQuoted.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake:1 - - when parsing string - - \${var\\rwith\\rcarriagereturn} - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt index 3a2613592b..f286a26092 100644 --- a/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithEscapedSpaces-stderr.txt @@ -1,12 +1,4 @@ ^CMake Error at NameWithEscapedSpaces.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithEscapedSpaces.cmake:1 - - when parsing string - - \${var\\ with\\ escaped\\ space} - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) + message called with incorrect number of arguments Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt deleted file mode 100644 index 0f40649c58..0000000000 --- a/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at NameWithEscapedSpacesQuoted.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithEscapedSpacesQuoted.cmake:1 - - when parsing string - - \${var\\ with\\ escaped\\ space} - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt index d7fc38a0a6..5a41740f6b 100644 --- a/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithEscapedTabs-stderr.txt @@ -1,12 +1,4 @@ ^CMake Error at NameWithEscapedTabs.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithEscapedTabs.cmake:1 - - when parsing string - - \${var\\ with\\ escaped\\ tab} - - Invalid escape sequence \\.? + message called with incorrect number of arguments Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt deleted file mode 100644 index 915dbaa477..0000000000 --- a/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at NameWithEscapedTabsQuoted.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithEscapedTabsQuoted.cmake:1 - - when parsing string - - \${var\\ with\\ escaped\\ tab} - - Invalid escape sequence \\.? -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt b/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt index 77bd470fab..7091970872 100644 --- a/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt @@ -1,12 +1,4 @@ ^CMake Error at NameWithNewline.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithNewline.cmake:1 - - when parsing string - - \${var\\nwith\\nnewline} - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) + message called with incorrect number of arguments Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt deleted file mode 100644 index 1d14b1d466..0000000000 --- a/Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -^CMake Error at NameWithNewlineQuoted.cmake:1 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake:1 - - when parsing string - - \${var\\nwith\\nnewline} - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt b/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt index 71e8db307e..44e0a81bb0 100644 --- a/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt @@ -7,6 +7,6 @@ \${var - syntax error, unexpected end of file, expecting } \(6\) + There is an unterminated variable reference. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt index 6e3744a622..4a129327c8 100644 --- a/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithSpacesQuoted-stderr.txt @@ -7,6 +7,6 @@ \${var with space} - syntax error, unexpected cal_SYMBOL, expecting } \(3\) + Invalid character \(' '\) in a variable name: 'var' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt b/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt index 84ccdbee30..b5f3348119 100644 --- a/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithTabs-stderr.txt @@ -7,6 +7,6 @@ \${var - syntax error, unexpected end of file, expecting } \(6\) + There is an unterminated variable reference. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt index e18268ac50..0757300ffc 100644 --- a/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt +++ b/Tests/RunCMake/Syntax/NameWithTabsQuoted-stderr.txt @@ -7,6 +7,6 @@ \${var with tab} - syntax error, unexpected cal_SYMBOL, expecting } \(3\) + Invalid character \(' '\) in a variable name: 'var' Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/ParenInENV-result.txt b/Tests/RunCMake/Syntax/ParenInENV-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/ParenInENV-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/CMP0053-Dollar-OLD-result.txt b/Tests/RunCMake/Syntax/ParenInENV1-result.txt similarity index 100% rename from Tests/RunCMake/Syntax/CMP0053-Dollar-OLD-result.txt rename to Tests/RunCMake/Syntax/ParenInENV1-result.txt diff --git a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt b/Tests/RunCMake/Syntax/ParenInENV1-stderr.txt similarity index 66% rename from Tests/RunCMake/Syntax/ParenInENV-stderr.txt rename to Tests/RunCMake/Syntax/ParenInENV1-stderr.txt index 24c810bef0..443ac7a651 100644 --- a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt +++ b/Tests/RunCMake/Syntax/ParenInENV1-stderr.txt @@ -1,4 +1,4 @@ -CMake Warning \(dev\) at ParenInENV.cmake:2: +CMake Warning \(dev\) at ParenInENV1.cmake:2: Syntax Warning in cmake code at column 21 Argument not separated from preceding token by whitespace. @@ -6,15 +6,15 @@ Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. -CMake Error at ParenInENV.cmake:2 \(message\): +CMake Error at ParenInENV1.cmake:2 \(message\): Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2 + .*/Tests/RunCMake/Syntax/ParenInENV1.cmake:2 when parsing string -->\$ENV{e - syntax error, unexpected end of file, expecting } \(10\) + There is an unterminated variable reference\. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/ParenInENV.cmake b/Tests/RunCMake/Syntax/ParenInENV1.cmake similarity index 100% rename from Tests/RunCMake/Syntax/ParenInENV.cmake rename to Tests/RunCMake/Syntax/ParenInENV1.cmake diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt b/Tests/RunCMake/Syntax/ParenInENV2-stderr.txt similarity index 100% rename from Tests/RunCMake/Syntax/CMP0053-ParenInENV-stderr.txt rename to Tests/RunCMake/Syntax/ParenInENV2-stderr.txt diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake b/Tests/RunCMake/Syntax/ParenInENV2.cmake similarity index 62% rename from Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake rename to Tests/RunCMake/Syntax/ParenInENV2.cmake index b5cdf0fd1d..53c5e2b1a5 100644 --- a/Tests/RunCMake/Syntax/CMP0053-ParenInENV.cmake +++ b/Tests/RunCMake/Syntax/ParenInENV2.cmake @@ -1,3 +1,2 @@ -cmake_policy(SET CMP0053 NEW) set("ENV{e(x)}" value) message(-->$ENV{e\(x\)}<--) diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt b/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt deleted file mode 100644 index 7020c7e738..0000000000 --- a/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt +++ /dev/null @@ -1 +0,0 @@ --->value<-- diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt b/Tests/RunCMake/Syntax/ParenInQuotedENV1-result.txt similarity index 100% rename from Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt rename to Tests/RunCMake/Syntax/ParenInQuotedENV1-result.txt diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV1-stderr.txt b/Tests/RunCMake/Syntax/ParenInQuotedENV1-stderr.txt new file mode 100644 index 0000000000..7803634deb --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenInQuotedENV1-stderr.txt @@ -0,0 +1,13 @@ +^CMake Error at ParenInQuotedENV1\.cmake:2 \(message\): + Syntax error in cmake code at + + [^ +]*/Tests/RunCMake/Syntax/ParenInQuotedENV1\.cmake:2 + + when parsing string + + -->\$ENV{e\(x\)}<-- + + Invalid character \('\('\) in a variable name: 'e' +Call Stack \(most recent call first\): + CMakeLists\.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake b/Tests/RunCMake/Syntax/ParenInQuotedENV1.cmake similarity index 100% rename from Tests/RunCMake/Syntax/ParenInQuotedENV.cmake rename to Tests/RunCMake/Syntax/ParenInQuotedENV1.cmake diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt b/Tests/RunCMake/Syntax/ParenInQuotedENV2-stderr.txt similarity index 100% rename from Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV-stderr.txt rename to Tests/RunCMake/Syntax/ParenInQuotedENV2-stderr.txt diff --git a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake b/Tests/RunCMake/Syntax/ParenInQuotedENV2.cmake similarity index 63% rename from Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake rename to Tests/RunCMake/Syntax/ParenInQuotedENV2.cmake index 5559d4b9d8..0a836d06e1 100644 --- a/Tests/RunCMake/Syntax/CMP0053-ParenInQuotedENV.cmake +++ b/Tests/RunCMake/Syntax/ParenInQuotedENV2.cmake @@ -1,3 +1,2 @@ -cmake_policy(SET CMP0053 NEW) set("ENV{e(x)}" value) message("-->$ENV{e\(x\)}<--") diff --git a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt index 0a6b60fb9e..8fb5650939 100644 --- a/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt +++ b/Tests/RunCMake/Syntax/ParenInVarName0-stderr.txt @@ -1,7 +1,7 @@ -CMake Error at ParenInVarName0.cmake:4 \(message\): +CMake Error at ParenInVarName0.cmake:2 \(message\): Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/ParenInVarName0.cmake:4 + .*/Tests/RunCMake/Syntax/ParenInVarName0.cmake:2 when parsing string diff --git a/Tests/RunCMake/Syntax/ParenInVarName0.cmake b/Tests/RunCMake/Syntax/ParenInVarName0.cmake index f863d20c62..3e93d4eb4b 100644 --- a/Tests/RunCMake/Syntax/ParenInVarName0.cmake +++ b/Tests/RunCMake/Syntax/ParenInVarName0.cmake @@ -1,4 +1,2 @@ -cmake_policy(SET CMP0053 NEW) - set("e(x)" value) message("-->${e(x)}<--") diff --git a/Tests/RunCMake/Syntax/ParenInVarName1-result.txt b/Tests/RunCMake/Syntax/ParenInVarName1-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/ParenInVarName1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt b/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt deleted file mode 100644 index 18ca946fd9..0000000000 --- a/Tests/RunCMake/Syntax/ParenInVarName1-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -CMake Error at ParenInVarName1.cmake:4 \(message\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/ParenInVarName1.cmake:4 - - when parsing string - - -->\${e\(x\)}<-- - - syntax error, unexpected cal_SYMBOL, expecting } \(6\) -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/ParenInVarName1.cmake b/Tests/RunCMake/Syntax/ParenInVarName1.cmake deleted file mode 100644 index 9fdc87bbfc..0000000000 --- a/Tests/RunCMake/Syntax/ParenInVarName1.cmake +++ /dev/null @@ -1,4 +0,0 @@ -cmake_policy(SET CMP0053 OLD) - -set("{e(x)}" value) -message("-->${e(x)}<--") diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake index 8f944b29e2..2817f764f3 100644 --- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake +++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake @@ -1,19 +1,10 @@ include(RunCMake) -set(RunCMake_IGNORE_POLICY_VERSION_DEPRECATION ON) run_cmake(BOM-UTF-8) run_cmake(BOM-UTF-16-LE) run_cmake(BOM-UTF-16-BE) run_cmake(BOM-UTF-32-LE) run_cmake(BOM-UTF-32-BE) -run_cmake(CMP0053-At-OLD) -run_cmake(CMP0053-At-NEW) -run_cmake(CMP0053-At-WARN) -run_cmake(CMP0053-At-WARN-newlines) -run_cmake(CMP0053-WARN) -run_cmake(CMP0053-NUL) -run_cmake(CMP0053-ParenInENV) -run_cmake(CMP0053-ParenInQuotedENV) run_cmake(CommandSpaces) run_cmake(CommandTabs) run_cmake(CommandNewlines) @@ -65,11 +56,9 @@ run_cmake(ParenNoSpace0) run_cmake(ParenNoSpace1) run_cmake(ParenNoSpace2) run_cmake(ParenInVarName0) -run_cmake(ParenInVarName1) run_cmake(UnterminatedCall1) run_cmake(UnterminatedCall2) run_cmake(UnterminatedString) -run_cmake(UnterminatedBrace0) run_cmake(UnterminatedBrace1) run_cmake(UnterminatedBracket0) run_cmake(UnterminatedBracket1) @@ -80,14 +69,17 @@ run_cmake(ImproperNesting) run_cmake(ExpandInAt) run_cmake(EscapedAt) run_cmake(EscapeQuotes) +run_cmake(At) run_cmake(AtWithVariable) run_cmake(AtWithVariableEmptyExpansion) run_cmake(AtWithVariableAtOnly) run_cmake(AtWithVariableEmptyExpansionAtOnly) run_cmake(AtWithVariableFile) run_cmake(AtWithVariableAtOnlyFile) -run_cmake(ParenInENV) -run_cmake(ParenInQuotedENV) +run_cmake(ParenInENV1) +run_cmake(ParenInENV2) +run_cmake(ParenInQuotedENV1) +run_cmake(ParenInQuotedENV2) # Variable name tests run_cmake(NameWithSpaces) @@ -102,20 +94,7 @@ run_cmake(NameWithNewlineQuoted) run_cmake(NameWithCarriageReturnQuoted) run_cmake(NameWithEscapedSpacesQuoted) run_cmake(NameWithEscapedTabsQuoted) -run_cmake(CMP0053-NameWithSpaces) -run_cmake(CMP0053-NameWithTabs) -run_cmake(CMP0053-NameWithNewline) -run_cmake(CMP0053-NameWithCarriageReturn) -run_cmake(CMP0053-NameWithEscapedSpaces) -run_cmake(CMP0053-NameWithEscapedTabs) -run_cmake(CMP0053-NameWithSpacesQuoted) -run_cmake(CMP0053-NameWithTabsQuoted) -run_cmake(CMP0053-NameWithNewlineQuoted) -run_cmake(CMP0053-NameWithCarriageReturnQuoted) -run_cmake(CMP0053-NameWithEscapedSpacesQuoted) -run_cmake(CMP0053-NameWithEscapedTabsQuoted) -run_cmake(CMP0053-Dollar-OLD) -run_cmake(CMP0053-Dollar-NEW) +run_cmake(Dollar) # Variable special types run_cmake(QueryCache) diff --git a/Tests/RunCMake/Syntax/Unquoted2.cmake b/Tests/RunCMake/Syntax/Unquoted2.cmake index d94057d903..4f8ffb28b2 100644 --- a/Tests/RunCMake/Syntax/Unquoted2.cmake +++ b/Tests/RunCMake/Syntax/Unquoted2.cmake @@ -1,3 +1 @@ -cmake_policy(SET CMP0053 NEW) - message(\[[Unquoted Bracket Argument 1]]) diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt b/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/Syntax/UnterminatedBrace0-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt deleted file mode 100644 index c7238df5b2..0000000000 --- a/Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt +++ /dev/null @@ -1,12 +0,0 @@ -CMake Error at UnterminatedBrace0.cmake:1 \(set\): - Syntax error in cmake code at - - .*/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake:1 - - when parsing string - - \${ - - syntax error, unexpected end of file, expecting } \(3\) -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake b/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake deleted file mode 100644 index 09af0cea65..0000000000 --- a/Tests/RunCMake/Syntax/UnterminatedBrace0.cmake +++ /dev/null @@ -1 +0,0 @@ -set(var "${") diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt index 4df56d1e30..745a651d0c 100644 --- a/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt +++ b/Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt @@ -1,7 +1,7 @@ -CMake Error at UnterminatedBrace1.cmake:2 \(set\): +CMake Error at UnterminatedBrace1.cmake:1 \(set\): Syntax error in cmake code at - .*/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake:2 + .*/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake:1 when parsing string diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake b/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake index db39af7269..09af0cea65 100644 --- a/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake +++ b/Tests/RunCMake/Syntax/UnterminatedBrace1.cmake @@ -1,2 +1 @@ -cmake_policy(SET CMP0053 NEW) set(var "${") diff --git a/Tests/RunCMake/VsDotnetSdk/RunCMakeTest.cmake b/Tests/RunCMake/VsDotnetSdk/RunCMakeTest.cmake index 151b907aaf..2f9fc7de13 100644 --- a/Tests/RunCMake/VsDotnetSdk/RunCMakeTest.cmake +++ b/Tests/RunCMake/VsDotnetSdk/RunCMakeTest.cmake @@ -1,4 +1,3 @@ -cmake_policy(SET CMP0053 NEW) include(RunCMake) run_cmake(VsDotnetSdkStartupObject) diff --git a/Tests/RunCMake/VsNugetPackageRestore/RunCMakeTest.cmake b/Tests/RunCMake/VsNugetPackageRestore/RunCMakeTest.cmake index 625167c063..8ca966fc58 100644 --- a/Tests/RunCMake/VsNugetPackageRestore/RunCMakeTest.cmake +++ b/Tests/RunCMake/VsNugetPackageRestore/RunCMakeTest.cmake @@ -1,4 +1,3 @@ -cmake_policy(SET CMP0053 NEW) include(RunCMake) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/VsNugetPackageRestore) diff --git a/Tests/RunCMake/cmake_language/defer_call-stderr.txt b/Tests/RunCMake/cmake_language/defer_call-stderr.txt index 7e8d8ca153..d1ae0d79b5 100644 --- a/Tests/RunCMake/cmake_language/defer_call-stderr.txt +++ b/Tests/RunCMake/cmake_language/defer_call-stderr.txt @@ -1,13 +1,4 @@ -^CMake Deprecation Warning at defer_call/CMakeLists.txt:[0-9]+ \(cmake_policy\): - The OLD behavior for policy CMP0053 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -+ -CMake Warning at defer_call/CMakeLists.txt:3 \(message\): +^CMake Warning at defer_call/CMakeLists.txt:2 \(message\): Double-Deferred Warning In Subdirectory: '[^']*/Tests/RunCMake/cmake_language/defer_call/CMakeLists.txt:DEFERRED:id3' diff --git a/Tests/RunCMake/cmake_language/defer_call/CMakeLists.txt b/Tests/RunCMake/cmake_language/defer_call/CMakeLists.txt index 544b9f48db..ea299852c1 100644 --- a/Tests/RunCMake/cmake_language/defer_call/CMakeLists.txt +++ b/Tests/RunCMake/cmake_language/defer_call/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_policy(SET CMP0053 OLD) cmake_language(DEFER ID id1 CALL message STATUS "Deferred Message In Subdirectory: '${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}'") cmake_language(DEFER ID id2 CALL cmake_language DEFER ID id3 CALL From 292aaffb786d43ef528869514edd1e114c9247fe Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Dec 2024 18:34:30 -0500 Subject: [PATCH 4/7] Source: Remove unused cmCommandArgument{Lexer,Parser} These were used only for the CMP0053 OLD behavior, which has now been removed. --- Source/CMakeLists.txt | 8 - Source/LexerParser/cmCommandArgumentLexer.cxx | 2246 ----------------- Source/LexerParser/cmCommandArgumentLexer.h | 689 ----- .../LexerParser/cmCommandArgumentLexer.in.l | 148 -- .../LexerParser/cmCommandArgumentParser.cxx | 1856 -------------- Source/LexerParser/cmCommandArgumentParser.y | 196 -- .../cmCommandArgumentParserTokens.h | 81 - Source/cmCommandArgumentParserHelper.cxx | 296 --- Source/cmCommandArgumentParserHelper.h | 91 - bootstrap | 3 - 10 files changed, 5614 deletions(-) delete mode 100644 Source/LexerParser/cmCommandArgumentLexer.cxx delete mode 100644 Source/LexerParser/cmCommandArgumentLexer.h delete mode 100644 Source/LexerParser/cmCommandArgumentLexer.in.l delete mode 100644 Source/LexerParser/cmCommandArgumentParser.cxx delete mode 100644 Source/LexerParser/cmCommandArgumentParser.y delete mode 100644 Source/LexerParser/cmCommandArgumentParserTokens.h delete mode 100644 Source/cmCommandArgumentParserHelper.cxx delete mode 100644 Source/cmCommandArgumentParserHelper.h diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 373e695337..f785cd914b 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -62,12 +62,6 @@ add_library(ManifestLib INTERFACE) add_library( CMakeLib # Lexers/Parsers - LexerParser/cmCommandArgumentLexer.cxx - LexerParser/cmCommandArgumentLexer.h - LexerParser/cmCommandArgumentLexer.in.l - LexerParser/cmCommandArgumentParser.cxx - LexerParser/cmCommandArgumentParserTokens.h - LexerParser/cmCommandArgumentParser.y LexerParser/cmDependsJavaLexer.cxx LexerParser/cmDependsJavaLexer.h LexerParser/cmDependsJavaLexer.in.l @@ -141,7 +135,6 @@ add_library( cmCMakePresetsGraphReadJSONPackagePresets.cxx cmCMakePresetsGraphReadJSONTestPresets.cxx cmCMakePresetsGraphReadJSONWorkflowPresets.cxx - cmCommandArgumentParserHelper.cxx cmCommandLineArgument.h cmCommonTargetGenerator.cxx cmCommonTargetGenerator.h @@ -1018,7 +1011,6 @@ if(CMake_BUILD_PCH) set_source_files_properties("LexerParser/cmFortranParser.cxx" PROPERTIES SKIP_PRECOMPILE_HEADERS ON) else() set_source_files_properties( - "LexerParser/cmCommandArgumentLexer.cxx" "LexerParser/cmGccDepfileLexer.cxx" "LexerParser/cmExprLexer.cxx" "LexerParser/cmDependsJavaLexer.cxx" diff --git a/Source/LexerParser/cmCommandArgumentLexer.cxx b/Source/LexerParser/cmCommandArgumentLexer.cxx deleted file mode 100644 index 4b7eb79818..0000000000 --- a/Source/LexerParser/cmCommandArgumentLexer.cxx +++ /dev/null @@ -1,2246 +0,0 @@ -#include "cmStandardLexer.h" - -#define FLEXINT_H 1 -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -#ifdef yy_create_buffer -#define cmCommandArgument_yy_create_buffer_ALREADY_DEFINED -#else -#define yy_create_buffer cmCommandArgument_yy_create_buffer -#endif - -#ifdef yy_delete_buffer -#define cmCommandArgument_yy_delete_buffer_ALREADY_DEFINED -#else -#define yy_delete_buffer cmCommandArgument_yy_delete_buffer -#endif - -#ifdef yy_scan_buffer -#define cmCommandArgument_yy_scan_buffer_ALREADY_DEFINED -#else -#define yy_scan_buffer cmCommandArgument_yy_scan_buffer -#endif - -#ifdef yy_scan_string -#define cmCommandArgument_yy_scan_string_ALREADY_DEFINED -#else -#define yy_scan_string cmCommandArgument_yy_scan_string -#endif - -#ifdef yy_scan_bytes -#define cmCommandArgument_yy_scan_bytes_ALREADY_DEFINED -#else -#define yy_scan_bytes cmCommandArgument_yy_scan_bytes -#endif - -#ifdef yy_init_buffer -#define cmCommandArgument_yy_init_buffer_ALREADY_DEFINED -#else -#define yy_init_buffer cmCommandArgument_yy_init_buffer -#endif - -#ifdef yy_flush_buffer -#define cmCommandArgument_yy_flush_buffer_ALREADY_DEFINED -#else -#define yy_flush_buffer cmCommandArgument_yy_flush_buffer -#endif - -#ifdef yy_load_buffer_state -#define cmCommandArgument_yy_load_buffer_state_ALREADY_DEFINED -#else -#define yy_load_buffer_state cmCommandArgument_yy_load_buffer_state -#endif - -#ifdef yy_switch_to_buffer -#define cmCommandArgument_yy_switch_to_buffer_ALREADY_DEFINED -#else -#define yy_switch_to_buffer cmCommandArgument_yy_switch_to_buffer -#endif - -#ifdef yypush_buffer_state -#define cmCommandArgument_yypush_buffer_state_ALREADY_DEFINED -#else -#define yypush_buffer_state cmCommandArgument_yypush_buffer_state -#endif - -#ifdef yypop_buffer_state -#define cmCommandArgument_yypop_buffer_state_ALREADY_DEFINED -#else -#define yypop_buffer_state cmCommandArgument_yypop_buffer_state -#endif - -#ifdef yyensure_buffer_stack -#define cmCommandArgument_yyensure_buffer_stack_ALREADY_DEFINED -#else -#define yyensure_buffer_stack cmCommandArgument_yyensure_buffer_stack -#endif - -#ifdef yylex -#define cmCommandArgument_yylex_ALREADY_DEFINED -#else -#define yylex cmCommandArgument_yylex -#endif - -#ifdef yyrestart -#define cmCommandArgument_yyrestart_ALREADY_DEFINED -#else -#define yyrestart cmCommandArgument_yyrestart -#endif - -#ifdef yylex_init -#define cmCommandArgument_yylex_init_ALREADY_DEFINED -#else -#define yylex_init cmCommandArgument_yylex_init -#endif - -#ifdef yylex_init_extra -#define cmCommandArgument_yylex_init_extra_ALREADY_DEFINED -#else -#define yylex_init_extra cmCommandArgument_yylex_init_extra -#endif - -#ifdef yylex_destroy -#define cmCommandArgument_yylex_destroy_ALREADY_DEFINED -#else -#define yylex_destroy cmCommandArgument_yylex_destroy -#endif - -#ifdef yyget_debug -#define cmCommandArgument_yyget_debug_ALREADY_DEFINED -#else -#define yyget_debug cmCommandArgument_yyget_debug -#endif - -#ifdef yyset_debug -#define cmCommandArgument_yyset_debug_ALREADY_DEFINED -#else -#define yyset_debug cmCommandArgument_yyset_debug -#endif - -#ifdef yyget_extra -#define cmCommandArgument_yyget_extra_ALREADY_DEFINED -#else -#define yyget_extra cmCommandArgument_yyget_extra -#endif - -#ifdef yyset_extra -#define cmCommandArgument_yyset_extra_ALREADY_DEFINED -#else -#define yyset_extra cmCommandArgument_yyset_extra -#endif - -#ifdef yyget_in -#define cmCommandArgument_yyget_in_ALREADY_DEFINED -#else -#define yyget_in cmCommandArgument_yyget_in -#endif - -#ifdef yyset_in -#define cmCommandArgument_yyset_in_ALREADY_DEFINED -#else -#define yyset_in cmCommandArgument_yyset_in -#endif - -#ifdef yyget_out -#define cmCommandArgument_yyget_out_ALREADY_DEFINED -#else -#define yyget_out cmCommandArgument_yyget_out -#endif - -#ifdef yyset_out -#define cmCommandArgument_yyset_out_ALREADY_DEFINED -#else -#define yyset_out cmCommandArgument_yyset_out -#endif - -#ifdef yyget_leng -#define cmCommandArgument_yyget_leng_ALREADY_DEFINED -#else -#define yyget_leng cmCommandArgument_yyget_leng -#endif - -#ifdef yyget_text -#define cmCommandArgument_yyget_text_ALREADY_DEFINED -#else -#define yyget_text cmCommandArgument_yyget_text -#endif - -#ifdef yyget_lineno -#define cmCommandArgument_yyget_lineno_ALREADY_DEFINED -#else -#define yyget_lineno cmCommandArgument_yyget_lineno -#endif - -#ifdef yyset_lineno -#define cmCommandArgument_yyset_lineno_ALREADY_DEFINED -#else -#define yyset_lineno cmCommandArgument_yyset_lineno -#endif - -#ifdef yyget_column -#define cmCommandArgument_yyget_column_ALREADY_DEFINED -#else -#define yyget_column cmCommandArgument_yyget_column -#endif - -#ifdef yyset_column -#define cmCommandArgument_yyset_column_ALREADY_DEFINED -#else -#define yyset_column cmCommandArgument_yyset_column -#endif - -#ifdef yywrap -#define cmCommandArgument_yywrap_ALREADY_DEFINED -#else -#define yywrap cmCommandArgument_yywrap -#endif - -#ifdef yyalloc -#define cmCommandArgument_yyalloc_ALREADY_DEFINED -#else -#define yyalloc cmCommandArgument_yyalloc -#endif - -#ifdef yyrealloc -#define cmCommandArgument_yyrealloc_ALREADY_DEFINED -#else -#define yyrealloc cmCommandArgument_yyrealloc -#endif - -#ifdef yyfree -#define cmCommandArgument_yyfree_ALREADY_DEFINED -#else -#define yyfree cmCommandArgument_yyfree -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -/* begin standard C++ headers. */ - -/* TODO: this is always defined, so inline it */ -#define yyconst const - -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) -#else -#define yynoreturn -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an - * integer in range [0..255] for use as an array index. - */ -#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yyg->yy_start = 1 + 2 * -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yyg->yy_start - 1) / 2) -#define YYSTATE YY_START -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin , yyscanner ) -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - #define YY_LESS_LINENO(n) - #define YY_LINENO_REWIND_TO(ptr) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = yyg->yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) -#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - int yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ - ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ - : NULL) -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] - -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); - -static void yyensure_buffer_stack ( yyscan_t yyscanner ); -static void yy_load_buffer_state ( yyscan_t yyscanner ); -static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); -#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) - -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); - -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); - -#define yy_new_buffer yy_create_buffer -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -#define cmCommandArgument_yywrap(yyscanner) (/*CONSTCOND*/1) -#define YY_SKIP_YYWRAP -typedef flex_uint8_t YY_CHAR; - -typedef int yy_state_type; - -#define yytext_ptr yytext_r - -static yy_state_type yy_get_previous_state ( yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans ( yy_state_type current_state , yyscan_t yyscanner); -static int yy_get_next_buffer ( yyscan_t yyscanner ); -static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 14 -#define YY_END_OF_BUFFER 15 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static const flex_int16_t yy_accept[30] = - { 0, - 0, 0, 0, 0, 0, 0, 15, 9, 10, 7, - 6, 14, 11, 5, 12, 13, 9, 0, 0, 4, - 7, 0, 8, 2, 0, 3, 0, 1, 0 - } ; - -static const YY_CHAR yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, - 1, 1, 4, 1, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, - 1, 1, 1, 5, 4, 4, 4, 4, 6, 4, - 4, 4, 4, 4, 4, 4, 4, 7, 4, 4, - 4, 4, 4, 4, 4, 8, 4, 4, 4, 4, - 1, 9, 1, 1, 4, 1, 4, 4, 4, 4, - - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 10, 1, 11, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static const YY_CHAR yy_meta[12] = - { 0, - 1, 2, 3, 4, 3, 4, 4, 4, 3, 5, - 3 - } ; - -static const flex_int16_t yy_base[35] = - { 0, - 0, 0, 31, 30, 29, 28, 36, 0, 6, 16, - 0, 41, 41, 41, 0, 41, 0, 22, 22, 41, - 18, 18, 41, 41, 7, 41, 4, 41, 41, 20, - 21, 26, 9, 30 - } ; - -static const flex_int16_t yy_def[35] = - { 0, - 29, 1, 1, 1, 1, 1, 29, 30, 31, 32, - 33, 29, 29, 29, 34, 29, 30, 31, 18, 29, - 32, 33, 29, 29, 18, 29, 18, 29, 0, 29, - 29, 29, 29, 29 - } ; - -static const flex_int16_t yy_nxt[53] = - { 0, - 8, 8, 9, 10, 11, 10, 10, 10, 12, 13, - 14, 19, 22, 28, 27, 20, 17, 17, 17, 17, - 17, 17, 26, 17, 18, 18, 21, 21, 25, 21, - 23, 24, 23, 23, 23, 29, 16, 16, 15, 15, - 7, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29 - } ; - -static const flex_int16_t yy_chk[53] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 9, 33, 27, 25, 9, 10, 10, 21, 21, - 30, 30, 22, 30, 31, 31, 32, 32, 19, 32, - 34, 18, 34, 34, 34, 7, 6, 5, 4, 3, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29 - } ; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -/* - -This file must be translated to C++ and modified to build everywhere. - -Run flex >= 2.6 like this: - - flex --nounistd --never-interactive --batch -DFLEXINT_H --noline --header-file=cmCommandArgumentLexer.h -ocmCommandArgumentLexer.cxx cmCommandArgumentLexer.in.l - -Modify cmCommandArgumentLexer.cxx: - - remove trailing whitespace: sed -i 's/\s*$//' cmCommandArgumentLexer.h cmCommandArgumentLexer.cxx - - remove blank lines at end of file: sed -i '${/^$/d;}' cmCommandArgumentLexer.h cmCommandArgumentLexer.cxx - - #include "cmStandardLexer.h" at the top: sed -i '1i#include "cmStandardLexer.h"' cmCommandArgumentLexer.cxx - -*/ - -/* IWYU pragma: no_forward_declare yyguts_t */ - -#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ - -#include "cmCommandArgumentParserHelper.h" - -#define YY_USER_ACTION yyextra->UpdateInputPosition(yyleng); - -/* Include the set of tokens from the parser. */ -#include "cmCommandArgumentParserTokens.h" - -static const char *DCURLYVariable = "${"; -static const char *RCURLYVariable = "}"; -static const char *ATVariable = "@"; -static const char *DOLLARVariable = "$"; -static const char *LCURLYVariable = "{"; -static const char *BSLASHVariable = "\\"; - -/*--------------------------------------------------------------------------*/ - -#define INITIAL 0 -#define ESCAPES 1 -#define NOESCAPES 2 - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -/* Holds the entire state of the reentrant scanner. */ -struct yyguts_t - { - - /* User-defined. Not touched by flex. */ - YY_EXTRA_TYPE yyextra_r; - - /* The rest are the same as the globals declared in the non-reentrant scanner. */ - FILE *yyin_r, *yyout_r; - size_t yy_buffer_stack_top; /**< index of top of stack. */ - size_t yy_buffer_stack_max; /**< capacity of stack. */ - YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ - char yy_hold_char; - int yy_n_chars; - int yyleng_r; - char *yy_c_buf_p; - int yy_init; - int yy_start; - int yy_did_buffer_switch_on_eof; - int yy_start_stack_ptr; - int yy_start_stack_depth; - int *yy_start_stack; - yy_state_type yy_last_accepting_state; - char* yy_last_accepting_cpos; - - int yylineno_r; - int yy_flex_debug_r; - - char *yytext_r; - int yy_more_flag; - int yy_more_len; - - }; /* end struct yyguts_t */ - -static int yy_init_globals ( yyscan_t yyscanner ); - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy ( yyscan_t yyscanner ); - -int yyget_debug ( yyscan_t yyscanner ); - -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); - -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); - -FILE *yyget_in ( yyscan_t yyscanner ); - -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); - -FILE *yyget_out ( yyscan_t yyscanner ); - -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - - int yyget_leng ( yyscan_t yyscanner ); - -char *yyget_text ( yyscan_t yyscanner ); - -int yyget_lineno ( yyscan_t yyscanner ); - -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); - -int yyget_column ( yyscan_t yyscanner ); - -void yyset_column ( int _column_no , yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); -#else -extern int yywrap ( yyscan_t yyscanner ); -#endif -#endif - -#ifndef YY_NO_UNPUT - -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput ( yyscan_t yyscanner ); -#else -static int input ( yyscan_t yyscanner ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - int n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (yyscan_t yyscanner); - -#define YY_DECL int yylex (yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK /*LINTED*/break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - yy_state_type yy_current_state; - char *yy_cp, *yy_bp; - int yy_act; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( !yyg->yy_init ) - { - yyg->yy_init = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yyg->yy_start ) - yyg->yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); - } - - yy_load_buffer_state( yyscanner ); - } - - { - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ - { - yy_cp = yyg->yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yyg->yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yyg->yy_start; -yy_match: - do - { - YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 30 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - ++yy_cp; - } - while ( yy_current_state != 29 ); - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - YY_DO_BEFORE_ACTION; - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yyg->yy_hold_char; - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - -case 1: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2); - return cal_ENVCURLY; -} - YY_BREAK -case 2: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2); - return cal_NCURLY; -} - YY_BREAK -case 3: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2); - return cal_ATNAME; -} - YY_BREAK -case 4: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = DCURLYVariable; - return cal_DCURLY; -} - YY_BREAK -case 5: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = RCURLYVariable; - return cal_RCURLY; -} - YY_BREAK -case 6: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = ATVariable; - return cal_AT; -} - YY_BREAK -case 7: -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - return cal_NAME; -} - YY_BREAK -case 8: -YY_RULE_SETUP -{ - if ( !yyextra->HandleEscapeSymbol(yylvalp, *(yytext+1)) ) - { - return cal_ERROR; - } - return cal_SYMBOL; -} - YY_BREAK -case 9: -/* rule 9 can match eol */ -YY_RULE_SETUP -{ - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - return cal_SYMBOL; -} - YY_BREAK -case 10: -YY_RULE_SETUP -{ - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = DOLLARVariable; - return cal_DOLLAR; -} - YY_BREAK -case 11: -YY_RULE_SETUP -{ - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = LCURLYVariable; - return cal_LCURLY; -} - YY_BREAK -case 12: -YY_RULE_SETUP -{ - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = BSLASHVariable; - return cal_BSLASH; -} - YY_BREAK -case 13: -YY_RULE_SETUP -{ - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = BSLASHVariable; - return cal_SYMBOL; -} - YY_BREAK -case 14: -YY_RULE_SETUP -ECHO; - YY_BREAK -case YY_STATE_EOF(INITIAL): -case YY_STATE_EOF(ESCAPES): -case YY_STATE_EOF(NOESCAPES): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yyg->yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); - - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yyg->yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_END_OF_FILE: - { - yyg->yy_did_buffer_switch_on_eof = 0; - - if ( yywrap( yyscanner ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = - yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yyg->yy_c_buf_p = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ - } /* end of user's declarations */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - char *source = yyg->yytext_ptr; - int number_to_move, i; - int ret_val; - - if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1); - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; - - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; - - int yy_c_buf_p_offset = - (int) (yyg->yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc( (void *) b->yy_ch_buf, - (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = NULL; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - if ( yyg->yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin , yyscanner); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( - (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); - } - - yyg->yy_n_chars += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (yyscan_t yyscanner) -{ - yy_state_type yy_current_state; - char *yy_cp; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_current_state = yyg->yy_start; - - for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) - { - YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 30 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) -{ - int yy_is_jam; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - char *yy_cp = yyg->yy_c_buf_p; - - YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 30 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 29); - - (void)yyg; - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_UNPUT - -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (yyscan_t yyscanner) -#else - static int input (yyscan_t yyscanner) -#endif - -{ - int c; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - *yyg->yy_c_buf_p = yyg->yy_hold_char; - - if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - /* This was really a NUL. */ - *yyg->yy_c_buf_p = '\0'; - - else - { /* need more input */ - int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); - ++yyg->yy_c_buf_p; - - switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart( yyin , yyscanner); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( yyscanner ) ) - return 0; - - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(yyscanner); -#else - return input(yyscanner); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = yyg->yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ - *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ - yyg->yy_hold_char = *++yyg->yy_c_buf_p; - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * @param yyscanner The scanner object. - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); - } - - yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); - yy_load_buffer_state( yyscanner ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * @param yyscanner The scanner object. - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (yyscanner); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( yyscanner ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - yyg->yy_did_buffer_switch_on_eof = 1; -} - -static void yy_load_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - yyg->yy_hold_char = *yyg->yy_c_buf_p; -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * @param yyscanner The scanner object. - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer( b, file , yyscanner); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * @param yyscanner The scanner object. - */ - void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree( (void *) b->yy_ch_buf , yyscanner ); - - yyfree( (void *) b , yyscanner ); -} - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) - -{ - int oerrno = errno; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_flush_buffer( b , yyscanner); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * @param yyscanner The scanner object. - */ - void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( yyscanner ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * @param yyscanner The scanner object. - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(yyscanner); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - yyg->yy_buffer_stack_top++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * @param yyscanner The scanner object. - */ -void yypop_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); - YY_CURRENT_BUFFER_LVALUE = NULL; - if (yyg->yy_buffer_stack_top > 0) - --yyg->yy_buffer_stack_top; - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (yyscan_t yyscanner) -{ - yy_size_t num_to_alloc; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (!yyg->yy_buffer_stack) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - yyg->yy_buffer_stack_max = num_to_alloc; - yyg->yy_buffer_stack_top = 0; - return; - } - - if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - yy_size_t grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc - (yyg->yy_buffer_stack, - num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return NULL; - - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = NULL; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer( b , yyscanner ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) -{ - - return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc( n , yyscanner ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer( buf, n , yyscanner); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = yyg->yy_hold_char; \ - yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ - yyg->yy_hold_char = *yyg->yy_c_buf_p; \ - *yyg->yy_c_buf_p = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the user-defined data for this scanner. - * @param yyscanner The scanner object. - */ -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyextra; -} - -/** Get the current line number. - * @param yyscanner The scanner object. - */ -int yyget_lineno (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yylineno; -} - -/** Get the current column number. - * @param yyscanner The scanner object. - */ -int yyget_column (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yycolumn; -} - -/** Get the input stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_in (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyin; -} - -/** Get the output stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_out (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyout; -} - -/** Get the length of the current token. - * @param yyscanner The scanner object. - */ -int yyget_leng (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyleng; -} - -/** Get the current token. - * @param yyscanner The scanner object. - */ - -char *yyget_text (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yytext; -} - -/** Set the user-defined data. This data is never touched by the scanner. - * @param user_defined The data to be associated with this scanner. - * @param yyscanner The scanner object. - */ -void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyextra = user_defined ; -} - -/** Set the current line number. - * @param _line_number line number - * @param yyscanner The scanner object. - */ -void yyset_lineno (int _line_number , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* lineno is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); - - yylineno = _line_number; -} - -/** Set the current column. - * @param _column_no column number - * @param yyscanner The scanner object. - */ -void yyset_column (int _column_no , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* column is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "yyset_column called with no buffer" ); - - yycolumn = _column_no; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param _in_str A readable stream. - * @param yyscanner The scanner object. - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * _in_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = _in_str ; -} - -void yyset_out (FILE * _out_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = _out_str ; -} - -int yyget_debug (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yy_flex_debug; -} - -void yyset_debug (int _bdebug , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = _bdebug ; -} - -/* Accessor methods for yylval and yylloc */ - -/* User-visible API */ - -/* yylex_init is special because it creates the scanner itself, so it is - * the ONLY reentrant function that doesn't take the scanner as the last argument. - * That's why we explicitly handle the declaration, instead of using our macros. - */ -int yylex_init(yyscan_t* ptr_yy_globals) -{ - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - return yy_init_globals ( *ptr_yy_globals ); -} - -/* yylex_init_extra has the same functionality as yylex_init, but follows the - * convention of taking the scanner as the last argument. Note however, that - * this is a *pointer* to a scanner, as it will be allocated by this call (and - * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to yyalloc in - * the yyextra field. - */ -int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) -{ - struct yyguts_t dummy_yyguts; - - yyset_extra (yy_user_defined, &dummy_yyguts); - - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in - yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - yyset_extra (yy_user_defined, *ptr_yy_globals); - - return yy_init_globals ( *ptr_yy_globals ); -} - -static int yy_init_globals (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - yyg->yy_buffer_stack = NULL; - yyg->yy_buffer_stack_top = 0; - yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = NULL; - yyg->yy_init = 0; - yyg->yy_start = 0; - - yyg->yy_start_stack_ptr = 0; - yyg->yy_start_stack_depth = 0; - yyg->yy_start_stack = NULL; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = NULL; - yyout = NULL; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(yyscanner); - } - - /* Destroy the stack itself. */ - yyfree(yyg->yy_buffer_stack , yyscanner); - yyg->yy_buffer_stack = NULL; - - /* Destroy the start condition stack. */ - yyfree( yyg->yy_start_stack , yyscanner ); - yyg->yy_start_stack = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( yyscanner); - - /* Destroy the main struct (reentrant only). */ - yyfree ( yyscanner , yyscanner ); - yyscanner = NULL; - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - - int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (const char * s , yyscan_t yyscanner) -{ - int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - return malloc(size); -} - -void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return realloc(ptr, size); -} - -void yyfree (void * ptr , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -/*--------------------------------------------------------------------------*/ -void cmCommandArgument_SetupEscapes(yyscan_t yyscanner, bool noEscapes) -{ - /* Hack into the internal flex-generated scanner to set the state. */ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if(noEscapes) { - BEGIN(NOESCAPES); - } else { - BEGIN(ESCAPES); - } -} - -#endif /* __clang_analyzer__ */ diff --git a/Source/LexerParser/cmCommandArgumentLexer.h b/Source/LexerParser/cmCommandArgumentLexer.h deleted file mode 100644 index 5677513492..0000000000 --- a/Source/LexerParser/cmCommandArgumentLexer.h +++ /dev/null @@ -1,689 +0,0 @@ -#ifndef cmCommandArgument_yyHEADER_H -#define cmCommandArgument_yyHEADER_H 1 -#define cmCommandArgument_yyIN_HEADER 1 - -#define FLEXINT_H 1 -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -#ifdef yy_create_buffer -#define cmCommandArgument_yy_create_buffer_ALREADY_DEFINED -#else -#define yy_create_buffer cmCommandArgument_yy_create_buffer -#endif - -#ifdef yy_delete_buffer -#define cmCommandArgument_yy_delete_buffer_ALREADY_DEFINED -#else -#define yy_delete_buffer cmCommandArgument_yy_delete_buffer -#endif - -#ifdef yy_scan_buffer -#define cmCommandArgument_yy_scan_buffer_ALREADY_DEFINED -#else -#define yy_scan_buffer cmCommandArgument_yy_scan_buffer -#endif - -#ifdef yy_scan_string -#define cmCommandArgument_yy_scan_string_ALREADY_DEFINED -#else -#define yy_scan_string cmCommandArgument_yy_scan_string -#endif - -#ifdef yy_scan_bytes -#define cmCommandArgument_yy_scan_bytes_ALREADY_DEFINED -#else -#define yy_scan_bytes cmCommandArgument_yy_scan_bytes -#endif - -#ifdef yy_init_buffer -#define cmCommandArgument_yy_init_buffer_ALREADY_DEFINED -#else -#define yy_init_buffer cmCommandArgument_yy_init_buffer -#endif - -#ifdef yy_flush_buffer -#define cmCommandArgument_yy_flush_buffer_ALREADY_DEFINED -#else -#define yy_flush_buffer cmCommandArgument_yy_flush_buffer -#endif - -#ifdef yy_load_buffer_state -#define cmCommandArgument_yy_load_buffer_state_ALREADY_DEFINED -#else -#define yy_load_buffer_state cmCommandArgument_yy_load_buffer_state -#endif - -#ifdef yy_switch_to_buffer -#define cmCommandArgument_yy_switch_to_buffer_ALREADY_DEFINED -#else -#define yy_switch_to_buffer cmCommandArgument_yy_switch_to_buffer -#endif - -#ifdef yypush_buffer_state -#define cmCommandArgument_yypush_buffer_state_ALREADY_DEFINED -#else -#define yypush_buffer_state cmCommandArgument_yypush_buffer_state -#endif - -#ifdef yypop_buffer_state -#define cmCommandArgument_yypop_buffer_state_ALREADY_DEFINED -#else -#define yypop_buffer_state cmCommandArgument_yypop_buffer_state -#endif - -#ifdef yyensure_buffer_stack -#define cmCommandArgument_yyensure_buffer_stack_ALREADY_DEFINED -#else -#define yyensure_buffer_stack cmCommandArgument_yyensure_buffer_stack -#endif - -#ifdef yylex -#define cmCommandArgument_yylex_ALREADY_DEFINED -#else -#define yylex cmCommandArgument_yylex -#endif - -#ifdef yyrestart -#define cmCommandArgument_yyrestart_ALREADY_DEFINED -#else -#define yyrestart cmCommandArgument_yyrestart -#endif - -#ifdef yylex_init -#define cmCommandArgument_yylex_init_ALREADY_DEFINED -#else -#define yylex_init cmCommandArgument_yylex_init -#endif - -#ifdef yylex_init_extra -#define cmCommandArgument_yylex_init_extra_ALREADY_DEFINED -#else -#define yylex_init_extra cmCommandArgument_yylex_init_extra -#endif - -#ifdef yylex_destroy -#define cmCommandArgument_yylex_destroy_ALREADY_DEFINED -#else -#define yylex_destroy cmCommandArgument_yylex_destroy -#endif - -#ifdef yyget_debug -#define cmCommandArgument_yyget_debug_ALREADY_DEFINED -#else -#define yyget_debug cmCommandArgument_yyget_debug -#endif - -#ifdef yyset_debug -#define cmCommandArgument_yyset_debug_ALREADY_DEFINED -#else -#define yyset_debug cmCommandArgument_yyset_debug -#endif - -#ifdef yyget_extra -#define cmCommandArgument_yyget_extra_ALREADY_DEFINED -#else -#define yyget_extra cmCommandArgument_yyget_extra -#endif - -#ifdef yyset_extra -#define cmCommandArgument_yyset_extra_ALREADY_DEFINED -#else -#define yyset_extra cmCommandArgument_yyset_extra -#endif - -#ifdef yyget_in -#define cmCommandArgument_yyget_in_ALREADY_DEFINED -#else -#define yyget_in cmCommandArgument_yyget_in -#endif - -#ifdef yyset_in -#define cmCommandArgument_yyset_in_ALREADY_DEFINED -#else -#define yyset_in cmCommandArgument_yyset_in -#endif - -#ifdef yyget_out -#define cmCommandArgument_yyget_out_ALREADY_DEFINED -#else -#define yyget_out cmCommandArgument_yyget_out -#endif - -#ifdef yyset_out -#define cmCommandArgument_yyset_out_ALREADY_DEFINED -#else -#define yyset_out cmCommandArgument_yyset_out -#endif - -#ifdef yyget_leng -#define cmCommandArgument_yyget_leng_ALREADY_DEFINED -#else -#define yyget_leng cmCommandArgument_yyget_leng -#endif - -#ifdef yyget_text -#define cmCommandArgument_yyget_text_ALREADY_DEFINED -#else -#define yyget_text cmCommandArgument_yyget_text -#endif - -#ifdef yyget_lineno -#define cmCommandArgument_yyget_lineno_ALREADY_DEFINED -#else -#define yyget_lineno cmCommandArgument_yyget_lineno -#endif - -#ifdef yyset_lineno -#define cmCommandArgument_yyset_lineno_ALREADY_DEFINED -#else -#define yyset_lineno cmCommandArgument_yyset_lineno -#endif - -#ifdef yyget_column -#define cmCommandArgument_yyget_column_ALREADY_DEFINED -#else -#define yyget_column cmCommandArgument_yyget_column -#endif - -#ifdef yyset_column -#define cmCommandArgument_yyset_column_ALREADY_DEFINED -#else -#define yyset_column cmCommandArgument_yyset_column -#endif - -#ifdef yywrap -#define cmCommandArgument_yywrap_ALREADY_DEFINED -#else -#define yywrap cmCommandArgument_yywrap -#endif - -#ifdef yyalloc -#define cmCommandArgument_yyalloc_ALREADY_DEFINED -#else -#define yyalloc cmCommandArgument_yyalloc -#endif - -#ifdef yyrealloc -#define cmCommandArgument_yyrealloc_ALREADY_DEFINED -#else -#define yyrealloc cmCommandArgument_yyrealloc -#endif - -#ifdef yyfree -#define cmCommandArgument_yyfree_ALREADY_DEFINED -#else -#define yyfree cmCommandArgument_yyfree -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -/* begin standard C++ headers. */ - -/* TODO: this is always defined, so inline it */ -#define yyconst const - -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) -#else -#define yynoreturn -#endif - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - int yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); - -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); - -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); - -/* Begin user sect3 */ - -#define cmCommandArgument_yywrap(yyscanner) (/*CONSTCOND*/1) -#define YY_SKIP_YYWRAP - -#define yytext_ptr yytext_r - -#ifdef YY_HEADER_EXPORT_START_CONDITIONS -#define INITIAL 0 -#define ESCAPES 1 -#define NOESCAPES 2 - -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy ( yyscan_t yyscanner ); - -int yyget_debug ( yyscan_t yyscanner ); - -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); - -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); - -FILE *yyget_in ( yyscan_t yyscanner ); - -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); - -FILE *yyget_out ( yyscan_t yyscanner ); - -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - - int yyget_leng ( yyscan_t yyscanner ); - -char *yyget_text ( yyscan_t yyscanner ); - -int yyget_lineno ( yyscan_t yyscanner ); - -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); - -int yyget_column ( yyscan_t yyscanner ); - -void yyset_column ( int _column_no , yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); -#else -extern int yywrap ( yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (yyscan_t yyscanner); - -#define YY_DECL int yylex (yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif - -#ifndef cmCommandArgument_yy_create_buffer_ALREADY_DEFINED -#undef yy_create_buffer -#endif -#ifndef cmCommandArgument_yy_delete_buffer_ALREADY_DEFINED -#undef yy_delete_buffer -#endif -#ifndef cmCommandArgument_yy_scan_buffer_ALREADY_DEFINED -#undef yy_scan_buffer -#endif -#ifndef cmCommandArgument_yy_scan_string_ALREADY_DEFINED -#undef yy_scan_string -#endif -#ifndef cmCommandArgument_yy_scan_bytes_ALREADY_DEFINED -#undef yy_scan_bytes -#endif -#ifndef cmCommandArgument_yy_init_buffer_ALREADY_DEFINED -#undef yy_init_buffer -#endif -#ifndef cmCommandArgument_yy_flush_buffer_ALREADY_DEFINED -#undef yy_flush_buffer -#endif -#ifndef cmCommandArgument_yy_load_buffer_state_ALREADY_DEFINED -#undef yy_load_buffer_state -#endif -#ifndef cmCommandArgument_yy_switch_to_buffer_ALREADY_DEFINED -#undef yy_switch_to_buffer -#endif -#ifndef cmCommandArgument_yypush_buffer_state_ALREADY_DEFINED -#undef yypush_buffer_state -#endif -#ifndef cmCommandArgument_yypop_buffer_state_ALREADY_DEFINED -#undef yypop_buffer_state -#endif -#ifndef cmCommandArgument_yyensure_buffer_stack_ALREADY_DEFINED -#undef yyensure_buffer_stack -#endif -#ifndef cmCommandArgument_yylex_ALREADY_DEFINED -#undef yylex -#endif -#ifndef cmCommandArgument_yyrestart_ALREADY_DEFINED -#undef yyrestart -#endif -#ifndef cmCommandArgument_yylex_init_ALREADY_DEFINED -#undef yylex_init -#endif -#ifndef cmCommandArgument_yylex_init_extra_ALREADY_DEFINED -#undef yylex_init_extra -#endif -#ifndef cmCommandArgument_yylex_destroy_ALREADY_DEFINED -#undef yylex_destroy -#endif -#ifndef cmCommandArgument_yyget_debug_ALREADY_DEFINED -#undef yyget_debug -#endif -#ifndef cmCommandArgument_yyset_debug_ALREADY_DEFINED -#undef yyset_debug -#endif -#ifndef cmCommandArgument_yyget_extra_ALREADY_DEFINED -#undef yyget_extra -#endif -#ifndef cmCommandArgument_yyset_extra_ALREADY_DEFINED -#undef yyset_extra -#endif -#ifndef cmCommandArgument_yyget_in_ALREADY_DEFINED -#undef yyget_in -#endif -#ifndef cmCommandArgument_yyset_in_ALREADY_DEFINED -#undef yyset_in -#endif -#ifndef cmCommandArgument_yyget_out_ALREADY_DEFINED -#undef yyget_out -#endif -#ifndef cmCommandArgument_yyset_out_ALREADY_DEFINED -#undef yyset_out -#endif -#ifndef cmCommandArgument_yyget_leng_ALREADY_DEFINED -#undef yyget_leng -#endif -#ifndef cmCommandArgument_yyget_text_ALREADY_DEFINED -#undef yyget_text -#endif -#ifndef cmCommandArgument_yyget_lineno_ALREADY_DEFINED -#undef yyget_lineno -#endif -#ifndef cmCommandArgument_yyset_lineno_ALREADY_DEFINED -#undef yyset_lineno -#endif -#ifndef cmCommandArgument_yyget_column_ALREADY_DEFINED -#undef yyget_column -#endif -#ifndef cmCommandArgument_yyset_column_ALREADY_DEFINED -#undef yyset_column -#endif -#ifndef cmCommandArgument_yywrap_ALREADY_DEFINED -#undef yywrap -#endif -#ifndef cmCommandArgument_yyget_lval_ALREADY_DEFINED -#undef yyget_lval -#endif -#ifndef cmCommandArgument_yyset_lval_ALREADY_DEFINED -#undef yyset_lval -#endif -#ifndef cmCommandArgument_yyget_lloc_ALREADY_DEFINED -#undef yyget_lloc -#endif -#ifndef cmCommandArgument_yyset_lloc_ALREADY_DEFINED -#undef yyset_lloc -#endif -#ifndef cmCommandArgument_yyalloc_ALREADY_DEFINED -#undef yyalloc -#endif -#ifndef cmCommandArgument_yyrealloc_ALREADY_DEFINED -#undef yyrealloc -#endif -#ifndef cmCommandArgument_yyfree_ALREADY_DEFINED -#undef yyfree -#endif -#ifndef cmCommandArgument_yytext_ALREADY_DEFINED -#undef yytext -#endif -#ifndef cmCommandArgument_yyleng_ALREADY_DEFINED -#undef yyleng -#endif -#ifndef cmCommandArgument_yyin_ALREADY_DEFINED -#undef yyin -#endif -#ifndef cmCommandArgument_yyout_ALREADY_DEFINED -#undef yyout -#endif -#ifndef cmCommandArgument_yy_flex_debug_ALREADY_DEFINED -#undef yy_flex_debug -#endif -#ifndef cmCommandArgument_yylineno_ALREADY_DEFINED -#undef yylineno -#endif -#ifndef cmCommandArgument_yytables_fload_ALREADY_DEFINED -#undef yytables_fload -#endif -#ifndef cmCommandArgument_yytables_destroy_ALREADY_DEFINED -#undef yytables_destroy -#endif -#ifndef cmCommandArgument_yyTABLES_NAME_ALREADY_DEFINED -#undef yyTABLES_NAME -#endif - -#undef cmCommandArgument_yyIN_HEADER -#endif /* cmCommandArgument_yyHEADER_H */ diff --git a/Source/LexerParser/cmCommandArgumentLexer.in.l b/Source/LexerParser/cmCommandArgumentLexer.in.l deleted file mode 100644 index 6b4f9a9667..0000000000 --- a/Source/LexerParser/cmCommandArgumentLexer.in.l +++ /dev/null @@ -1,148 +0,0 @@ -%{ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -/* - -This file must be translated to C++ and modified to build everywhere. - -Run flex >= 2.6 like this: - - flex --nounistd --never-interactive --batch -DFLEXINT_H --noline --header-file=cmCommandArgumentLexer.h -ocmCommandArgumentLexer.cxx cmCommandArgumentLexer.in.l - -Modify cmCommandArgumentLexer.cxx: - - remove trailing whitespace: sed -i 's/\s*$//' cmCommandArgumentLexer.h cmCommandArgumentLexer.cxx - - remove blank lines at end of file: sed -i '${/^$/d;}' cmCommandArgumentLexer.h cmCommandArgumentLexer.cxx - - #include "cmStandardLexer.h" at the top: sed -i '1i#include "cmStandardLexer.h"' cmCommandArgumentLexer.cxx - -*/ - -/* IWYU pragma: no_forward_declare yyguts_t */ - -#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ - -#include "cmCommandArgumentParserHelper.h" - -#define YY_USER_ACTION yyextra->UpdateInputPosition(yyleng); - -/* Include the set of tokens from the parser. */ -#include "cmCommandArgumentParserTokens.h" - -static const char *DCURLYVariable = "${"; -static const char *RCURLYVariable = "}"; -static const char *ATVariable = "@"; -static const char *DOLLARVariable = "$"; -static const char *LCURLYVariable = "{"; -static const char *BSLASHVariable = "\\"; - -/*--------------------------------------------------------------------------*/ -%} - -%option prefix="cmCommandArgument_yy" - -%option reentrant -%option noyywrap -%option nounput -%pointer -%s ESCAPES -%s NOESCAPES - -%% - -\$ENV\{ { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2); - return cal_ENVCURLY; -} - -\$[A-Za-z0-9/_.+-]+\{ { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2); - return cal_NCURLY; -} - -@[A-Za-z0-9/_.+-]+@ { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2); - return cal_ATNAME; -} - -"${" { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = DCURLYVariable; - return cal_DCURLY; -} - -"}" { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = RCURLYVariable; - return cal_RCURLY; -} - -"@" { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = ATVariable; - return cal_AT; -} - -[A-Za-z0-9/_.+-]+ { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - return cal_NAME; -} - -\\. { - if ( !yyextra->HandleEscapeSymbol(yylvalp, *(yytext+1)) ) - { - return cal_ERROR; - } - return cal_SYMBOL; -} - -[^\${}\\@]+ { - //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl; - yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - return cal_SYMBOL; -} - -"$" { - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = DOLLARVariable; - return cal_DOLLAR; -} - -"{" { - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = LCURLYVariable; - return cal_LCURLY; -} - -"\\" { - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = BSLASHVariable; - return cal_BSLASH; -} - -"\\" { - //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); - yylvalp->str = BSLASHVariable; - return cal_SYMBOL; -} - -%% - -/*--------------------------------------------------------------------------*/ -void cmCommandArgument_SetupEscapes(yyscan_t yyscanner, bool noEscapes) -{ - /* Hack into the internal flex-generated scanner to set the state. */ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if(noEscapes) { - BEGIN(NOESCAPES); - } else { - BEGIN(ESCAPES); - } -} - -#endif /* __clang_analyzer__ */ diff --git a/Source/LexerParser/cmCommandArgumentParser.cxx b/Source/LexerParser/cmCommandArgumentParser.cxx deleted file mode 100644 index 7ea0b1519e..0000000000 --- a/Source/LexerParser/cmCommandArgumentParser.cxx +++ /dev/null @@ -1,1856 +0,0 @@ -/* A Bison parser, made by GNU Bison 3.8.2. */ - -/* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, - Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, - especially those whose name start with YY_ or yy_. They are - private implementation details that can be changed or removed. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output, and Bison version. */ -#define YYBISON 30802 - -/* Bison version string. */ -#define YYBISON_VERSION "3.8.2" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 1 - -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - - -/* Substitute the variable and function names. */ -#define yyparse cmCommandArgument_yyparse -#define yylex cmCommandArgument_yylex -#define yyerror cmCommandArgument_yyerror -#define yydebug cmCommandArgument_yydebug -#define yynerrs cmCommandArgument_yynerrs - -/* First part of user prologue. */ -#line 1 "cmCommandArgumentParser.y" - -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -/* - -This file must be translated to C and modified to build everywhere. - -Run bison like this: - - bison --name-prefix=cmCommandArgument_yy --defines=cmCommandArgumentParserTokens.h -ocmCommandArgumentParser.cxx cmCommandArgumentParser.y - -*/ - -#include "cmConfigure.h" // IWYU pragma: keep - -#include - -#define yyGetParser (cmCommandArgument_yyget_extra(yyscanner)) - -/* Make sure malloc and free are available on QNX. */ -#ifdef __QNX__ -# include -#endif - -/* Make sure the parser uses standard memory allocation. The default - generated parser malloc/free declarations do not work on all - platforms. */ -#include -#define YYMALLOC malloc -#define YYFREE free - -/*-------------------------------------------------------------------------*/ -#include "cmCommandArgumentParserHelper.h" /* Interface to parser object. */ -#include "cmCommandArgumentLexer.h" /* Interface to lexer object. */ - -/* Forward declare the lexer entry point. */ -YY_DECL; - -/* Helper function to forward error callback from parser. */ -static void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message); - -/* Configure the parser to support large input. */ -#define YYMAXDEPTH 100000 -#define YYINITDEPTH 10000 - -/* Disable some warnings in the generated code. */ -#ifdef _MSC_VER -# pragma warning (disable: 4102) /* Unused goto label. */ -# pragma warning (disable: 4065) /* Switch statement contains default but no - case. */ -# pragma warning (disable: 4244) /* loss of precision */ -# pragma warning (disable: 4702) /* unreachable code */ -#endif -#if defined(__GNUC__) && __GNUC__ >= 8 -# pragma GCC diagnostic ignored "-Wconversion" -# pragma GCC diagnostic ignored "-Wfree-nonheap-object" -#endif -#if defined(__clang__) && defined(__has_warning) -# if __has_warning("-Wunused-but-set-variable") -# pragma clang diagnostic ignored "-Wunused-but-set-variable" -# endif -#endif - -#line 140 "cmCommandArgumentParser.cxx" - -# ifndef YY_CAST -# ifdef __cplusplus -# define YY_CAST(Type, Val) static_cast (Val) -# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast (Val) -# else -# define YY_CAST(Type, Val) ((Type) (Val)) -# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) -# endif -# endif -# ifndef YY_NULLPTR -# if defined __cplusplus -# if 201103L <= __cplusplus -# define YY_NULLPTR nullptr -# else -# define YY_NULLPTR 0 -# endif -# else -# define YY_NULLPTR ((void*)0) -# endif -# endif - -#include "cmCommandArgumentParserTokens.h" -/* Symbol kind. */ -enum yysymbol_kind_t -{ - YYSYMBOL_YYEMPTY = -2, - YYSYMBOL_YYEOF = 0, /* "end of file" */ - YYSYMBOL_YYerror = 1, /* error */ - YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ - YYSYMBOL_cal_ENVCURLY = 3, /* cal_ENVCURLY */ - YYSYMBOL_cal_NCURLY = 4, /* cal_NCURLY */ - YYSYMBOL_cal_DCURLY = 5, /* cal_DCURLY */ - YYSYMBOL_cal_DOLLAR = 6, /* "$" */ - YYSYMBOL_cal_LCURLY = 7, /* "{" */ - YYSYMBOL_cal_RCURLY = 8, /* "}" */ - YYSYMBOL_cal_NAME = 9, /* cal_NAME */ - YYSYMBOL_cal_BSLASH = 10, /* "\\" */ - YYSYMBOL_cal_SYMBOL = 11, /* cal_SYMBOL */ - YYSYMBOL_cal_AT = 12, /* "@" */ - YYSYMBOL_cal_ERROR = 13, /* cal_ERROR */ - YYSYMBOL_cal_ATNAME = 14, /* cal_ATNAME */ - YYSYMBOL_YYACCEPT = 15, /* $accept */ - YYSYMBOL_Start = 16, /* Start */ - YYSYMBOL_GoalWithOptionalBackSlash = 17, /* GoalWithOptionalBackSlash */ - YYSYMBOL_Goal = 18, /* Goal */ - YYSYMBOL_String = 19, /* String */ - YYSYMBOL_OuterText = 20, /* OuterText */ - YYSYMBOL_Variable = 21, /* Variable */ - YYSYMBOL_EnvVarName = 22, /* EnvVarName */ - YYSYMBOL_MultipleIds = 23, /* MultipleIds */ - YYSYMBOL_ID = 24 /* ID */ -}; -typedef enum yysymbol_kind_t yysymbol_kind_t; - - - - -#ifdef short -# undef short -#endif - -/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure - and (if available) are included - so that the code can choose integer types of a good width. */ - -#ifndef __PTRDIFF_MAX__ -# include /* INFRINGES ON USER NAME SPACE */ -# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_STDINT_H -# endif -#endif - -/* Narrow types that promote to a signed type and that can represent a - signed or unsigned integer of at least N bits. In tables they can - save space and decrease cache pressure. Promoting to a signed type - helps avoid bugs in integer arithmetic. */ - -#ifdef __INT_LEAST8_MAX__ -typedef __INT_LEAST8_TYPE__ yytype_int8; -#elif defined YY_STDINT_H -typedef int_least8_t yytype_int8; -#else -typedef signed char yytype_int8; -#endif - -#ifdef __INT_LEAST16_MAX__ -typedef __INT_LEAST16_TYPE__ yytype_int16; -#elif defined YY_STDINT_H -typedef int_least16_t yytype_int16; -#else -typedef short yytype_int16; -#endif - -/* Work around bug in HP-UX 11.23, which defines these macros - incorrectly for preprocessor constants. This workaround can likely - be removed in 2023, as HPE has promised support for HP-UX 11.23 - (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of - . */ -#ifdef __hpux -# undef UINT_LEAST8_MAX -# undef UINT_LEAST16_MAX -# define UINT_LEAST8_MAX 255 -# define UINT_LEAST16_MAX 65535 -#endif - -#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ -typedef __UINT_LEAST8_TYPE__ yytype_uint8; -#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ - && UINT_LEAST8_MAX <= INT_MAX) -typedef uint_least8_t yytype_uint8; -#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX -typedef unsigned char yytype_uint8; -#else -typedef short yytype_uint8; -#endif - -#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ -typedef __UINT_LEAST16_TYPE__ yytype_uint16; -#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ - && UINT_LEAST16_MAX <= INT_MAX) -typedef uint_least16_t yytype_uint16; -#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX -typedef unsigned short yytype_uint16; -#else -typedef int yytype_uint16; -#endif - -#ifndef YYPTRDIFF_T -# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ -# define YYPTRDIFF_T __PTRDIFF_TYPE__ -# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ -# elif defined PTRDIFF_MAX -# ifndef ptrdiff_t -# include /* INFRINGES ON USER NAME SPACE */ -# endif -# define YYPTRDIFF_T ptrdiff_t -# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX -# else -# define YYPTRDIFF_T long -# define YYPTRDIFF_MAXIMUM LONG_MAX -# endif -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned -# endif -#endif - -#define YYSIZE_MAXIMUM \ - YY_CAST (YYPTRDIFF_T, \ - (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ - ? YYPTRDIFF_MAXIMUM \ - : YY_CAST (YYSIZE_T, -1))) - -#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) - - -/* Stored state numbers (used for stacks). */ -typedef yytype_int8 yy_state_t; - -/* State numbers in computations. */ -typedef int yy_state_fast_t; - -#ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(Msgid) dgettext ("bison-runtime", Msgid) -# endif -# endif -# ifndef YY_ -# define YY_(Msgid) Msgid -# endif -#endif - - -#ifndef YY_ATTRIBUTE_PURE -# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) -# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) -# else -# define YY_ATTRIBUTE_PURE -# endif -#endif - -#ifndef YY_ATTRIBUTE_UNUSED -# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) -# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -# else -# define YY_ATTRIBUTE_UNUSED -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YY_USE(E) ((void) (E)) -#else -# define YY_USE(E) /* empty */ -#endif - -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ -# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") -# else -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# endif -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else -# define YY_INITIAL_VALUE(Value) Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - -#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ -# define YY_IGNORE_USELESS_CAST_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") -# define YY_IGNORE_USELESS_CAST_END \ - _Pragma ("GCC diagnostic pop") -#endif -#ifndef YY_IGNORE_USELESS_CAST_BEGIN -# define YY_IGNORE_USELESS_CAST_BEGIN -# define YY_IGNORE_USELESS_CAST_END -#endif - - -#define YY_ASSERT(E) ((void) (0 && (E))) - -#if 1 - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS -# include /* INFRINGES ON USER NAME SPACE */ - /* Use EXIT_SUCCESS as a witness for stdlib.h. */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's 'empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined EXIT_SUCCESS \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* 1 */ - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yy_state_t yyss_alloc; - YYSTYPE yyvs_alloc; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ - + YYSTACK_GAP_MAXIMUM) - -# define YYCOPY_NEEDED 1 - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYPTRDIFF_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / YYSIZEOF (*yyptr); \ - } \ - while (0) - -#endif - -#if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from SRC to DST. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) -# else -# define YYCOPY(Dst, Src, Count) \ - do \ - { \ - YYPTRDIFF_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (Dst)[yyi] = (Src)[yyi]; \ - } \ - while (0) -# endif -# endif -#endif /* !YYCOPY_NEEDED */ - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 25 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 40 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 15 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 10 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 24 -/* YYNSTATES -- Number of states. */ -#define YYNSTATES 33 - -/* YYMAXUTOK -- Last valid token kind. */ -#define YYMAXUTOK 269 - - -/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, with out-of-bounds checking. */ -#define YYTRANSLATE(YYX) \ - (0 <= (YYX) && (YYX) <= YYMAXUTOK \ - ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ - : YYSYMBOL_YYUNDEF) - -/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex. */ -static const yytype_int8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 -}; - -#if YYDEBUG -/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = -{ - 0, 101, 101, 107, 110, 115, 118, 123, 126, 131, - 134, 137, 140, 143, 146, 151, 154, 157, 160, 165, - 168, 173, 176, 181, 184 -}; -#endif - -/** Accessing symbol of state STATE. */ -#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) - -#if 1 -/* The user-facing name of the symbol whose (internal) number is - YYSYMBOL. No bounds checking. */ -static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; - -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "\"end of file\"", "error", "\"invalid token\"", "cal_ENVCURLY", - "cal_NCURLY", "cal_DCURLY", "\"$\"", "\"{\"", "\"}\"", "cal_NAME", - "\"\\\\\"", "cal_SYMBOL", "\"@\"", "cal_ERROR", "cal_ATNAME", "$accept", - "Start", "GoalWithOptionalBackSlash", "Goal", "String", "OuterText", - "Variable", "EnvVarName", "MultipleIds", "ID", YY_NULLPTR -}; - -static const char * -yysymbol_name (yysymbol_kind_t yysymbol) -{ - return yytname[yysymbol]; -} -#endif - -#define YYPACT_NINF (-3) - -#define yypact_value_is_default(Yyn) \ - ((Yyn) == YYPACT_NINF) - -#define YYTABLE_NINF (-1) - -#define yytable_value_is_error(Yyn) \ - 0 - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const yytype_int8 yypact[] = -{ - 0, 14, 26, 26, -3, -3, -3, -3, -3, -3, - -3, 10, -3, 3, 0, -3, -3, -3, 14, -3, - 7, -3, 26, 13, 16, -3, -3, -3, -3, -3, - -3, -3, -3 -}; - -/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ -static const yytype_int8 yydefact[] = -{ - 5, 21, 21, 21, 11, 12, 13, 9, 14, 10, - 18, 0, 2, 3, 5, 7, 8, 23, 21, 24, - 0, 19, 21, 0, 0, 1, 4, 6, 20, 15, - 22, 16, 17 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -3, -3, -3, 8, -3, -3, 2, 9, -2, -3 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - 0, 11, 12, 13, 14, 15, 19, 20, 21, 22 -}; - -/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_int8 yytable[] = -{ - 23, 24, 16, 1, 2, 3, 4, 5, 6, 7, - 25, 8, 9, 26, 10, 29, 16, 1, 2, 3, - 30, 31, 27, 17, 32, 18, 0, 28, 10, 1, - 2, 3, 0, 0, 0, 17, 0, 0, 0, 0, - 10 -}; - -static const yytype_int8 yycheck[] = -{ - 2, 3, 0, 3, 4, 5, 6, 7, 8, 9, - 0, 11, 12, 10, 14, 8, 14, 3, 4, 5, - 22, 8, 14, 9, 8, 11, -1, 18, 14, 3, - 4, 5, -1, -1, -1, 9, -1, -1, -1, -1, - 14 -}; - -/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of - state STATE-NUM. */ -static const yytype_int8 yystos[] = -{ - 0, 3, 4, 5, 6, 7, 8, 9, 11, 12, - 14, 16, 17, 18, 19, 20, 21, 9, 11, 21, - 22, 23, 24, 23, 23, 0, 10, 18, 22, 8, - 23, 8, 8 -}; - -/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ -static const yytype_int8 yyr1[] = -{ - 0, 15, 16, 17, 17, 18, 18, 19, 19, 20, - 20, 20, 20, 20, 20, 21, 21, 21, 21, 22, - 22, 23, 23, 24, 24 -}; - -/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ -static const yytype_int8 yyr2[] = -{ - 0, 2, 1, 1, 2, 0, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, - 2, 0, 2, 1, 1 -}; - - -enum { YYENOMEM = -2 }; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab -#define YYNOMEM goto yyexhaustedlab - - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ - do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (yyscanner, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ - while (0) - -/* Backward compatibility with an undocumented macro. - Use YYerror or YYUNDEF. */ -#define YYERRCODE YYUNDEF - - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (0) - - - - -# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Kind, Value, yyscanner); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (0) - - -/*-----------------------------------. -| Print this symbol's value on YYO. | -`-----------------------------------*/ - -static void -yy_symbol_value_print (FILE *yyo, - yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, yyscan_t yyscanner) -{ - FILE *yyoutput = yyo; - YY_USE (yyoutput); - YY_USE (yyscanner); - if (!yyvaluep) - return; - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YY_USE (yykind); - YY_IGNORE_MAYBE_UNINITIALIZED_END -} - - -/*---------------------------. -| Print this symbol on YYO. | -`---------------------------*/ - -static void -yy_symbol_print (FILE *yyo, - yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, yyscan_t yyscanner) -{ - YYFPRINTF (yyo, "%s %s (", - yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - - yy_symbol_value_print (yyo, yykind, yyvaluep, yyscanner); - YYFPRINTF (yyo, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -static void -yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) -{ - YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (0) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -static void -yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, - int yyrule, yyscan_t yyscanner) -{ - int yylno = yyrline[yyrule]; - int yynrhs = yyr2[yyrule]; - int yyi; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, - YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), - &yyvsp[(yyi + 1) - (yynrhs)], yyscanner); - YYFPRINTF (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyssp, yyvsp, Rule, yyscanner); \ -} while (0) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) ((void) 0) -# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - -/* Context of a parse error. */ -typedef struct -{ - yy_state_t *yyssp; - yysymbol_kind_t yytoken; -} yypcontext_t; - -/* Put in YYARG at most YYARGN of the expected tokens given the - current YYCTX, and return the number of tokens stored in YYARG. If - YYARG is null, return the number of expected tokens (guaranteed to - be less than YYNTOKENS). Return YYENOMEM on memory exhaustion. - Return 0 if there are more than YYARGN expected tokens, yet fill - YYARG up to YYARGN. */ -static int -yypcontext_expected_tokens (const yypcontext_t *yyctx, - yysymbol_kind_t yyarg[], int yyargn) -{ - /* Actual size of YYARG. */ - int yycount = 0; - int yyn = yypact[+*yyctx->yyssp]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYSYMBOL_YYerror - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (!yyarg) - ++yycount; - else if (yycount == yyargn) - return 0; - else - yyarg[yycount++] = YY_CAST (yysymbol_kind_t, yyx); - } - } - if (yyarg && yycount == 0 && 0 < yyargn) - yyarg[0] = YYSYMBOL_YYEMPTY; - return yycount; -} - - - - -#ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) -# else -/* Return the length of YYSTR. */ -static YYPTRDIFF_T -yystrlen (const char *yystr) -{ - YYPTRDIFF_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -#endif - -#ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -static char * -yystpcpy (char *yydest, const char *yysrc) -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -#endif - -#ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYPTRDIFF_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYPTRDIFF_T yyn = 0; - char const *yyp = yystr; - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - else - goto append; - - append: - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (yyres) - return yystpcpy (yyres, yystr) - yyres; - else - return yystrlen (yystr); -} -#endif - - -static int -yy_syntax_error_arguments (const yypcontext_t *yyctx, - yysymbol_kind_t yyarg[], int yyargn) -{ - /* Actual size of YYARG. */ - int yycount = 0; - /* There are many possibilities here to consider: - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yyctx->yytoken != YYSYMBOL_YYEMPTY) - { - int yyn; - if (yyarg) - yyarg[yycount] = yyctx->yytoken; - ++yycount; - yyn = yypcontext_expected_tokens (yyctx, - yyarg ? yyarg + 1 : yyarg, yyargn - 1); - if (yyn == YYENOMEM) - return YYENOMEM; - else - yycount += yyn; - } - return yycount; -} - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return -1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return YYENOMEM if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, - const yypcontext_t *yyctx) -{ - enum { YYARGS_MAX = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat: reported tokens (one for the "unexpected", - one per "expected"). */ - yysymbol_kind_t yyarg[YYARGS_MAX]; - /* Cumulated lengths of YYARG. */ - YYPTRDIFF_T yysize = 0; - - /* Actual size of YYARG. */ - int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX); - if (yycount == YYENOMEM) - return YYENOMEM; - - switch (yycount) - { -#define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - default: /* Avoid compiler warnings. */ - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -#undef YYCASE_ - } - - /* Compute error message size. Don't count the "%s"s, but reserve - room for the terminator. */ - yysize = yystrlen (yyformat) - 2 * yycount + 1; - { - int yyi; - for (yyi = 0; yyi < yycount; ++yyi) - { - YYPTRDIFF_T yysize1 - = yysize + yytnamerr (YY_NULLPTR, yytname[yyarg[yyi]]); - if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) - yysize = yysize1; - else - return YYENOMEM; - } - } - - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return -1; - } - - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yytname[yyarg[yyi++]]); - yyformat += 2; - } - else - { - ++yyp; - ++yyformat; - } - } - return 0; -} - - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -static void -yydestruct (const char *yymsg, - yysymbol_kind_t yykind, YYSTYPE *yyvaluep, yyscan_t yyscanner) -{ - YY_USE (yyvaluep); - YY_USE (yyscanner); - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); - - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YY_USE (yykind); - YY_IGNORE_MAYBE_UNINITIALIZED_END -} - - - - - - -/*----------. -| yyparse. | -`----------*/ - -int -yyparse (yyscan_t yyscanner) -{ -/* Lookahead token kind. */ -int yychar; - - -/* The semantic value of the lookahead symbol. */ -/* Default value used for initialization, for pacifying older GCCs - or non-GCC compilers. */ -YY_INITIAL_VALUE (static YYSTYPE yyval_default;) -YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); - - /* Number of syntax errors so far. */ - int yynerrs = 0; - - yy_state_fast_t yystate = 0; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus = 0; - - /* Refer to the stacks through separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* Their size. */ - YYPTRDIFF_T yystacksize = YYINITDEPTH; - - /* The state stack: array, bottom, top. */ - yy_state_t yyssa[YYINITDEPTH]; - yy_state_t *yyss = yyssa; - yy_state_t *yyssp = yyss; - - /* The semantic value stack: array, bottom, top. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp = yyvs; - - int yyn; - /* The return value of yyparse. */ - int yyresult; - /* Lookahead symbol kind. */ - yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf; - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yychar = YYEMPTY; /* Cause a token to be read. */ - - goto yysetstate; - - -/*------------------------------------------------------------. -| yynewstate -- push a new state, which is found in yystate. | -`------------------------------------------------------------*/ -yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - -/*--------------------------------------------------------------------. -| yysetstate -- set current state (the top of the stack) to yystate. | -`--------------------------------------------------------------------*/ -yysetstate: - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - YY_ASSERT (0 <= yystate && yystate < YYNSTATES); - YY_IGNORE_USELESS_CAST_BEGIN - *yyssp = YY_CAST (yy_state_t, yystate); - YY_IGNORE_USELESS_CAST_END - YY_STACK_PRINT (yyss, yyssp); - - if (yyss + yystacksize - 1 <= yyssp) -#if !defined yyoverflow && !defined YYSTACK_RELOCATE - YYNOMEM; -#else - { - /* Get the current used size of the three stacks, in elements. */ - YYPTRDIFF_T yysize = yyssp - yyss + 1; - -# if defined yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - yy_state_t *yyss1 = yyss; - YYSTYPE *yyvs1 = yyvs; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * YYSIZEOF (*yyssp), - &yyvs1, yysize * YYSIZEOF (*yyvsp), - &yystacksize); - yyss = yyss1; - yyvs = yyvs1; - } -# else /* defined YYSTACK_RELOCATE */ - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - YYNOMEM; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yy_state_t *yyss1 = yyss; - union yyalloc *yyptr = - YY_CAST (union yyalloc *, - YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); - if (! yyptr) - YYNOMEM; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - - YY_IGNORE_USELESS_CAST_BEGIN - YYDPRINTF ((stderr, "Stack size increased to %ld\n", - YY_CAST (long, yystacksize))); - YY_IGNORE_USELESS_CAST_END - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } -#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - - - if (yystate == YYFINAL) - YYACCEPT; - - goto yybackup; - - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to lookahead token. */ - yyn = yypact[yystate]; - if (yypact_value_is_default (yyn)) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token\n")); - yychar = yylex (&yylval, yyscanner); - } - - if (yychar <= YYEOF) - { - yychar = YYEOF; - yytoken = YYSYMBOL_YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else if (yychar == YYerror) - { - /* The scanner already issued an error message, process directly - to error recovery. But do not keep the error token as - lookahead, it is too special and may lead us to an endless - loop in error recovery. */ - yychar = YYUNDEF; - yytoken = YYSYMBOL_YYerror; - goto yyerrlab1; - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yytable_value_is_error (yyn)) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the lookahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - yystate = yyn; - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END - - /* Discard the shifted token. */ - yychar = YYEMPTY; - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - '$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 2: /* Start: GoalWithOptionalBackSlash */ -#line 101 "cmCommandArgumentParser.y" - { - (yyval.str) = 0; - yyGetParser->SetResult((yyvsp[0].str)); - } -#line 1445 "cmCommandArgumentParser.cxx" - break; - - case 3: /* GoalWithOptionalBackSlash: Goal */ -#line 107 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1453 "cmCommandArgumentParser.cxx" - break; - - case 4: /* GoalWithOptionalBackSlash: Goal "\\" */ -#line 110 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str)); - } -#line 1461 "cmCommandArgumentParser.cxx" - break; - - case 5: /* Goal: %empty */ -#line 115 "cmCommandArgumentParser.y" - { - (yyval.str) = 0; - } -#line 1469 "cmCommandArgumentParser.cxx" - break; - - case 6: /* Goal: String Goal */ -#line 118 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str)); - } -#line 1477 "cmCommandArgumentParser.cxx" - break; - - case 7: /* String: OuterText */ -#line 123 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1485 "cmCommandArgumentParser.cxx" - break; - - case 8: /* String: Variable */ -#line 126 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1493 "cmCommandArgumentParser.cxx" - break; - - case 9: /* OuterText: cal_NAME */ -#line 131 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1501 "cmCommandArgumentParser.cxx" - break; - - case 10: /* OuterText: "@" */ -#line 134 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1509 "cmCommandArgumentParser.cxx" - break; - - case 11: /* OuterText: "$" */ -#line 137 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1517 "cmCommandArgumentParser.cxx" - break; - - case 12: /* OuterText: "{" */ -#line 140 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1525 "cmCommandArgumentParser.cxx" - break; - - case 13: /* OuterText: "}" */ -#line 143 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1533 "cmCommandArgumentParser.cxx" - break; - - case 14: /* OuterText: cal_SYMBOL */ -#line 146 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1541 "cmCommandArgumentParser.cxx" - break; - - case 15: /* Variable: cal_ENVCURLY EnvVarName "}" */ -#line 151 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str)); - } -#line 1549 "cmCommandArgumentParser.cxx" - break; - - case 16: /* Variable: cal_NCURLY MultipleIds "}" */ -#line 154 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str)); - } -#line 1557 "cmCommandArgumentParser.cxx" - break; - - case 17: /* Variable: cal_DCURLY MultipleIds "}" */ -#line 157 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->ExpandVariable((yyvsp[-1].str)); - } -#line 1565 "cmCommandArgumentParser.cxx" - break; - - case 18: /* Variable: cal_ATNAME */ -#line 160 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->ExpandVariableForAt((yyvsp[0].str)); - } -#line 1573 "cmCommandArgumentParser.cxx" - break; - - case 19: /* EnvVarName: MultipleIds */ -#line 165 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1581 "cmCommandArgumentParser.cxx" - break; - - case 20: /* EnvVarName: cal_SYMBOL EnvVarName */ -#line 168 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[-1].str); - } -#line 1589 "cmCommandArgumentParser.cxx" - break; - - case 21: /* MultipleIds: %empty */ -#line 173 "cmCommandArgumentParser.y" - { - (yyval.str) = 0; - } -#line 1597 "cmCommandArgumentParser.cxx" - break; - - case 22: /* MultipleIds: ID MultipleIds */ -#line 176 "cmCommandArgumentParser.y" - { - (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str)); - } -#line 1605 "cmCommandArgumentParser.cxx" - break; - - case 23: /* ID: cal_NAME */ -#line 181 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1613 "cmCommandArgumentParser.cxx" - break; - - case 24: /* ID: Variable */ -#line 184 "cmCommandArgumentParser.y" - { - (yyval.str) = (yyvsp[0].str); - } -#line 1621 "cmCommandArgumentParser.cxx" - break; - - -#line 1625 "cmCommandArgumentParser.cxx" - - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires - that yytoken be updated with the new translation. We take the - approach of translating immediately before every use of yytoken. - One alternative is translating here after every semantic action, - but that translation would be missed if the semantic action invokes - YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or - if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an - incorrect destructor might then be invoked immediately. In the - case of YYERROR or YYBACKUP, subsequent parser actions might lead - to an incorrect destructor call or verbose syntax error message - before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - - *++yyvsp = yyval; - - /* Now 'shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - { - const int yylhs = yyr1[yyn] - YYNTOKENS; - const int yyi = yypgoto[yylhs] + *yyssp; - yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp - ? yytable[yyi] - : yydefgoto[yylhs]); - } - - goto yynewstate; - - -/*--------------------------------------. -| yyerrlab -- here on detecting error. | -`--------------------------------------*/ -yyerrlab: - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; - { - yypcontext_t yyctx - = {yyssp, yytoken}; - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == -1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = YY_CAST (char *, - YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); - if (yymsg) - { - yysyntax_error_status - = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); - yymsgp = yymsg; - } - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = YYENOMEM; - } - } - yyerror (yyscanner, yymsgp); - if (yysyntax_error_status == YYENOMEM) - YYNOMEM; - } - } - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval, yyscanner); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - /* Pacify compilers when the user code never invokes YYERROR and the - label yyerrorlab therefore never appears in user code. */ - if (0) - YYERROR; - ++yynerrs; - - /* Do not reclaim the symbols of the rule whose action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - /* Pop stack until we find a state that shifts the error token. */ - for (;;) - { - yyn = yypact[yystate]; - if (!yypact_value_is_default (yyn)) - { - yyn += YYSYMBOL_YYerror; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - - yydestruct ("Error: popping", - YY_ACCESSING_SYMBOL (yystate), yyvsp, yyscanner); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END - - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturnlab; - - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturnlab; - - -/*-----------------------------------------------------------. -| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | -`-----------------------------------------------------------*/ -yyexhaustedlab: - yyerror (yyscanner, YY_("memory exhausted")); - yyresult = 2; - goto yyreturnlab; - - -/*----------------------------------------------------------. -| yyreturnlab -- parsing is finished, clean up and return. | -`----------------------------------------------------------*/ -yyreturnlab: - if (yychar != YYEMPTY) - { - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = YYTRANSLATE (yychar); - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, yyscanner); - } - /* Do not reclaim the symbols of the rule whose action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, yyscanner); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - return yyresult; -} - -#line 189 "cmCommandArgumentParser.y" - -/* End of grammar */ - -/*--------------------------------------------------------------------------*/ -void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message) -{ - yyGetParser->Error(message); -} diff --git a/Source/LexerParser/cmCommandArgumentParser.y b/Source/LexerParser/cmCommandArgumentParser.y deleted file mode 100644 index 59f4b322b4..0000000000 --- a/Source/LexerParser/cmCommandArgumentParser.y +++ /dev/null @@ -1,196 +0,0 @@ -%{ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -/* - -This file must be translated to C and modified to build everywhere. - -Run bison like this: - - bison --name-prefix=cmCommandArgument_yy --defines=cmCommandArgumentParserTokens.h -ocmCommandArgumentParser.cxx cmCommandArgumentParser.y - -*/ - -#include "cmConfigure.h" // IWYU pragma: keep - -#include - -#define yyGetParser (cmCommandArgument_yyget_extra(yyscanner)) - -/* Make sure malloc and free are available on QNX. */ -#ifdef __QNX__ -# include -#endif - -/* Make sure the parser uses standard memory allocation. The default - generated parser malloc/free declarations do not work on all - platforms. */ -#include -#define YYMALLOC malloc -#define YYFREE free - -/*-------------------------------------------------------------------------*/ -#include "cmCommandArgumentParserHelper.h" /* Interface to parser object. */ -#include "cmCommandArgumentLexer.h" /* Interface to lexer object. */ - -/* Forward declare the lexer entry point. */ -YY_DECL; - -/* Helper function to forward error callback from parser. */ -static void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message); - -/* Configure the parser to support large input. */ -#define YYMAXDEPTH 100000 -#define YYINITDEPTH 10000 - -/* Disable some warnings in the generated code. */ -#ifdef _MSC_VER -# pragma warning (disable: 4102) /* Unused goto label. */ -# pragma warning (disable: 4065) /* Switch statement contains default but no - case. */ -# pragma warning (disable: 4244) /* loss of precision */ -# pragma warning (disable: 4702) /* unreachable code */ -#endif -#if defined(__GNUC__) && __GNUC__ >= 8 -# pragma GCC diagnostic ignored "-Wconversion" -# pragma GCC diagnostic ignored "-Wfree-nonheap-object" -#endif -#if defined(__clang__) && defined(__has_warning) -# if __has_warning("-Wunused-but-set-variable") -# pragma clang diagnostic ignored "-Wunused-but-set-variable" -# endif -#endif -%} - -/* Generate a reentrant parser object. */ -%define api.pure - -/* Configure the parser to use a lexer object. */ -%lex-param {yyscan_t yyscanner} -%parse-param {yyscan_t yyscanner} - -%define parse.error verbose - -/* -%union { - char* string; -} -*/ - -/*-------------------------------------------------------------------------*/ -/* Tokens */ -%token cal_ENVCURLY -%token cal_NCURLY -%token cal_DCURLY -%token cal_DOLLAR "$" -%token cal_LCURLY "{" -%token cal_RCURLY "}" -%token cal_NAME -%token cal_BSLASH "\\" -%token cal_SYMBOL -%token cal_AT "@" -%token cal_ERROR -%token cal_ATNAME - -/*-------------------------------------------------------------------------*/ -/* grammar */ -%% - - -Start: - GoalWithOptionalBackSlash { - $$ = 0; - yyGetParser->SetResult($1); - } - -GoalWithOptionalBackSlash: - Goal { - $$ = $1; - } -| Goal cal_BSLASH { - $$ = yyGetParser->CombineUnions($1, $2); - } - -Goal: - { - $$ = 0; - } -| String Goal { - $$ = yyGetParser->CombineUnions($1, $2); - } - -String: - OuterText { - $$ = $1; - } -| Variable { - $$ = $1; - } - -OuterText: - cal_NAME { - $$ = $1; - } -| cal_AT { - $$ = $1; - } -| cal_DOLLAR { - $$ = $1; - } -| cal_LCURLY { - $$ = $1; - } -| cal_RCURLY { - $$ = $1; - } -| cal_SYMBOL { - $$ = $1; - } - -Variable: - cal_ENVCURLY EnvVarName cal_RCURLY { - $$ = yyGetParser->ExpandSpecialVariable($1, $2); - } -| cal_NCURLY MultipleIds cal_RCURLY { - $$ = yyGetParser->ExpandSpecialVariable($1, $2); - } -| cal_DCURLY MultipleIds cal_RCURLY { - $$ = yyGetParser->ExpandVariable($2); - } -| cal_ATNAME { - $$ = yyGetParser->ExpandVariableForAt($1); - } - -EnvVarName: - MultipleIds { - $$ = $1; - } -| cal_SYMBOL EnvVarName { - $$ = $1; - } - -MultipleIds: - { - $$ = 0; - } -| ID MultipleIds { - $$ = yyGetParser->CombineUnions($1, $2); - } - -ID: - cal_NAME { - $$ = $1; - } -| Variable { - $$ = $1; - } -; - -%% -/* End of grammar */ - -/*--------------------------------------------------------------------------*/ -void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message) -{ - yyGetParser->Error(message); -} diff --git a/Source/LexerParser/cmCommandArgumentParserTokens.h b/Source/LexerParser/cmCommandArgumentParserTokens.h deleted file mode 100644 index 6365d5b295..0000000000 --- a/Source/LexerParser/cmCommandArgumentParserTokens.h +++ /dev/null @@ -1,81 +0,0 @@ -/* A Bison parser, made by GNU Bison 3.8.2. */ - -/* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, - Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, - especially those whose name start with YY_ or yy_. They are - private implementation details that can be changed or removed. */ - -#ifndef YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED -# define YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED -/* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG -extern int cmCommandArgument_yydebug; -#endif - -/* Token kinds. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype - { - YYEMPTY = -2, - YYEOF = 0, /* "end of file" */ - YYerror = 256, /* error */ - YYUNDEF = 257, /* "invalid token" */ - cal_ENVCURLY = 258, /* cal_ENVCURLY */ - cal_NCURLY = 259, /* cal_NCURLY */ - cal_DCURLY = 260, /* cal_DCURLY */ - cal_DOLLAR = 261, /* "$" */ - cal_LCURLY = 262, /* "{" */ - cal_RCURLY = 263, /* "}" */ - cal_NAME = 264, /* cal_NAME */ - cal_BSLASH = 265, /* "\\" */ - cal_SYMBOL = 266, /* cal_SYMBOL */ - cal_AT = 267, /* "@" */ - cal_ERROR = 268, /* cal_ERROR */ - cal_ATNAME = 269 /* cal_ATNAME */ - }; - typedef enum yytokentype yytoken_kind_t; -#endif - -/* Value type. */ - - - - -int cmCommandArgument_yyparse (yyscan_t yyscanner); - - -#endif /* !YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED */ diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx deleted file mode 100644 index a20f5a54ad..0000000000 --- a/Source/cmCommandArgumentParserHelper.cxx +++ /dev/null @@ -1,296 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmCommandArgumentParserHelper.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include "cmCommandArgumentLexer.h" -#include "cmListFileCache.h" -#include "cmMakefile.h" -#include "cmState.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmValue.h" - -int cmCommandArgument_yyparse(yyscan_t yyscanner); -// -cmCommandArgumentParserHelper::cmCommandArgumentParserHelper() -{ - this->FileLine = -1; - this->FileName = nullptr; - this->RemoveEmpty = true; - - this->NoEscapeMode = false; - this->ReplaceAtSyntax = false; -} - -cmCommandArgumentParserHelper::~cmCommandArgumentParserHelper() -{ - this->CleanupParser(); -} - -void cmCommandArgumentParserHelper::SetLineFile(long line, const char* file) -{ - this->FileLine = line; - this->FileName = file; -} - -const char* cmCommandArgumentParserHelper::AddString(const std::string& str) -{ - if (str.empty()) { - return ""; - } - auto stVal = cm::make_unique(str.size() + 1); - strcpy(stVal.get(), str.c_str()); - this->Variables.push_back(std::move(stVal)); - return this->Variables.back().get(); -} - -const char* cmCommandArgumentParserHelper::ExpandSpecialVariable( - const char* key, const char* var) -{ - if (!key) { - return this->ExpandVariable(var); - } - if (!var) { - return ""; - } - if (strcmp(key, "ENV") == 0) { - std::string str; - if (cmSystemTools::GetEnv(var, str)) { - if (this->EscapeQuotes) { - return this->AddString(cmEscapeQuotes(str)); - } - return this->AddString(str); - } - return ""; - } - if (strcmp(key, "CACHE") == 0) { - if (cmValue c = - this->Makefile->GetState()->GetInitializedCacheValue(var)) { - if (this->EscapeQuotes) { - return this->AddString(cmEscapeQuotes(*c)); - } - return this->AddString(*c); - } - return ""; - } - std::ostringstream e; - e << "Syntax $" << key << "{} is not supported. " - << "Only ${}, $ENV{}, and $CACHE{} are allowed."; - this->SetError(e.str()); - return nullptr; -} - -const char* cmCommandArgumentParserHelper::ExpandVariable(const char* var) -{ - if (!var) { - return nullptr; - } - if (this->FileLine >= 0 && strcmp(var, "CMAKE_CURRENT_LIST_LINE") == 0) { - std::string line; - cmListFileBacktrace bt = this->Makefile->GetBacktrace(); - cmListFileContext const& top = bt.Top(); - if (top.DeferId) { - line = cmStrCat("DEFERRED:"_s, *top.DeferId); - } else { - line = std::to_string(this->FileLine); - } - return this->AddString(line); - } - cmValue value = this->Makefile->GetDefinition(var); - if (!value) { - this->Makefile->MaybeWarnUninitialized(var, this->FileName); - if (!this->RemoveEmpty) { - return nullptr; - } - } - if (this->EscapeQuotes && value) { - return this->AddString(cmEscapeQuotes(*value)); - } - return this->AddString(value); -} - -const char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var) -{ - if (this->ReplaceAtSyntax) { - // try to expand the variable - const char* ret = this->ExpandVariable(var); - // if the return was 0 and we want to replace empty strings - // then return an empty string - if (!ret && this->RemoveEmpty) { - return this->AddString(""); - } - // if the ret was not 0, then return it - if (ret) { - return ret; - } - } - // at this point we want to put it back because of one of these cases: - // - this->ReplaceAtSyntax is false - // - this->ReplaceAtSyntax is true, but this->RemoveEmpty is false, - // and the variable was not defined - std::string ref = cmStrCat('@', var, '@'); - return this->AddString(ref); -} - -const char* cmCommandArgumentParserHelper::CombineUnions(const char* in1, - const char* in2) -{ - if (!in1) { - return in2; - } - if (!in2) { - return in1; - } - size_t len = strlen(in1) + strlen(in2) + 1; - auto out = cm::make_unique(len); - strcpy(out.get(), in1); - strcat(out.get(), in2); - this->Variables.push_back(std::move(out)); - return this->Variables.back().get(); -} - -void cmCommandArgumentParserHelper::AllocateParserType( - cmCommandArgumentParserHelper::ParserType* pt, const char* str, int len) -{ - pt->str = nullptr; - if (len == 0) { - len = static_cast(strlen(str)); - } - if (len == 0) { - return; - } - auto out = cm::make_unique(len + 1); - memcpy(out.get(), str, len); - out.get()[len] = 0; - pt->str = out.get(); - this->Variables.push_back(std::move(out)); -} - -bool cmCommandArgumentParserHelper::HandleEscapeSymbol( - cmCommandArgumentParserHelper::ParserType* pt, char symbol) -{ - switch (symbol) { - case '\\': - case '"': - case ' ': - case '#': - case '(': - case ')': - case '$': - case '@': - case '^': - this->AllocateParserType(pt, &symbol, 1); - break; - case ';': - this->AllocateParserType(pt, "\\;", 2); - break; - case 't': - this->AllocateParserType(pt, "\t", 1); - break; - case 'n': - this->AllocateParserType(pt, "\n", 1); - break; - case 'r': - this->AllocateParserType(pt, "\r", 1); - break; - case '0': - this->AllocateParserType(pt, "\0", 1); - break; - default: { - std::ostringstream e; - e << "Invalid escape sequence \\" << symbol; - this->SetError(e.str()); - } - return false; - } - return true; -} - -void cmCommandArgument_SetupEscapes(yyscan_t yyscanner, bool noEscapes); - -int cmCommandArgumentParserHelper::ParseString(std::string const& str, - int verb) -{ - if (str.empty()) { - return 0; - } - this->InputSize = str.size(); - this->Verbose = verb; - - this->Result.clear(); - - yyscan_t yyscanner; - cmCommandArgument_yylex_init(&yyscanner); - auto* scanBuf = cmCommandArgument_yy_scan_string(str.c_str(), yyscanner); - cmCommandArgument_yyset_extra(this, yyscanner); - cmCommandArgument_SetupEscapes(yyscanner, this->NoEscapeMode); - int res = cmCommandArgument_yyparse(yyscanner); - cmCommandArgument_yy_delete_buffer(scanBuf, yyscanner); - cmCommandArgument_yylex_destroy(yyscanner); - if (res != 0) { - return 0; - } - - this->CleanupParser(); - - if (this->Verbose) { - std::cerr << "Expanding [" << str << "] produced: [" << this->Result << "]" - << std::endl; - } - return 1; -} - -void cmCommandArgumentParserHelper::CleanupParser() -{ - this->Variables.clear(); -} - -void cmCommandArgumentParserHelper::Error(const char* str) -{ - auto pos = this->InputBufferPos; - auto const isEof = (this->InputSize < this->InputBufferPos); - if (!isEof) { - pos -= this->LastTokenLength; - } - - std::ostringstream ostr; - ostr << str << " (" << pos << ")"; - this->SetError(ostr.str()); -} - -void cmCommandArgumentParserHelper::SetMakefile(const cmMakefile* mf) -{ - this->Makefile = mf; -} - -void cmCommandArgumentParserHelper::SetResult(const char* value) -{ - if (!value) { - this->Result.clear(); - return; - } - this->Result = value; -} - -void cmCommandArgumentParserHelper::SetError(std::string const& msg) -{ - // Keep only the first error. - if (this->ErrorString.empty()) { - this->ErrorString = msg; - } -} - -void cmCommandArgumentParserHelper::UpdateInputPosition(int const tokenLength) -{ - this->InputBufferPos += tokenLength; - this->LastTokenLength = tokenLength; -} diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h deleted file mode 100644 index f79ca2c506..0000000000 --- a/Source/cmCommandArgumentParserHelper.h +++ /dev/null @@ -1,91 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#pragma once - -#include "cmConfigure.h" // IWYU pragma: keep - -#include -#include -#include - -class cmMakefile; - -class cmCommandArgumentParserHelper -{ -public: - struct ParserType - { - const char* str; - }; - - cmCommandArgumentParserHelper(); - ~cmCommandArgumentParserHelper(); - - cmCommandArgumentParserHelper(cmCommandArgumentParserHelper const&) = delete; - cmCommandArgumentParserHelper& operator=( - cmCommandArgumentParserHelper const&) = delete; - - int ParseString(std::string const& str, int verb); - - // For the lexer: - void AllocateParserType(cmCommandArgumentParserHelper::ParserType* pt, - const char* str, int len = 0); - bool HandleEscapeSymbol(cmCommandArgumentParserHelper::ParserType* pt, - char symbol); - - void Error(const char* str); - - // For yacc - const char* CombineUnions(const char* in1, const char* in2); - - const char* ExpandSpecialVariable(const char* key, const char* var); - const char* ExpandVariable(const char* var); - const char* ExpandVariableForAt(const char* var); - void SetResult(const char* value); - - void SetMakefile(const cmMakefile* mf); - - void UpdateInputPosition(int tokenLength); - - std::string& GetResult() { return this->Result; } - - void SetLineFile(long line, const char* file); - void SetEscapeQuotes(bool b) { this->EscapeQuotes = b; } - void SetNoEscapeMode(bool b) { this->NoEscapeMode = b; } - void SetReplaceAtSyntax(bool b) { this->ReplaceAtSyntax = b; } - void SetRemoveEmpty(bool b) { this->RemoveEmpty = b; } - - const char* GetError() { return this->ErrorString.c_str(); } - -private: - std::string::size_type InputBufferPos{ 1 }; - std::string::size_type LastTokenLength{}; - std::string::size_type InputSize{}; - std::vector OutputBuffer; - - void Print(const char* place, const char* str); - void SafePrintMissing(const char* str, int line, int cnt); - - const char* AddString(const std::string& str); - - void CleanupParser(); - void SetError(std::string const& msg); - - std::vector> Variables; - const cmMakefile* Makefile; - std::string Result; - std::string ErrorString; - const char* FileName; - long FileLine; - int Verbose; - bool EscapeQuotes; - bool NoEscapeMode; - bool ReplaceAtSyntax; - bool RemoveEmpty; -}; - -#define YYSTYPE cmCommandArgumentParserHelper::ParserType -#define YYSTYPE_IS_DECLARED -#define YY_EXTRA_TYPE cmCommandArgumentParserHelper* -#define YY_DECL \ - int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner) diff --git a/bootstrap b/bootstrap index c9ebf93a2e..a1ab850f9f 100755 --- a/bootstrap +++ b/bootstrap @@ -315,7 +315,6 @@ CMAKE_CXX_SOURCES="\ cmCMakePolicyCommand \ cmCPackPropertiesGenerator \ cmCacheManager \ - cmCommandArgumentParserHelper \ cmCommands \ cmCommonTargetGenerator \ cmComputeComponentGraph \ @@ -556,8 +555,6 @@ CMAKE_STD_CXX_SOURCES="\ " LexerParser_CXX_SOURCES="\ - cmCommandArgumentLexer \ - cmCommandArgumentParser \ cmExprLexer \ cmExprParser \ cmGccDepfileLexer \ From 90d814f02496f80403b33c4ef43e18be203b2f24 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Dec 2024 18:50:54 -0500 Subject: [PATCH 5/7] CMP0054: Remove support for OLD behavior --- Help/command/if.rst | 6 +- Help/policy/CMP0054.rst | 9 +-- Modules/CMakeIOSInstallCombined.cmake | 1 - Modules/CMakeParseImplicitLinkInfo.cmake | 5 -- Modules/CMakeParseLibraryArchitecture.cmake | 5 -- Modules/CheckSymbolExists.cmake | 5 -- Modules/CheckTypeSize.cmake | 1 - Modules/ExternalProject.cmake | 1 - Modules/FindDoxygen.cmake | 1 - Modules/FindOpenMP.cmake | 1 - Modules/FindPkgConfig.cmake | 1 - Modules/GNUInstallDirs.cmake | 5 -- Modules/InstallRequiredSystemLibraries.cmake | 5 -- Modules/Internal/CMakeDetermineLinkerId.cmake | 5 -- Modules/Internal/CheckFlagCommonConfig.cmake | 6 -- Modules/Internal/CheckLinkerFlag.cmake | 5 -- Modules/Internal/CheckSourceCompiles.cmake | 1 - Modules/Internal/CheckSourceRuns.cmake | 1 - Modules/Internal/HeaderpadWorkaround.cmake | 5 -- Modules/Linker/GNU.cmake | 1 - Modules/Linker/LLD.cmake | 6 -- Modules/Linker/MOLD.cmake | 5 -- .../Linker/BSD-Linker-Initialize.cmake | 5 -- Modules/Platform/Linker/FreeBSD-ASM.cmake | 6 -- Modules/Platform/Linker/FreeBSD-C.cmake | 5 -- Modules/Platform/Linker/FreeBSD-CXX.cmake | 5 -- Modules/Platform/Linker/FreeBSD-Fortran.cmake | 5 -- Modules/Platform/Linker/GNU.cmake | 5 -- Modules/Platform/Linker/OpenBSD-ASM.cmake | 5 -- Modules/Platform/Linker/OpenBSD-C.cmake | 5 -- Modules/Platform/Linker/OpenBSD-CXX.cmake | 5 -- Modules/Platform/Linker/OpenBSD-Fortran.cmake | 5 -- Modules/Platform/Linker/SunOS-Solaris.cmake | 5 -- Modules/Platform/Linker/Windows-ASM.cmake | 5 -- Modules/Platform/Linker/Windows-C.cmake | 5 -- Modules/Platform/Linker/Windows-CXX.cmake | 5 -- Modules/Platform/Linker/Windows-Fortran.cmake | 5 -- Modules/Platform/Linker/Windows-HIP.cmake | 5 -- Modules/Platform/Linker/Windows-LLD.cmake | 5 -- Modules/Platform/Linker/Windows-MSVC.cmake | 5 -- .../Platform/Linker/WindowsPhone-ASM.cmake | 5 -- Modules/Platform/Linker/WindowsPhone-C.cmake | 5 -- .../Platform/Linker/WindowsPhone-CXX.cmake | 5 -- .../Platform/Linker/WindowsStore-ASM.cmake | 5 -- Modules/Platform/Linker/WindowsStore-C.cmake | 5 -- .../Platform/Linker/WindowsStore-CXX.cmake | 5 -- Source/cmConditionEvaluator.cxx | 53 ++------------- Source/cmConditionEvaluator.h | 2 - Source/cmMakefile.cxx | 6 -- Source/cmMakefile.h | 8 --- Source/cmPolicies.h | 2 +- Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt | 1 - Tests/RunCMake/CMP0054/CMP0054-NEW.cmake | 2 - Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt | 10 --- Tests/RunCMake/CMP0054/CMP0054-OLD.cmake | 47 -------------- .../RunCMake/CMP0054/CMP0054-WARN-stderr.txt | 23 ------- Tests/RunCMake/CMP0054/CMP0054-WARN.cmake | 7 -- .../CMP0054-duplicate-warnings-stderr.txt | 24 ------- .../CMP0054/CMP0054-duplicate-warnings.cmake | 12 ---- .../CMP0054/CMP0054-keywords-NEW-stderr.txt | 2 +- .../CMP0054/CMP0054-keywords-NEW.cmake | 2 - .../CMP0054/CMP0054-keywords-OLD-stderr.txt | 10 --- .../CMP0054/CMP0054-keywords-OLD.cmake | 9 --- .../CMP0054/CMP0054-keywords-WARN-stderr.txt | 25 ------- .../CMP0054/CMP0054-keywords-WARN.cmake | 5 -- .../CMP0054-policy-command-scope-stderr.txt | 10 --- .../CMP0054-policy-command-scope.cmake | 53 --------------- .../CMP0054-policy-foreach-scope-stderr.txt | 54 --------------- .../CMP0054-policy-foreach-scope.cmake | 49 -------------- .../CMP0054-policy-nested-if-stderr.txt | 10 --- .../CMP0054/CMP0054-policy-nested-if.cmake | 41 ------------ .../CMP0054-policy-while-scope-stderr.txt | 54 --------------- .../CMP0054/CMP0054-policy-while-scope.cmake | 65 ------------------- Tests/RunCMake/CMP0054/CMakeLists.txt | 2 +- Tests/RunCMake/CMP0054/RunCMakeTest.cmake | 10 --- Tests/RunCMake/VS10Project/RunCMakeTest.cmake | 1 - Tests/RunCMake/list/POP_BACK.cmake | 2 - Tests/RunCMake/list/POP_FRONT.cmake | 2 - .../RunCMakeTest.cmake | 2 - .../RunCMakeTest.cmake | 2 - 80 files changed, 15 insertions(+), 794 deletions(-) delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-OLD.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-WARN.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-keywords-OLD.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-command-scope.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-nested-if.cmake delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt delete mode 100644 Tests/RunCMake/CMP0054/CMP0054-policy-while-scope.cmake diff --git a/Help/command/if.rst b/Help/command/if.rst index f0846f61eb..b2f7e6e6d0 100644 --- a/Help/command/if.rst +++ b/Help/command/if.rst @@ -87,9 +87,9 @@ Basic Expressions A quoted string always evaluates to false unless: * The string's value is one of the true constants, or - * Policy :policy:`CMP0054` is not set to ``NEW`` and the string's value - happens to be a variable name that is affected by :policy:`CMP0054`'s - behavior. + * in CMake versions prior to 4.0, policy :policy:`CMP0054` is not set + to ``NEW`` and the string's value happens to be a variable name that + is affected by :policy:`CMP0054`'s behavior. Logic Operators """"""""""""""" diff --git a/Help/policy/CMP0054.rst b/Help/policy/CMP0054.rst index d22e8d9b4e..f6a5c4d2b4 100644 --- a/Help/policy/CMP0054.rst +++ b/Help/policy/CMP0054.rst @@ -1,6 +1,9 @@ CMP0054 ------- +.. |REMOVED_IN_CMAKE_VERSION| replace:: 4.0 +.. include:: REMOVED_PROLOGUE.txt + .. versionadded:: 3.1 Only interpret :command:`if` arguments as variables or keywords when unquoted. @@ -47,7 +50,5 @@ further dereferenced: if("E" STREQUAL "") .. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.1 -.. |WARNS_OR_DOES_NOT_WARN| replace:: warns -.. include:: STANDARD_ADVICE.txt - -.. include:: DEPRECATED.txt +.. |WARNED_OR_DID_NOT_WARN| replace:: warned +.. include:: REMOVED_EPILOGUE.txt diff --git a/Modules/CMakeIOSInstallCombined.cmake b/Modules/CMakeIOSInstallCombined.cmake index 8d21155757..fbbe65fcd3 100644 --- a/Modules/CMakeIOSInstallCombined.cmake +++ b/Modules/CMakeIOSInstallCombined.cmake @@ -3,7 +3,6 @@ cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) # if IN_LIST -cmake_policy(SET CMP0054 NEW) # Function to print messages of this module function(_ios_install_combined_message) diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index e470a99f3f..1b4a01f5b9 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) - # Function to parse implicit linker options. # # This is used internally by CMake and should not be included by user @@ -400,5 +397,3 @@ function(cmake_parse_implicit_link_info2 text log_var obj_regex) set(${EXTRA_PARSE_COMPUTE_IMPLICIT_OBJECTS} "${implicit_objs}" PARENT_SCOPE) endif() endfunction() - -cmake_policy(POP) diff --git a/Modules/CMakeParseLibraryArchitecture.cmake b/Modules/CMakeParseLibraryArchitecture.cmake index 37990e12b7..41ae2fb9a9 100644 --- a/Modules/CMakeParseLibraryArchitecture.cmake +++ b/Modules/CMakeParseLibraryArchitecture.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) - # Function parse implicit linker options. # This is used internally by CMake and should not be included by user # code. @@ -49,5 +46,3 @@ function(cmake_parse_library_architecture lang implicit_dirs implicit_objs outpu set(${output_var} "${library_arch}" PARENT_SCOPE) endif() endfunction() - -cmake_policy(POP) diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake index a4950df725..7b62d6e0c9 100644 --- a/Modules/CheckSymbolExists.cmake +++ b/Modules/CheckSymbolExists.cmake @@ -59,9 +59,6 @@ For example: include_guard(GLOBAL) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced - macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE) if(CMAKE_C_COMPILER_LOADED) __CHECK_SYMBOL_EXISTS_FILTER_FLAGS(C) @@ -185,5 +182,3 @@ int main(int argc, char** argv) unset(_CSE_SOURCE) endif() endmacro() - -endblock() diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake index c2e131c0c6..cd4bc500db 100644 --- a/Modules/CheckTypeSize.cmake +++ b/Modules/CheckTypeSize.cmake @@ -150,7 +150,6 @@ get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH) include_guard(GLOBAL) block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ #----------------------------------------------------------------------------- diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index f19934eddc..37d22d2f18 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1301,7 +1301,6 @@ The custom step could then be triggered from the main build like so:: include(${CMAKE_CURRENT_LIST_DIR}/ExternalProject/shared_internal_commands.cmake) cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST define_property(DIRECTORY PROPERTY "EP_BASE" INHERITED) diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 737faf402c..5d8ac2ae4d 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -401,7 +401,6 @@ Deprecated Hint Variables #]=======================================================================] cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) # quoted if arguments cmake_policy(SET CMP0057 NEW) # if IN_LIST # For backwards compatibility support diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index 3c6149fd67..7664a707ef 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -111,7 +111,6 @@ to know what include directories are needed. #]=======================================================================] cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced cmake_policy(SET CMP0057 NEW) # if IN_LIST cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 372cab595d..e525b3626c 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -34,7 +34,6 @@ for how these variables are initialized. #]========================================] cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced cmake_policy(SET CMP0057 NEW) # if IN_LIST ### Common stuff #### diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index ed34c4a919..274cf24597 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -151,9 +151,6 @@ Macros this value through the variable ``${dir}``. #]=======================================================================] -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced - # Convert a cache variable to PATH type macro(_GNUInstallDirs_cache_convert_to_path var description) @@ -452,5 +449,3 @@ foreach(dir ) GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_${dir} CMAKE_INSTALL_${dir} ${dir}) endforeach() - -cmake_policy(POP) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index d5e5fd218d..e3e17945d1 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -65,9 +65,6 @@ may be set prior to including the module to adjust behavior: Support for installing Intel compiler runtimes. #]=======================================================================] -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced - set(_IRSL_HAVE_Intel FALSE) set(_IRSL_HAVE_MSVC FALSE) foreach(LANG IN ITEMS C CXX Fortran) @@ -806,5 +803,3 @@ if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS) ) endif() endif() - -cmake_policy(POP) diff --git a/Modules/Internal/CMakeDetermineLinkerId.cmake b/Modules/Internal/CMakeDetermineLinkerId.cmake index d52d5940bf..35394281c3 100644 --- a/Modules/Internal/CMakeDetermineLinkerId.cmake +++ b/Modules/Internal/CMakeDetermineLinkerId.cmake @@ -6,9 +6,6 @@ # If successful, sets CMAKE__COMPILER_LINKER_ID and # CMAKE__COMPILER_LINKER_VERSION -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) - function(cmake_determine_linker_id lang linker) if (NOT linker) # linker was not identified @@ -102,5 +99,3 @@ function(cmake_determine_linker_id lang linker) unset(CMAKE_${lang}_COMPILER_LINKER_VERSION PARENT_SCOPE) endif() endfunction() - -cmake_policy(POP) diff --git a/Modules/Internal/CheckFlagCommonConfig.cmake b/Modules/Internal/CheckFlagCommonConfig.cmake index 557e9c7464..1bb534d2c6 100644 --- a/Modules/Internal/CheckFlagCommonConfig.cmake +++ b/Modules/Internal/CheckFlagCommonConfig.cmake @@ -8,10 +8,6 @@ include_guard(GLOBAL) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced -cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST - macro(CMAKE_CHECK_FLAG_COMMON_INIT _FUNC _LANG _SRC _PATTERNS) if("${_LANG}" STREQUAL "C") set(${_SRC} "int main(void) { return 0; }") @@ -75,5 +71,3 @@ macro(CMAKE_CHECK_FLAG_COMMON_FINISH) set(ENV{${v}} ${_CMAKE_CHECK_FLAG_COMMON_CONFIG_locale_vars_saved_${v}}) endforeach() endmacro() - -endblock() diff --git a/Modules/Internal/CheckLinkerFlag.cmake b/Modules/Internal/CheckLinkerFlag.cmake index b872b5121e..afd53dcf3e 100644 --- a/Modules/Internal/CheckLinkerFlag.cmake +++ b/Modules/Internal/CheckLinkerFlag.cmake @@ -6,9 +6,6 @@ include(Internal/CheckFlagCommonConfig) include(Internal/CheckSourceCompiles) include(CMakeCheckCompilerFlagCommonPatterns) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced - function(CMAKE_CHECK_LINKER_FLAG _lang _flag _var) # link step supports less languages than the compiler # so do a first check about the requested language @@ -48,5 +45,3 @@ function(CMAKE_CHECK_LINKER_FLAG _lang _flag _var) cmake_check_flag_common_finish() endfunction() - -endblock() diff --git a/Modules/Internal/CheckSourceCompiles.cmake b/Modules/Internal/CheckSourceCompiles.cmake index 1eadc80576..e1dcfb71c6 100644 --- a/Modules/Internal/CheckSourceCompiles.cmake +++ b/Modules/Internal/CheckSourceCompiles.cmake @@ -4,7 +4,6 @@ include_guard(GLOBAL) block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST function(CMAKE_CHECK_SOURCE_COMPILES _lang _source _var) diff --git a/Modules/Internal/CheckSourceRuns.cmake b/Modules/Internal/CheckSourceRuns.cmake index 761598f326..d73db5c6fa 100644 --- a/Modules/Internal/CheckSourceRuns.cmake +++ b/Modules/Internal/CheckSourceRuns.cmake @@ -4,7 +4,6 @@ include_guard(GLOBAL) block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST function(CMAKE_CHECK_SOURCE_RUNS _lang _source _var) diff --git a/Modules/Internal/HeaderpadWorkaround.cmake b/Modules/Internal/HeaderpadWorkaround.cmake index fccfaae4a6..6a13e6941c 100644 --- a/Modules/Internal/HeaderpadWorkaround.cmake +++ b/Modules/Internal/HeaderpadWorkaround.cmake @@ -9,9 +9,6 @@ if(NOT APPLE) return() endif() -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced - function(__cmake_internal_workaround_headerpad_flag_conflict _LANG) # Until we can avoid hard-coding -Wl,-headerpad_max_install_names in the @@ -65,5 +62,3 @@ foreach(__lang IN LISTS __enabled_languages) endforeach() unset(__lang) unset(__enabled_languages) - -endblock() diff --git a/Modules/Linker/GNU.cmake b/Modules/Linker/GNU.cmake index 30d6fb0d68..ba1d030079 100644 --- a/Modules/Linker/GNU.cmake +++ b/Modules/Linker/GNU.cmake @@ -6,7 +6,6 @@ include_guard() block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0140 NEW) function(__linker_gnu lang) diff --git a/Modules/Linker/LLD.cmake b/Modules/Linker/LLD.cmake index 1f184d5382..4d967300fe 100644 --- a/Modules/Linker/LLD.cmake +++ b/Modules/Linker/LLD.cmake @@ -3,10 +3,6 @@ include_guard() - -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - macro(__linker_lld lang) if(CMAKE_${lang}_COMPILER_LINKER_FRONTEND_VARIANT STREQUAL "MSVC") include(Linker/MSVC) @@ -18,5 +14,3 @@ macro(__linker_lld lang) __linker_gnu(${lang}) endif() endmacro() - -endblock() diff --git a/Modules/Linker/MOLD.cmake b/Modules/Linker/MOLD.cmake index 6ad12fd689..0a9c65bfbc 100644 --- a/Modules/Linker/MOLD.cmake +++ b/Modules/Linker/MOLD.cmake @@ -5,9 +5,6 @@ # This module is shared by multiple linkers; use include blocker. include_guard() -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - macro(__linker_mold lang) if(CMAKE_EFFECTIVE_SYSTEM_NAME STREQUAL "Apple") include(Linker/AppleClang) @@ -19,5 +16,3 @@ macro(__linker_mold lang) __linker_gnu(${lang}) endif() endmacro() - -endblock() diff --git a/Modules/Platform/Linker/BSD-Linker-Initialize.cmake b/Modules/Platform/Linker/BSD-Linker-Initialize.cmake index 3de1dabb66..31157af4af 100644 --- a/Modules/Platform/Linker/BSD-Linker-Initialize.cmake +++ b/Modules/Platform/Linker/BSD-Linker-Initialize.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(NOT _CMAKE_SYSTEM_LINKER_TYPE) block(SCOPE_FOR VARIABLES) execute_process(COMMAND "${CMAKE_LINKER}" --version @@ -18,5 +15,3 @@ if(NOT _CMAKE_SYSTEM_LINKER_TYPE) endif() endblock() endif() - -endblock() diff --git a/Modules/Platform/Linker/FreeBSD-ASM.cmake b/Modules/Platform/Linker/FreeBSD-ASM.cmake index d8c8c863d5..d2465cf208 100644 --- a/Modules/Platform/Linker/FreeBSD-ASM.cmake +++ b/Modules/Platform/Linker/FreeBSD-ASM.cmake @@ -2,14 +2,8 @@ # file Copyright.txt or https://cmake.org/licensing for details. include(Platform/Linker/BSD-Linker-Initialize) - -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/FreeBSD-GNU-ASM) else() include(Platform/Linker/FreeBSD-LLD-ASM) endif() - -endblock() diff --git a/Modules/Platform/Linker/FreeBSD-C.cmake b/Modules/Platform/Linker/FreeBSD-C.cmake index 09975ad50f..bb0cf73a11 100644 --- a/Modules/Platform/Linker/FreeBSD-C.cmake +++ b/Modules/Platform/Linker/FreeBSD-C.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/FreeBSD-GNU-C) else() include(Platform/Linker/FreeBSD-LLD-C) endif() - -endblock() diff --git a/Modules/Platform/Linker/FreeBSD-CXX.cmake b/Modules/Platform/Linker/FreeBSD-CXX.cmake index 9dcb17a618..6440e1859f 100644 --- a/Modules/Platform/Linker/FreeBSD-CXX.cmake +++ b/Modules/Platform/Linker/FreeBSD-CXX.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/FreeBSD-GNU-CXX) else() include(Platform/Linker/FreeBSD-LLD-CXX) endif() - -endblock() diff --git a/Modules/Platform/Linker/FreeBSD-Fortran.cmake b/Modules/Platform/Linker/FreeBSD-Fortran.cmake index 793e0a6a0e..56f6fbb06d 100644 --- a/Modules/Platform/Linker/FreeBSD-Fortran.cmake +++ b/Modules/Platform/Linker/FreeBSD-Fortran.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/FreeBSD-GNU-Fortran) else() include(Platform/Linker/FreeBSD-LLD-Fortran) endif() - -endblock() diff --git a/Modules/Platform/Linker/GNU.cmake b/Modules/Platform/Linker/GNU.cmake index 5f1167418b..b4c47bd7c1 100644 --- a/Modules/Platform/Linker/GNU.cmake +++ b/Modules/Platform/Linker/GNU.cmake @@ -5,9 +5,6 @@ # This module is shared by multiple languages; use include blocker. include_guard() -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - # WHOLE_ARCHIVE Feature for LINK_LIBRARY generator expression ## check linker capabilities function(__cmake_set_whole_archive_feature __linker) @@ -47,5 +44,3 @@ endfunction() ## Configure system linker __cmake_set_whole_archive_feature("${CMAKE_LINKER}") - -endblock() diff --git a/Modules/Platform/Linker/OpenBSD-ASM.cmake b/Modules/Platform/Linker/OpenBSD-ASM.cmake index cd0b25e8c4..132d875d94 100644 --- a/Modules/Platform/Linker/OpenBSD-ASM.cmake +++ b/Modules/Platform/Linker/OpenBSD-ASM.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/OpenBSD-GNU-ASM) else() include(Platform/Linker/OpenBSD-LLD-ASM) endif() - -endblock() diff --git a/Modules/Platform/Linker/OpenBSD-C.cmake b/Modules/Platform/Linker/OpenBSD-C.cmake index 6685807d26..b4147c678c 100644 --- a/Modules/Platform/Linker/OpenBSD-C.cmake +++ b/Modules/Platform/Linker/OpenBSD-C.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/OpenBSD-GNU-C) else() include(Platform/Linker/OpenBSD-LLD-C) endif() - -endblock() diff --git a/Modules/Platform/Linker/OpenBSD-CXX.cmake b/Modules/Platform/Linker/OpenBSD-CXX.cmake index 4a3d6f8017..75d4ff003f 100644 --- a/Modules/Platform/Linker/OpenBSD-CXX.cmake +++ b/Modules/Platform/Linker/OpenBSD-CXX.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/OpenBSD-GNU-CXX) else() include(Platform/Linker/OpenBSD-LLD-CXX) endif() - -endblock() diff --git a/Modules/Platform/Linker/OpenBSD-Fortran.cmake b/Modules/Platform/Linker/OpenBSD-Fortran.cmake index 4ec2fe5a1c..a718403e3d 100644 --- a/Modules/Platform/Linker/OpenBSD-Fortran.cmake +++ b/Modules/Platform/Linker/OpenBSD-Fortran.cmake @@ -3,13 +3,8 @@ include(Platform/Linker/BSD-Linker-Initialize) -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU") include(Platform/Linker/OpenBSD-GNU-Fortran) else() include(Platform/Linker/OpenBSD-LLD-Fortran) endif() - -endblock() diff --git a/Modules/Platform/Linker/SunOS-Solaris.cmake b/Modules/Platform/Linker/SunOS-Solaris.cmake index 324108c861..2aff3aaef3 100644 --- a/Modules/Platform/Linker/SunOS-Solaris.cmake +++ b/Modules/Platform/Linker/SunOS-Solaris.cmake @@ -5,9 +5,6 @@ # This module is shared by multiple languages; use include blocker. include_guard() -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - macro(__sunos_linker_solaris lang) set(CMAKE_${lang}_PLATFORM_LINKER_ID Solaris) # Features for LINK_LIBRARY generator expression @@ -24,5 +21,3 @@ macro(__sunos_linker_solaris lang) set(CMAKE_${lang}_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE) set(CMAKE_${lang}_LINK_LIBRARY_WHOLE_ARCHIVE_ATTRIBUTES LIBRARY_TYPE=STATIC DEDUPLICATION=YES OVERRIDE=DEFAULT) endmacro() - -endblock() diff --git a/Modules/Platform/Linker/Windows-ASM.cmake b/Modules/Platform/Linker/Windows-ASM.cmake index bddaed1724..b6e9ab3a30 100644 --- a/Modules/Platform/Linker/Windows-ASM.cmake +++ b/Modules/Platform/Linker/Windows-ASM.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_ASM_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/Windows-MSVC-ASM) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/Windows-GNU-ASM) endif() - -endblock() diff --git a/Modules/Platform/Linker/Windows-C.cmake b/Modules/Platform/Linker/Windows-C.cmake index 4a584076ee..bb663e3bc6 100644 --- a/Modules/Platform/Linker/Windows-C.cmake +++ b/Modules/Platform/Linker/Windows-C.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/Windows-MSVC-C) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/Windows-GNU-C) endif() - -endblock() diff --git a/Modules/Platform/Linker/Windows-CXX.cmake b/Modules/Platform/Linker/Windows-CXX.cmake index 29768511da..adaeb05d07 100644 --- a/Modules/Platform/Linker/Windows-CXX.cmake +++ b/Modules/Platform/Linker/Windows-CXX.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/Windows-MSVC-CXX) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/Windows-GNU-CXX) endif() - -endblock() diff --git a/Modules/Platform/Linker/Windows-Fortran.cmake b/Modules/Platform/Linker/Windows-Fortran.cmake index 928f6d595e..9a2fcbcb4e 100644 --- a/Modules/Platform/Linker/Windows-Fortran.cmake +++ b/Modules/Platform/Linker/Windows-Fortran.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_Fortran_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/Windows-MSVC-Fortran) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/Windows-GNU-Fortran) endif() - -endblock() diff --git a/Modules/Platform/Linker/Windows-HIP.cmake b/Modules/Platform/Linker/Windows-HIP.cmake index 67b37d13eb..d215fc9e52 100644 --- a/Modules/Platform/Linker/Windows-HIP.cmake +++ b/Modules/Platform/Linker/Windows-HIP.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_HIP_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/Windows-MSVC-HIP) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/Windows-GNU-HIP) endif() - -endblock() diff --git a/Modules/Platform/Linker/Windows-LLD.cmake b/Modules/Platform/Linker/Windows-LLD.cmake index 5054745ca2..9c56de2aeb 100644 --- a/Modules/Platform/Linker/Windows-LLD.cmake +++ b/Modules/Platform/Linker/Windows-LLD.cmake @@ -5,9 +5,6 @@ # This module is shared by multiple languages; use include blocker. include_guard() -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - macro(__windows_linker_lld lang) set(CMAKE_${lang}_PLATFORM_LINKER_ID LLD) # Features for LINK_LIBRARY generator expression @@ -21,5 +18,3 @@ macro(__windows_linker_lld lang) __windows_linker_msvc(${lang}) endif() endmacro() - -endblock() diff --git a/Modules/Platform/Linker/Windows-MSVC.cmake b/Modules/Platform/Linker/Windows-MSVC.cmake index 18c21029e0..491b8993f5 100644 --- a/Modules/Platform/Linker/Windows-MSVC.cmake +++ b/Modules/Platform/Linker/Windows-MSVC.cmake @@ -5,9 +5,6 @@ # This module is shared by multiple languages; use include blocker. include_guard() -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - # Features for LINK_LIBRARY generator expression if(MSVC_VERSION GREATER "1900") ## WHOLE_ARCHIVE: Force loading all members of an archive @@ -32,5 +29,3 @@ macro(__windows_linker_msvc lang) endif() endif() endmacro() - -endblock() diff --git a/Modules/Platform/Linker/WindowsPhone-ASM.cmake b/Modules/Platform/Linker/WindowsPhone-ASM.cmake index 39b77f5cdf..1bfb6eca35 100644 --- a/Modules/Platform/Linker/WindowsPhone-ASM.cmake +++ b/Modules/Platform/Linker/WindowsPhone-ASM.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_ASM_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/WindowsPhone-MSVC-ASM) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/WindowsPhone-GNU-ASM) endif() - -endblock() diff --git a/Modules/Platform/Linker/WindowsPhone-C.cmake b/Modules/Platform/Linker/WindowsPhone-C.cmake index 021310c465..0dde95c2bf 100644 --- a/Modules/Platform/Linker/WindowsPhone-C.cmake +++ b/Modules/Platform/Linker/WindowsPhone-C.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/WindowsPhone-MSVC-C) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/WindowsPhone-GNU-C) endif() - -endblock() diff --git a/Modules/Platform/Linker/WindowsPhone-CXX.cmake b/Modules/Platform/Linker/WindowsPhone-CXX.cmake index a42075f089..88234b0def 100644 --- a/Modules/Platform/Linker/WindowsPhone-CXX.cmake +++ b/Modules/Platform/Linker/WindowsPhone-CXX.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/WindowsPhone-MSVC-CXX) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/WindowsPhone-GNU-CXX) endif() - -endblock() diff --git a/Modules/Platform/Linker/WindowsStore-ASM.cmake b/Modules/Platform/Linker/WindowsStore-ASM.cmake index 1d753f3ea8..a059405e61 100644 --- a/Modules/Platform/Linker/WindowsStore-ASM.cmake +++ b/Modules/Platform/Linker/WindowsStore-ASM.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_ASM_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/WindowsStore-MSVC-ASM) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/WindowsStore-GNU-ASM) endif() - -endblock() diff --git a/Modules/Platform/Linker/WindowsStore-C.cmake b/Modules/Platform/Linker/WindowsStore-C.cmake index cfba4bc35c..14fcd3ba6b 100644 --- a/Modules/Platform/Linker/WindowsStore-C.cmake +++ b/Modules/Platform/Linker/WindowsStore-C.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/WindowsStore-MSVC-C) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/WindowsStore-GNU-C) endif() - -endblock() diff --git a/Modules/Platform/Linker/WindowsStore-CXX.cmake b/Modules/Platform/Linker/WindowsStore-CXX.cmake index f2a4e29aca..a74830c0f1 100644 --- a/Modules/Platform/Linker/WindowsStore-CXX.cmake +++ b/Modules/Platform/Linker/WindowsStore-CXX.cmake @@ -1,9 +1,6 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -block(SCOPE_FOR POLICIES) -cmake_policy(SET CMP0054 NEW) - if(CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") # MSVC is the default linker include(Platform/Linker/WindowsStore-MSVC-CXX) @@ -11,5 +8,3 @@ else() # GNU is the default linker include(Platform/Linker/WindowsStore-GNU-CXX) endif() - -endblock() diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 5603fb055c..15b327c6e4 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -25,7 +25,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmValue.h" -#include "cmake.h" namespace { auto const keyAND = "AND"_s; @@ -219,7 +218,6 @@ cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile, cmListFileBacktrace bt) : Makefile(makefile) , Backtrace(std::move(bt)) - , Policy54Status(makefile.GetPolicyStatus(cmPolicies::CMP0054)) , Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057)) , Policy64Status(makefile.GetPolicyStatus(cmPolicies::CMP0064)) , Policy139Status(makefile.GetPolicyStatus(cmPolicies::CMP0139)) @@ -298,32 +296,11 @@ bool cmConditionEvaluator::IsTrue( cmValue cmConditionEvaluator::GetDefinitionIfUnquoted( cmExpandedCommandArgument const& argument) const { - if ((this->Policy54Status != cmPolicies::WARN && - this->Policy54Status != cmPolicies::OLD) && - argument.WasQuoted()) { + if (argument.WasQuoted()) { return nullptr; } - cmValue def = this->Makefile.GetDefinition(argument.GetValue()); - - if (def && argument.WasQuoted() && - this->Policy54Status == cmPolicies::WARN) { - if (!this->Makefile.HasCMP0054AlreadyBeenReported(this->Backtrace.Top())) { - std::ostringstream e; - // clang-format off - e << (cmPolicies::GetPolicyWarning(cmPolicies::CMP0054)) - << "\n" - "Quoted variables like \"" << argument.GetValue() << "\" " - "will no longer be dereferenced when the policy is set to NEW. " - "Since the policy is not set the OLD behavior will be used."; - // clang-format on - - this->Makefile.GetCMakeInstance()->IssueMessage( - MessageType::AUTHOR_WARNING, e.str(), this->Backtrace); - } - } - - return def; + return this->Makefile.GetDefinition(argument.GetValue()); } //========================================================================= @@ -344,33 +321,11 @@ bool cmConditionEvaluator::IsKeyword( cm::static_string_view keyword, const cmExpandedCommandArgument& argument) const { - if ((this->Policy54Status != cmPolicies::WARN && - this->Policy54Status != cmPolicies::OLD) && - argument.WasQuoted()) { + if (argument.WasQuoted()) { return false; } - const auto isKeyword = argument.GetValue() == keyword; - - if (isKeyword && argument.WasQuoted() && - this->Policy54Status == cmPolicies::WARN) { - if (!this->Makefile.HasCMP0054AlreadyBeenReported(this->Backtrace.Top())) { - std::ostringstream e; - // clang-format off - e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0054) - << "\n" - "Quoted keywords like \"" << argument.GetValue() << "\" " - "will no longer be interpreted as keywords " - "when the policy is set to NEW. " - "Since the policy is not set the OLD behavior will be used."; - // clang-format on - - this->Makefile.GetCMakeInstance()->IssueMessage( - MessageType::AUTHOR_WARNING, e.str(), this->Backtrace); - } - } - - return isKeyword; + return argument.GetValue() == keyword; } //========================================================================= diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h index 796f38c622..1990f5fca3 100644 --- a/Source/cmConditionEvaluator.h +++ b/Source/cmConditionEvaluator.h @@ -31,7 +31,6 @@ public: private: class cmArgumentList; - // Filter the given variable definition based on policy CMP0054. cmValue GetDefinitionIfUnquoted( const cmExpandedCommandArgument& argument) const; @@ -67,7 +66,6 @@ private: cmMakefile& Makefile; cmListFileBacktrace Backtrace; - cmPolicies::PolicyStatus Policy54Status; cmPolicies::PolicyStatus Policy57Status; cmPolicies::PolicyStatus Policy64Status; cmPolicies::PolicyStatus Policy139Status; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6752537487..ad72486e24 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4103,12 +4103,6 @@ cmMakefile::VariablePushPop::~VariablePushPop() this->Makefile->PopSnapshot(); } -bool cmMakefile::HasCMP0054AlreadyBeenReported( - cmListFileContext const& context) const -{ - return !this->CMP0054ReportedIds.insert(context).second; -} - void cmMakefile::RecordPolicies(cmPolicies::PolicyMap& pm) const { /* Record the setting of every policy. */ diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index d05421f59c..199995b9cd 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -417,12 +417,6 @@ public: cmMakefile* Makefile; }; - /** - * Determine if the given context, name pair has already been reported - * in context of CMP0054. - */ - bool HasCMP0054AlreadyBeenReported(const cmListFileContext& context) const; - bool IgnoreErrorsCMP0061() const; std::string const& GetHomeDirectory() const; @@ -1103,8 +1097,6 @@ protected: // add link libraries and directories to the target void AddGlobalLinkInformation(cmTarget& target); - mutable std::set CMP0054ReportedIds; - // libraries, classes, and executables mutable cmTargetMap Targets; std::map AliasTargets; diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 0ca09a9644..73fcb277d0 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -162,7 +162,7 @@ class cmMakefile; SELECT( \ POLICY, CMP0054, \ "Only interpret if() arguments as variables or keywords when unquoted.", \ - 3, 1, 0, WARN) \ + 3, 1, 0, NEW) \ SELECT(POLICY, CMP0055, "Strict checking for break() command.", 3, 2, 0, \ WARN) \ SELECT(POLICY, CMP0056, \ diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt deleted file mode 100644 index f5a8fbe6e9..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-NEW-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -$^ diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake index 23a9124760..bbe2ea4b79 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake +++ b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0054 NEW) - set(FOO "BAR") set(BAZ "ZZZ") set(MYTRUE ON) diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt deleted file mode 100644 index 0500280cd5..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt +++ /dev/null @@ -1,10 +0,0 @@ -^CMake Deprecation Warning at CMP0054-OLD.cmake:1 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake deleted file mode 100644 index 0c4cede6ba..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake +++ /dev/null @@ -1,47 +0,0 @@ -cmake_policy(SET CMP0054 OLD) - -set(FOO "BAR") -set(BAZ "ZZZ") -set(MYTRUE ON) -set(MYNUMBER 3) -set(MYVERSION 3.0) - -function(assert_unquoted PREFIX FIRST) - string(REPLACE ";" " " ARGN_SP "${ARGN}") - if(${PREFIX} ${FIRST} ${ARGN}) - message(FATAL_ERROR "Assertion failed [${PREFIX} ${FIRST} ${ARGN_SP}]") - endif() -endfunction() - -function(assert_quoted PREFIX FIRST) - string(REPLACE ";" " " ARGN_SP "${ARGN}") - if(${PREFIX} "${FIRST}" ${ARGN}) - message(FATAL_ERROR "Assertion failed [${PREFIX} \"${FIRST}\" ${ARGN_SP}]") - endif() -endfunction() - -function(assert FIRST) - assert_unquoted(NOT ${FIRST} ${ARGN}) - assert_quoted(NOT ${FIRST} ${ARGN}) -endfunction() - -assert(MYTRUE) - -assert(FOO MATCHES "^BAR$") - -assert(MYNUMBER LESS 4) -assert(MYNUMBER GREATER 2) -assert(MYNUMBER EQUAL 3) - -assert(FOO STRLESS CCC) -assert(BAZ STRGREATER CCC) -assert(FOO STREQUAL BAR) - -assert_unquoted(NOT MYVERSION VERSION_LESS 3.1) -assert_unquoted("" MYVERSION VERSION_LESS 2.9) - -assert_quoted("" MYVERSION VERSION_LESS 2.9) -assert_quoted(NOT MYVERSION VERSION_LESS 3.1) - -assert(MYVERSION VERSION_GREATER 2.9) -assert(MYVERSION VERSION_EQUAL 3.0) diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt deleted file mode 100644 index 3cfa5d2e66..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt +++ /dev/null @@ -1,23 +0,0 @@ -CMake Warning \(dev\) at CMP0054-WARN.cmake:3 \(if\): - Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or - keywords when unquoted. Run "cmake --help-policy CMP0054" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - - Quoted variables like "FOO" will no longer be dereferenced when the policy - is set to NEW. Since the policy is not set the OLD behavior will be used. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. -+ -CMake Warning \(dev\) at CMP0054-WARN.cmake:5 \(elseif\): - Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or - keywords when unquoted. Run "cmake --help-policy CMP0054" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - - Quoted variables like "FOO" will no longer be dereferenced when the policy - is set to NEW. Since the policy is not set the OLD behavior will be used. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake deleted file mode 100644 index a6089293b9..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(FOO "BAR") - -if(NOT "FOO" STREQUAL "BAR") - message(FATAL_ERROR "The given literals should match") -elseif("FOO" STREQUAL "BING") - message(FATAL_ERROR "The given literals should not match") -endif() diff --git a/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt deleted file mode 100644 index 485db527da..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings-stderr.txt +++ /dev/null @@ -1,24 +0,0 @@ -CMake Warning \(dev\) at CMP0054-duplicate-warnings.cmake:4 \(if\): - Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or - keywords when unquoted. Run "cmake --help-policy CMP0054" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - - Quoted variables like "FOO" will no longer be dereferenced when the policy - is set to NEW. Since the policy is not set the OLD behavior will be used. -Call Stack \(most recent call first\): - CMP0054-duplicate-warnings.cmake:8 \(generate_warning\) - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. - -CMake Warning \(dev\) at CMP0054-duplicate-warnings.cmake:11 \(if\): - Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or - keywords when unquoted. Run "cmake --help-policy CMP0054" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - - Quoted variables like "FOO" will no longer be dereferenced when the policy - is set to NEW. Since the policy is not set the OLD behavior will be used. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings.cmake b/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings.cmake deleted file mode 100644 index 04fbe14e64..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-duplicate-warnings.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(FOO "BAR") - -function(generate_warning) - if("FOO" STREQUAL "BAR") - endif() -endfunction() - -generate_warning() -generate_warning() - -if("FOO" STREQUAL "BAR") -endif() diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW-stderr.txt index f44468449d..429803ec18 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW-stderr.txt @@ -1,4 +1,4 @@ -CMake Error at CMP0054-keywords-NEW.cmake:23 \(if\): +CMake Error at CMP0054-keywords-NEW.cmake:21 \(if\): if given arguments: "NOT" "1" diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW.cmake b/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW.cmake index b957658b01..445b5eabe0 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW.cmake +++ b/Tests/RunCMake/CMP0054/CMP0054-keywords-NEW.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0054 NEW) - function(assert KEYWORD) if("${KEYWORD}" STREQUAL "${KEYWORD}") else() diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt deleted file mode 100644 index 60303cd86c..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt +++ /dev/null @@ -1,10 +0,0 @@ -^CMake Deprecation Warning at CMP0054-keywords-OLD.cmake:1 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD.cmake b/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD.cmake deleted file mode 100644 index a2a7f51833..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD.cmake +++ /dev/null @@ -1,9 +0,0 @@ -cmake_policy(SET CMP0054 OLD) - -if(NOT 1) - message(FATAL_ERROR "[NOT 1] evaluated true") -endif() - -if("NOT" 1) - message(FATAL_ERROR "[\"NOT\" 1] evaluated true") -endif() diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt deleted file mode 100644 index 5a8c263d7b..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt +++ /dev/null @@ -1,25 +0,0 @@ -CMake Warning \(dev\) at CMP0054-keywords-WARN.cmake:1 \(if\): - Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or - keywords when unquoted. Run "cmake --help-policy CMP0054" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - - Quoted keywords like "NOT" will no longer be interpreted as keywords when - the policy is set to NEW. Since the policy is not set the OLD behavior - will be used. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. -+ -CMake Warning \(dev\) at CMP0054-keywords-WARN.cmake:3 \(elseif\): - Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or - keywords when unquoted. Run "cmake --help-policy CMP0054" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - - Quoted keywords like "DEFINED" will no longer be interpreted as keywords - when the policy is set to NEW. Since the policy is not set the OLD - behavior will be used. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake deleted file mode 100644 index 118ab3d184..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake +++ /dev/null @@ -1,5 +0,0 @@ -if("NOT" 1) - message(FATAL_ERROR "[\"NOT\" 1] evaluated true") -elseif("DEFINED" NotDefined) - message(FATAL_ERROR "[\"DEFINED\" NotDefined] evaluated true") -endif() diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt deleted file mode 100644 index 1b354728d4..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt +++ /dev/null @@ -1,10 +0,0 @@ -^CMake Deprecation Warning at CMP0054-policy-command-scope.cmake:25 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope.cmake b/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope.cmake deleted file mode 100644 index b6b243caa2..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope.cmake +++ /dev/null @@ -1,53 +0,0 @@ -set(FOO BAR) - -cmake_policy(SET CMP0054 NEW) - -function(function_defined_new_called_old) - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() -endfunction() - -macro(macro_defined_new_called_old) - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() -endmacro() - -cmake_policy(SET CMP0054 OLD) - -function_defined_new_called_old() -macro_defined_new_called_old() - -function(function_defined_old_called_new) - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() -endfunction() - -macro(macro_defined_old_called_new) - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() -endmacro() - -cmake_policy(SET CMP0054 NEW) - -function_defined_old_called_new() -macro_defined_old_called_new() diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt deleted file mode 100644 index 4eac90eedb..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt +++ /dev/null @@ -1,54 +0,0 @@ -^CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:14 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:14 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:27 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:48 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:48 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope.cmake b/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope.cmake deleted file mode 100644 index 87c968a06d..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope.cmake +++ /dev/null @@ -1,49 +0,0 @@ -set(FOO BAR) - -cmake_policy(SET CMP0054 NEW) - -foreach(loop_var arg1 arg2) - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() - - cmake_policy(SET CMP0054 OLD) - - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() - - cmake_policy(SET CMP0054 NEW) -endforeach() - -cmake_policy(SET CMP0054 OLD) - -foreach(loop_var arg1 arg2) - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() - - cmake_policy(SET CMP0054 NEW) - - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() - - cmake_policy(SET CMP0054 OLD) -endforeach() diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt deleted file mode 100644 index a2dd62e4ac..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt +++ /dev/null @@ -1,10 +0,0 @@ -^CMake Deprecation Warning at CMP0054-policy-nested-if.cmake:23 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if.cmake b/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if.cmake deleted file mode 100644 index dd7434d730..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if.cmake +++ /dev/null @@ -1,41 +0,0 @@ -set(FOO BAR) - -cmake_policy(SET CMP0054 NEW) - -if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() - - cmake_policy(SET CMP0054 OLD) - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() -endif() - -if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") -endif() - -cmake_policy(SET CMP0054 OLD) - -if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() - - cmake_policy(SET CMP0054 NEW) - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() -endif() - -if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") -endif() diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt deleted file mode 100644 index 718904d39d..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt +++ /dev/null @@ -1,54 +0,0 @@ -^CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:16 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:16 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:37 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:58 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:58 \(cmake_policy\): - The OLD behavior for policy CMP0054 will be removed from a future version - of CMake. - - The cmake-policies\(7\) manual explains that the OLD behaviors of all - policies are deprecated and that a policy should be set to OLD only under - specific short-term circumstances. Projects should be ported to the NEW - behavior and not rely on setting a policy to OLD. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope.cmake b/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope.cmake deleted file mode 100644 index 7fb836eb22..0000000000 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope.cmake +++ /dev/null @@ -1,65 +0,0 @@ -set(FOO BAR) - -set(LOOP_VAR "") - -cmake_policy(SET CMP0054 NEW) - -while(NOT LOOP_VAR STREQUAL "xx") - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() - - cmake_policy(SET CMP0054 OLD) - - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() - - cmake_policy(SET CMP0054 NEW) - - string(APPEND LOOP_VAR "x") -endwhile() - -while("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") -endwhile() - -set(LOOP_VAR "") - -cmake_policy(SET CMP0054 OLD) - -while(NOT LOOP_VAR STREQUAL "xx") - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") - endif() - - cmake_policy(SET CMP0054 NEW) - - if(NOT FOO STREQUAL BAR) - message(FATAL_ERROR "The variable should match the string") - endif() - - if("FOO" STREQUAL BAR) - message(FATAL_ERROR "The strings should not match") - endif() - - cmake_policy(SET CMP0054 OLD) - - string(APPEND LOOP_VAR "x") -endwhile() - -if(NOT "FOO" STREQUAL BAR) - message(FATAL_ERROR "The quoted variable should match the string") -endif() diff --git a/Tests/RunCMake/CMP0054/CMakeLists.txt b/Tests/RunCMake/CMP0054/CMakeLists.txt index 2897109554..bf2ef1506e 100644 --- a/Tests/RunCMake/CMP0054/CMakeLists.txt +++ b/Tests/RunCMake/CMP0054/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.10) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/CMP0054/RunCMakeTest.cmake b/Tests/RunCMake/CMP0054/RunCMakeTest.cmake index fc031de9fb..99ac7f4fad 100644 --- a/Tests/RunCMake/CMP0054/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMP0054/RunCMakeTest.cmake @@ -1,14 +1,4 @@ include(RunCMake) -set(RunCMake_IGNORE_POLICY_VERSION_DEPRECATION ON) -run_cmake(CMP0054-OLD) run_cmake(CMP0054-NEW) -run_cmake(CMP0054-WARN) run_cmake(CMP0054-keywords-NEW) -run_cmake(CMP0054-keywords-OLD) -run_cmake(CMP0054-keywords-WARN) -run_cmake(CMP0054-duplicate-warnings) -run_cmake(CMP0054-policy-command-scope) -run_cmake(CMP0054-policy-foreach-scope) -run_cmake(CMP0054-policy-while-scope) -run_cmake(CMP0054-policy-nested-if) diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake index 49c345cace..117b0cd292 100644 --- a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake +++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake @@ -1,7 +1,6 @@ cmake_policy(SET CMP0057 NEW) include(RunCMake) -cmake_policy(SET CMP0054 NEW) if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) run_cmake(LanguageStandard) diff --git a/Tests/RunCMake/list/POP_BACK.cmake b/Tests/RunCMake/list/POP_BACK.cmake index 4794796325..cf6cb36587 100644 --- a/Tests/RunCMake/list/POP_BACK.cmake +++ b/Tests/RunCMake/list/POP_BACK.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0054 NEW) - function(assert_expected_list_len list_var expected_size) list(LENGTH ${list_var} _size) if(NOT _size EQUAL ${expected_size}) diff --git a/Tests/RunCMake/list/POP_FRONT.cmake b/Tests/RunCMake/list/POP_FRONT.cmake index 70f757a27a..dfbb378449 100644 --- a/Tests/RunCMake/list/POP_FRONT.cmake +++ b/Tests/RunCMake/list/POP_FRONT.cmake @@ -1,5 +1,3 @@ -cmake_policy(SET CMP0054 NEW) - function(assert_expected_list_len list_var expected_size) list(LENGTH ${list_var} _size) if(NOT _size EQUAL ${expected_size}) diff --git a/Tests/RunCMake/target_link_libraries-LINK_GROUP/RunCMakeTest.cmake b/Tests/RunCMake/target_link_libraries-LINK_GROUP/RunCMakeTest.cmake index 3ebe2691e2..6dbadaa365 100644 --- a/Tests/RunCMake/target_link_libraries-LINK_GROUP/RunCMakeTest.cmake +++ b/Tests/RunCMake/target_link_libraries-LINK_GROUP/RunCMakeTest.cmake @@ -1,8 +1,6 @@ include(RunCMake) -cmake_policy(SET CMP0054 NEW) - macro(run_cmake_target test subtest target) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build) set(RunCMake_TEST_NO_CLEAN 1) diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/RunCMakeTest.cmake b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/RunCMakeTest.cmake index 97a96b4d43..2e7efa78ef 100644 --- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/RunCMakeTest.cmake +++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/RunCMakeTest.cmake @@ -1,8 +1,6 @@ include(RunCMake) -cmake_policy(SET CMP0054 NEW) - macro(run_cmake_target test subtest target) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build) set(RunCMake_TEST_NO_CLEAN 1) From dc24d88062d1cdca4aa5540a99fd7e5bb03a0e0f Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Dec 2024 19:39:34 -0500 Subject: [PATCH 6/7] Remove compatibility with CMake versions older than 3.1 This compatibility has been deprecated since commit 3a4791548d (Deprecate compatibility with CMake versions older than 3.5, 2023-02-09, v3.27.0-rc1~508^2). The behavior itself has been deprecated since CMake 3.1. Issue: #26613 --- Help/command/DEPRECATED_POLICY_VERSIONS.txt | 4 ++-- Help/release/dev/remove-old-compatibility.rst | 2 +- Source/cmMakefile.cxx | 2 +- Source/cmPolicies.cxx | 6 +++--- .../cmake_minimum_required/BeforeVersionRemoved-stderr.txt | 2 +- .../cmake_minimum_required/BeforeVersionRemoved.cmake | 2 +- .../PolicyBeforeVersionRemoved-stderr.txt | 2 +- .../cmake_minimum_required/PolicyBeforeVersionRemoved.cmake | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Help/command/DEPRECATED_POLICY_VERSIONS.txt b/Help/command/DEPRECATED_POLICY_VERSIONS.txt index abfc8145d3..b6eb8f46c7 100644 --- a/Help/command/DEPRECATED_POLICY_VERSIONS.txt +++ b/Help/command/DEPRECATED_POLICY_VERSIONS.txt @@ -1,9 +1,9 @@ .. versionchanged:: 4.0 - Compatibility with versions of CMake older than 3.0 is removed. + Compatibility with versions of CMake older than 3.1 is removed. Calls to :command:`cmake_minimum_required(VERSION)` or :command:`cmake_policy(VERSION)` that do not specify at least - 3.0 as their policy version (optionally via ``...``) + 3.1 as their policy version (optionally via ``...``) will produce an error in CMake 4.0 and above. .. versionchanged:: 3.31 diff --git a/Help/release/dev/remove-old-compatibility.rst b/Help/release/dev/remove-old-compatibility.rst index 6c0582f9fd..9c9b2f095b 100644 --- a/Help/release/dev/remove-old-compatibility.rst +++ b/Help/release/dev/remove-old-compatibility.rst @@ -1,7 +1,7 @@ remove-old-compatibility ------------------------ -* Compatibility with versions of CMake older than 3.0 has been removed. +* Compatibility with versions of CMake older than 3.1 has been removed. Calls to :command:`cmake_minimum_required` or :command:`cmake_policy` that set the policy version to an older value now issue an error. Note that calls to those commands can still support older versions of diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ad72486e24..f46ebd858f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1600,7 +1600,7 @@ void cmMakefile::Configure() this->SetCheckCMP0000(true); // Implicitly set the version for the user. - cmPolicies::ApplyPolicyVersion(this, 3, 0, 0, + cmPolicies::ApplyPolicyVersion(this, 3, 1, 0, cmPolicies::WarnCompat::Off); } } diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 8b944b225b..9005dbb6ec 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -295,16 +295,16 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer, WarnCompat warnCompat) { // Error on policy versions for which support has been removed. - if (majorVer < 3) { + if (majorVer < 3 || (majorVer == 3 && minorVer < 1)) { if (IsFromLegacyInstallEXPORT(mf, majorVer, minorVer, patchVer)) { // Silently tolerate cmake_policy calls generated by install(EXPORT) // in CMake versions prior to 3.18. majorVer = 3; - minorVer = 0; + minorVer = 1; patchVer = 0; } else { mf->IssueMessage(MessageType::FATAL_ERROR, - "Compatibility with CMake < 3.0 has been removed " + "Compatibility with CMake < 3.1 has been removed " "from CMake.\n" ADVICE_UPDATE_VERSION_ARGUMENT); cmSystemTools::SetFatalErrorOccurred(); return false; diff --git a/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved-stderr.txt b/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved-stderr.txt index 792d314e43..0cdd272b04 100644 --- a/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved-stderr.txt +++ b/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at BeforeVersionRemoved\.cmake:1 \(cmake_minimum_required\): - Compatibility with CMake < 3\.0 has been removed from CMake\. + Compatibility with CMake < 3\.1 has been removed from CMake\. Update the VERSION argument value\. Or, use the \.\.\. syntax to tell CMake that the project requires at least but has been updated diff --git a/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved.cmake b/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved.cmake index acf4817023..03be826d84 100644 --- a/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved.cmake +++ b/Tests/RunCMake/cmake_minimum_required/BeforeVersionRemoved.cmake @@ -1 +1 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved-stderr.txt index 3628be0ac9..34e9ce4297 100644 --- a/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved-stderr.txt +++ b/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at PolicyBeforeVersionRemoved\.cmake:1 \(cmake_policy\): - Compatibility with CMake < 3\.0 has been removed from CMake\. + Compatibility with CMake < 3\.1 has been removed from CMake\. Update the VERSION argument value\. Or, use the \.\.\. syntax to tell CMake that the project requires at least but has been updated diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved.cmake index 01443d588c..644d3b7564 100644 --- a/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved.cmake +++ b/Tests/RunCMake/cmake_minimum_required/PolicyBeforeVersionRemoved.cmake @@ -1 +1 @@ -cmake_policy(VERSION 2.8.12) +cmake_policy(VERSION 3.0) From 381c446ff7020a85c806ccd8e07b4861f8106bd4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 13 Dec 2024 11:53:37 -0500 Subject: [PATCH 7/7] VS: Remove support for appending a platform to the generator name Compatibility with CMake versions prior to 3.1 is no longer supported. Fixes: #26481 --- Help/generator/Visual Studio 14 2015.rst | 17 ++++--- Help/generator/Visual Studio 15 2017.rst | 17 ++++--- Help/release/dev/remove-old-compatibility.rst | 4 ++ Source/QtDialog/QCMake.cxx | 3 +- Source/cmGlobalGeneratorFactory.h | 9 +--- Source/cmGlobalVisualStudio10Generator.cxx | 22 ++------- Source/cmGlobalVisualStudio10Generator.h | 3 +- Source/cmGlobalVisualStudio11Generator.cxx | 5 +- Source/cmGlobalVisualStudio11Generator.h | 3 +- Source/cmGlobalVisualStudio12Generator.cxx | 5 +- Source/cmGlobalVisualStudio12Generator.h | 3 +- Source/cmGlobalVisualStudio14Generator.cxx | 28 ++--------- Source/cmGlobalVisualStudio14Generator.h | 3 +- Source/cmGlobalVisualStudio71Generator.cxx | 5 +- Source/cmGlobalVisualStudio71Generator.h | 3 +- Source/cmGlobalVisualStudio7Generator.cxx | 5 +- Source/cmGlobalVisualStudio7Generator.h | 3 +- Source/cmGlobalVisualStudio8Generator.cxx | 12 +---- Source/cmGlobalVisualStudio8Generator.h | 3 +- Source/cmGlobalVisualStudioGenerator.cxx | 11 +---- Source/cmGlobalVisualStudioGenerator.h | 4 +- ...cmGlobalVisualStudioVersionedGenerator.cxx | 48 ++++--------------- .../cmGlobalVisualStudioVersionedGenerator.h | 5 +- Source/cmGlobalXCodeGenerator.cxx | 8 +--- Source/cmake.cxx | 26 ++++------ Source/cmake.h | 7 ++- 26 files changed, 78 insertions(+), 184 deletions(-) diff --git a/Help/generator/Visual Studio 14 2015.rst b/Help/generator/Visual Studio 14 2015.rst index af7dfaaa81..6629b689e9 100644 --- a/Help/generator/Visual Studio 14 2015.rst +++ b/Help/generator/Visual Studio 14 2015.rst @@ -25,15 +25,18 @@ name (architecture). For example: * ``cmake -G "Visual Studio 14 2015" -A x64`` * ``cmake -G "Visual Studio 14 2015" -A ARM`` -For compatibility with CMake versions prior to 3.1, one may specify -a target platform name optionally at the end of the generator name. -This is supported only for: +.. versionchanged:: 4.0 -``Visual Studio 14 2015 Win64`` - Specify target platform ``x64``. + Previously, for compatibility with CMake versions prior to 3.1, + one could specify a target platform name optionally at the + end of the generator name. This has been removed. + This was supported only for: -``Visual Studio 14 2015 ARM`` - Specify target platform ``ARM``. + ``Visual Studio 14 2015 Win64`` + Specify target platform ``x64``. + + ``Visual Studio 14 2015 ARM`` + Specify target platform ``ARM``. Toolset Selection ^^^^^^^^^^^^^^^^^ diff --git a/Help/generator/Visual Studio 15 2017.rst b/Help/generator/Visual Studio 15 2017.rst index 6bcc033845..3f29072c5c 100644 --- a/Help/generator/Visual Studio 15 2017.rst +++ b/Help/generator/Visual Studio 15 2017.rst @@ -34,15 +34,18 @@ name (architecture). For example: * ``cmake -G "Visual Studio 15 2017" -A ARM`` * ``cmake -G "Visual Studio 15 2017" -A ARM64`` -For compatibility with CMake versions prior to 3.1, one may specify -a target platform name optionally at the end of the generator name. -This is supported only for: +.. versionchanged:: 4.0 -``Visual Studio 15 2017 Win64`` - Specify target platform ``x64``. + Previously, for compatibility with CMake versions prior to 3.1, + one could specify a target platform name optionally at the + end of the generator name. This has been removed. + This was supported only for: -``Visual Studio 15 2017 ARM`` - Specify target platform ``ARM``. + ``Visual Studio 15 2017 Win64`` + Specify target platform ``x64``. + + ``Visual Studio 15 2017 ARM`` + Specify target platform ``ARM``. Toolset Selection ^^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/remove-old-compatibility.rst b/Help/release/dev/remove-old-compatibility.rst index 9c9b2f095b..aabdd3ccc5 100644 --- a/Help/release/dev/remove-old-compatibility.rst +++ b/Help/release/dev/remove-old-compatibility.rst @@ -8,3 +8,7 @@ remove-old-compatibility CMake by using their ``VERSION`` arguments' ``...`` syntax. This requires only the ```` version of CMake, but when running a newer version, sets policies up to the ```` version. + +* The :generator:`Visual Studio 14 2015` and :generator:`Visual Studio 15 2017` + generators no longer support specifying a platform as part of the generator + name. See :ref:`Visual Studio Platform Selection`. diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 7c94ea264d..50cb124276 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -59,8 +59,7 @@ QCMake::QCMake(QObject* p) [this] { return this->interruptCallback(); }); std::vector generators; - this->CMakeInstance->GetRegisteredGenerators( - generators, /*includeNamesWithPlatform=*/false); + this->CMakeInstance->GetRegisteredGenerators(generators); for (cmake::GeneratorInfo const& gen : generators) { this->AvailableGenerators.push_back(gen); diff --git a/Source/cmGlobalGeneratorFactory.h b/Source/cmGlobalGeneratorFactory.h index b06da42ab7..0d99d88955 100644 --- a/Source/cmGlobalGeneratorFactory.h +++ b/Source/cmGlobalGeneratorFactory.h @@ -28,14 +28,13 @@ public: /** Create a GlobalGenerator */ virtual std::unique_ptr CreateGlobalGenerator( - const std::string& n, bool allowArch, cmake* cm) const = 0; + const std::string& n, cmake* cm) const = 0; /** Get the documentation entry for this factory */ virtual cmDocumentationEntry GetDocumentation() const = 0; /** Get the names of the current registered generators */ virtual std::vector GetGeneratorNames() const = 0; - virtual std::vector GetGeneratorNamesWithPlatform() const = 0; /** Determine whether or not this generator supports toolsets */ virtual bool SupportsToolset() const = 0; @@ -56,7 +55,7 @@ class cmGlobalGeneratorSimpleFactory : public cmGlobalGeneratorFactory public: /** Create a GlobalGenerator */ std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool /*allowArch*/, cmake* cm) const override + const std::string& name, cmake* cm) const override { if (name != T::GetActualName()) { return std::unique_ptr(); @@ -75,10 +74,6 @@ public: { return { T::GetActualName() }; } - std::vector GetGeneratorNamesWithPlatform() const override - { - return {}; - } /** Determine whether or not this generator supports toolsets */ bool SupportsToolset() const override { return T::SupportsToolset(); } diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 3e6ba4ee8b..cca17e3259 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -53,9 +53,8 @@ static void ConvertToWindowsSlashes(std::string& s) } cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator( - cmake* cm, const std::string& name, - std::string const& platformInGeneratorName) - : cmGlobalVisualStudio8Generator(cm, name, platformInGeneratorName) + cmake* cm, const std::string& name) + : cmGlobalVisualStudio8Generator(cm, name) { this->DefaultCudaFlagTableName = "v10"; this->DefaultCudaHostFlagTableName = "v10"; @@ -485,13 +484,6 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) return false; } } else if (this->SystemName == "Android"_s) { - if (this->PlatformInGeneratorName) { - mf->IssueMessage( - MessageType::FATAL_ERROR, - cmStrCat("CMAKE_SYSTEM_NAME is 'Android' but CMAKE_GENERATOR ", - "specifies a platform too: '", this->GetName(), '\'')); - return false; - } if (mf->GetSafeDefinition("CMAKE_GENERATOR_PLATFORM") == "Tegra-Android"_s) { if (!this->InitializeTegraAndroid(mf)) { @@ -513,16 +505,8 @@ bool cmGlobalVisualStudio10Generator::InitializeWindows(cmMakefile*) return true; } -bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf) +bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile*) { - if (this->PlatformInGeneratorName) { - mf->IssueMessage( - MessageType::FATAL_ERROR, - cmStrCat("CMAKE_SYSTEM_NAME is 'WindowsCE' but CMAKE_GENERATOR ", - "specifies a platform too: '", this->GetName(), '\'')); - return false; - } - this->DefaultPlatformToolset = this->SelectWindowsCEToolset(); return true; diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index df9733d207..cd9f1c7359 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -185,8 +185,7 @@ public: bool IsBuildInParallelSupported() const; protected: - cmGlobalVisualStudio10Generator(cmake* cm, const std::string& name, - std::string const& platformInGeneratorName); + cmGlobalVisualStudio10Generator(cmake* cm, const std::string& name); void Generate() override; virtual bool InitializeSystem(cmMakefile* mf); diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 0ec5e8b218..c8a5b86494 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -16,9 +16,8 @@ #include "cmSystemTools.h" cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator( - cmake* cm, const std::string& name, - std::string const& platformInGeneratorName) - : cmGlobalVisualStudio10Generator(cm, name, platformInGeneratorName) + cmake* cm, const std::string& name) + : cmGlobalVisualStudio10Generator(cm, name) { } diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h index ad12c1f37f..2628f4ba6c 100644 --- a/Source/cmGlobalVisualStudio11Generator.h +++ b/Source/cmGlobalVisualStudio11Generator.h @@ -31,8 +31,7 @@ public: } protected: - cmGlobalVisualStudio11Generator(cmake* cm, const std::string& name, - std::string const& platformInGeneratorName); + cmGlobalVisualStudio11Generator(cmake* cm, const std::string& name); bool InitializeWindowsPhone(cmMakefile* mf) override; bool InitializeWindowsStore(cmMakefile* mf) override; diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index e5406dd429..7f6b86b10a 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -16,9 +16,8 @@ #include "cmSystemTools.h" cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator( - cmake* cm, const std::string& name, - std::string const& platformInGeneratorName) - : cmGlobalVisualStudio11Generator(cm, name, platformInGeneratorName) + cmake* cm, const std::string& name) + : cmGlobalVisualStudio11Generator(cm, name) { } diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index edb86e2abc..1b3a966d22 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -16,8 +16,7 @@ class cmake; class cmGlobalVisualStudio12Generator : public cmGlobalVisualStudio11Generator { protected: - cmGlobalVisualStudio12Generator(cmake* cm, const std::string& name, - std::string const& platformInGeneratorName); + cmGlobalVisualStudio12Generator(cmake* cm, const std::string& name); bool ProcessGeneratorToolsetField(std::string const& key, std::string const& value) override; diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index f5f6539f18..94a9b0e43f 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -40,7 +40,7 @@ class cmGlobalVisualStudio14Generator::Factory { public: std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool allowArch, cmake* cm) const override + const std::string& name, cmake* cm) const override { std::string genName; const char* p = cmVS14GenName(name, genName); @@ -49,18 +49,7 @@ public: } if (!*p) { return std::unique_ptr( - new cmGlobalVisualStudio14Generator(cm, genName, "")); - } - if (!allowArch || *p++ != ' ') { - return std::unique_ptr(); - } - if (strcmp(p, "Win64") == 0) { - return std::unique_ptr( - new cmGlobalVisualStudio14Generator(cm, genName, "x64")); - } - if (strcmp(p, "ARM") == 0) { - return std::unique_ptr( - new cmGlobalVisualStudio14Generator(cm, genName, "ARM")); + new cmGlobalVisualStudio14Generator(cm, genName)); } return std::unique_ptr(); } @@ -79,14 +68,6 @@ public: return names; } - std::vector GetGeneratorNamesWithPlatform() const override - { - std::vector names; - names.emplace_back(cmStrCat(vs14generatorName, " ARM")); - names.emplace_back(cmStrCat(vs14generatorName, " Win64")); - return names; - } - bool SupportsToolset() const override { return true; } bool SupportsPlatform() const override { return true; } @@ -109,9 +90,8 @@ cmGlobalVisualStudio14Generator::NewFactory() } cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator( - cmake* cm, const std::string& name, - std::string const& platformInGeneratorName) - : cmGlobalVisualStudio12Generator(cm, name, platformInGeneratorName) + cmake* cm, const std::string& name) + : cmGlobalVisualStudio12Generator(cm, name) { std::string vc14Express; this->ExpressEdition = cmSystemTools::ReadRegistryValue( diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h index e5b8ff89d3..996560324e 100644 --- a/Source/cmGlobalVisualStudio14Generator.h +++ b/Source/cmGlobalVisualStudio14Generator.h @@ -29,8 +29,7 @@ public: } protected: - cmGlobalVisualStudio14Generator(cmake* cm, const std::string& name, - std::string const& platformInGeneratorName); + cmGlobalVisualStudio14Generator(cmake* cm, const std::string& name); bool InitializeWindowsStore(cmMakefile* mf) override; bool InitializeAndroid(cmMakefile* mf) override; diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index b59c6c6105..fe0d87789a 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -17,9 +17,8 @@ class cmake; -cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator( - cmake* cm, const std::string& platformName) - : cmGlobalVisualStudio7Generator(cm, platformName) +cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(cmake* cm) + : cmGlobalVisualStudio7Generator(cm) { this->ProjectConfigurationSectionName = "ProjectConfiguration"; } diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h index 0e7ddd09b8..63c5a7489a 100644 --- a/Source/cmGlobalVisualStudio71Generator.h +++ b/Source/cmGlobalVisualStudio71Generator.h @@ -25,8 +25,7 @@ class BT; class cmGlobalVisualStudio71Generator : public cmGlobalVisualStudio7Generator { public: - cmGlobalVisualStudio71Generator(cmake* cm, - const std::string& platformName = ""); + cmGlobalVisualStudio71Generator(cmake* cm); protected: void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root, diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 55416175f3..3db778ce94 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -66,9 +66,8 @@ std::string GetSLNFile(cmLocalGenerator* root) } } -cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator( - cmake* cm, std::string const& platformInGeneratorName) - : cmGlobalVisualStudioGenerator(cm, platformInGeneratorName) +cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator(cmake* cm) + : cmGlobalVisualStudioGenerator(cm) { this->DevEnvCommandInitialized = false; this->MarmasmEnabled = false; diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index d7d7aec5fb..c4da1f10ce 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -130,8 +130,7 @@ public: virtual bool SupportsCxxModuleDyndep() const { return false; } protected: - cmGlobalVisualStudio7Generator(cmake* cm, - std::string const& platformInGeneratorName); + cmGlobalVisualStudio7Generator(cmake* cm); void Generate() override; diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 08d0d1b8c4..c7a3971680 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -39,9 +39,8 @@ struct cmIDEFlagTable; cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator( - cmake* cm, const std::string& name, - std::string const& platformInGeneratorName) - : cmGlobalVisualStudio71Generator(cm, platformInGeneratorName) + cmake* cm, const std::string& name) + : cmGlobalVisualStudio71Generator(cm) { this->ProjectConfigurationSectionName = "ProjectConfigurationPlatforms"; this->Name = name; @@ -88,13 +87,6 @@ void cmGlobalVisualStudio8Generator::AddPlatformDefinitions(cmMakefile* mf) bool cmGlobalVisualStudio8Generator::SetGeneratorPlatform(std::string const& p, cmMakefile* mf) { - if (this->PlatformInGeneratorName) { - // This is an old-style generator name that contains the platform name. - // No explicit platform specification is supported, so pass it through - // to our base class implementation, which errors on non-empty platforms. - return this->cmGlobalVisualStudio7Generator::SetGeneratorPlatform(p, mf); - } - if (!this->ParseGeneratorPlatform(p, mf)) { return false; } diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h index 931de40089..f0d7d7177a 100644 --- a/Source/cmGlobalVisualStudio8Generator.h +++ b/Source/cmGlobalVisualStudio8Generator.h @@ -51,8 +51,7 @@ public: } protected: - cmGlobalVisualStudio8Generator(cmake* cm, const std::string& name, - std::string const& platformInGeneratorName); + cmGlobalVisualStudio8Generator(cmake* cm, const std::string& name); virtual bool ProcessGeneratorPlatformField(std::string const& key, std::string const& value); diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index b720ce9f13..ce93b2690f 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -36,20 +36,13 @@ #include "cmTarget.h" #include "cmake.h" -cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator( - cmake* cm, std::string const& platformInGeneratorName) +cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm) : cmGlobalGenerator(cm) { cm->GetState()->SetIsGeneratorMultiConfig(true); cm->GetState()->SetWindowsShell(true); cm->GetState()->SetWindowsVSIDE(true); - - if (platformInGeneratorName.empty()) { - this->DefaultPlatformName = "Win32"; - } else { - this->DefaultPlatformName = platformInGeneratorName; - this->PlatformInGeneratorName = true; - } + this->DefaultPlatformName = "Win32"; } cmGlobalVisualStudioGenerator::~cmGlobalVisualStudioGenerator() = default; diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index 96b8d0c0a8..4a63573fe4 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -159,8 +159,7 @@ public: bool IsVisualStudio() const override { return true; } protected: - cmGlobalVisualStudioGenerator(cmake* cm, - std::string const& platformInGeneratorName); + cmGlobalVisualStudioGenerator(cmake* cm); virtual bool InitializePlatform(cmMakefile* mf); @@ -195,7 +194,6 @@ protected: std::string GeneratorPlatform; std::string DefaultPlatformName; - bool PlatformInGeneratorName = false; private: virtual std::string GetVSMakeProgram() = 0; diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index ba51e3661b..f1f1f1ddd5 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -205,7 +205,7 @@ class cmGlobalVisualStudioVersionedGenerator::Factory15 { public: std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool allowArch, cmake* cm) const override + const std::string& name, cmake* cm) const override { std::string genName; const char* p = cmVS15GenName(name, genName); @@ -215,20 +215,7 @@ public: if (!*p) { return std::unique_ptr( new cmGlobalVisualStudioVersionedGenerator( - cmGlobalVisualStudioGenerator::VSVersion::VS15, cm, genName, "")); - } - if (!allowArch || *p++ != ' ') { - return std::unique_ptr(); - } - if (strcmp(p, "Win64") == 0) { - return std::unique_ptr( - new cmGlobalVisualStudioVersionedGenerator( - cmGlobalVisualStudioGenerator::VSVersion::VS15, cm, genName, "x64")); - } - if (strcmp(p, "ARM") == 0) { - return std::unique_ptr( - new cmGlobalVisualStudioVersionedGenerator( - cmGlobalVisualStudioGenerator::VSVersion::VS15, cm, genName, "ARM")); + cmGlobalVisualStudioGenerator::VSVersion::VS15, cm, genName)); } return std::unique_ptr(); } @@ -247,14 +234,6 @@ public: return names; } - std::vector GetGeneratorNamesWithPlatform() const override - { - std::vector names; - names.emplace_back(cmStrCat(vs15generatorName, " ARM")); - names.emplace_back(cmStrCat(vs15generatorName, " Win64")); - return names; - } - bool SupportsToolset() const override { return true; } bool SupportsPlatform() const override { return true; } @@ -314,7 +293,7 @@ class cmGlobalVisualStudioVersionedGenerator::Factory16 { public: std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool /*allowArch*/, cmake* cm) const override + const std::string& name, cmake* cm) const override { std::string genName; const char* p = cmVS16GenName(name, genName); @@ -324,7 +303,7 @@ public: if (!*p) { return std::unique_ptr( new cmGlobalVisualStudioVersionedGenerator( - cmGlobalVisualStudioGenerator::VSVersion::VS16, cm, genName, "")); + cmGlobalVisualStudioGenerator::VSVersion::VS16, cm, genName)); } return std::unique_ptr(); } @@ -343,11 +322,6 @@ public: return names; } - std::vector GetGeneratorNamesWithPlatform() const override - { - return std::vector(); - } - bool SupportsToolset() const override { return true; } bool SupportsPlatform() const override { return true; } @@ -379,7 +353,7 @@ class cmGlobalVisualStudioVersionedGenerator::Factory17 { public: std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool /*allowArch*/, cmake* cm) const override + const std::string& name, cmake* cm) const override { std::string genName; const char* p = cmVS17GenName(name, genName); @@ -389,7 +363,7 @@ public: if (!*p) { return std::unique_ptr( new cmGlobalVisualStudioVersionedGenerator( - cmGlobalVisualStudioGenerator::VSVersion::VS17, cm, genName, "")); + cmGlobalVisualStudioGenerator::VSVersion::VS17, cm, genName)); } return std::unique_ptr(); } @@ -408,11 +382,6 @@ public: return names; } - std::vector GetGeneratorNamesWithPlatform() const override - { - return std::vector(); - } - bool SupportsToolset() const override { return true; } bool SupportsPlatform() const override { return true; } @@ -440,9 +409,8 @@ cmGlobalVisualStudioVersionedGenerator::NewFactory17() } cmGlobalVisualStudioVersionedGenerator::cmGlobalVisualStudioVersionedGenerator( - VSVersion version, cmake* cm, const std::string& name, - std::string const& platformInGeneratorName) - : cmGlobalVisualStudio14Generator(cm, name, platformInGeneratorName) + VSVersion version, cmake* cm, const std::string& name) + : cmGlobalVisualStudio14Generator(cm, name) , vsSetupAPIHelper(VSVersionToMajor(version)) { this->Version = version; diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.h b/Source/cmGlobalVisualStudioVersionedGenerator.h index 49643eaa7f..79e70c6b80 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.h +++ b/Source/cmGlobalVisualStudioVersionedGenerator.h @@ -58,9 +58,8 @@ public: } protected: - cmGlobalVisualStudioVersionedGenerator( - VSVersion version, cmake* cm, const std::string& name, - std::string const& platformInGeneratorName); + cmGlobalVisualStudioVersionedGenerator(VSVersion version, cmake* cm, + const std::string& name); bool SelectWindowsStoreToolset(std::string& toolset) const override; diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ef5534f25d..6cab98a587 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -148,7 +148,7 @@ class cmGlobalXCodeGenerator::Factory : public cmGlobalGeneratorFactory { public: std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool allowArch, cmake* cm) const override; + const std::string& name, cmake* cm) const override; cmDocumentationEntry GetDocumentation() const override { @@ -162,11 +162,6 @@ public: return names; } - std::vector GetGeneratorNamesWithPlatform() const override - { - return std::vector(); - } - bool SupportsToolset() const override { return true; } bool SupportsPlatform() const override { return false; } @@ -210,7 +205,6 @@ std::unique_ptr cmGlobalXCodeGenerator::NewFactory() std::unique_ptr cmGlobalXCodeGenerator::Factory::CreateGlobalGenerator(const std::string& name, - bool /*allowArch*/, cmake* cm) const { if (name != GetActualName()) { diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 8615c5b35c..0afb080458 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1380,7 +1380,7 @@ void cmake::SetArgs(const std::vector& args) "-G", "No generator specified for -G", CommandArgument::Values::One, CommandArgument::RequiresSeparator::No, [&](std::string const& value, cmake* state) -> bool { - bool valid = state->CreateAndSetGlobalGenerator(value, true); + bool valid = state->CreateAndSetGlobalGenerator(value); badGeneratorName = !valid; return valid; }); @@ -1569,8 +1569,7 @@ void cmake::SetArgs(const std::vector& args) this->SetHomeOutputDirectory(expandedPreset->BinaryDir); } if (!this->GlobalGenerator && !expandedPreset->Generator.empty()) { - if (!this->CreateAndSetGlobalGenerator(expandedPreset->Generator, - false)) { + if (!this->CreateAndSetGlobalGenerator(expandedPreset->Generator)) { return; } } @@ -1940,16 +1939,12 @@ void cmake::AddDefaultExtraGenerators() #endif } -void cmake::GetRegisteredGenerators(std::vector& generators, - bool includeNamesWithPlatform) const +void cmake::GetRegisteredGenerators( + std::vector& generators) const { for (const auto& gen : this->Generators) { std::vector names = gen->GetGeneratorNames(); - if (includeNamesWithPlatform) { - cm::append(names, gen->GetGeneratorNamesWithPlatform()); - } - for (std::string const& name : names) { GeneratorInfo info; info.supportsToolset = gen->SupportsToolset(); @@ -2017,7 +2012,7 @@ createExtraGenerator( } std::unique_ptr cmake::CreateGlobalGenerator( - const std::string& gname, bool allowArch) + const std::string& gname) { std::pair, std::string> extra = createExtraGenerator(this->ExtraGenerators, gname); @@ -2027,7 +2022,7 @@ std::unique_ptr cmake::CreateGlobalGenerator( std::unique_ptr generator; for (const auto& g : this->Generators) { - generator = g->CreateGlobalGenerator(name, allowArch, this); + generator = g->CreateGlobalGenerator(name, this); if (generator) { break; } @@ -2040,17 +2035,16 @@ std::unique_ptr cmake::CreateGlobalGenerator( return generator; } -bool cmake::CreateAndSetGlobalGenerator(const std::string& name, - bool allowArch) +bool cmake::CreateAndSetGlobalGenerator(const std::string& name) { - auto gen = this->CreateGlobalGenerator(name, allowArch); + auto gen = this->CreateGlobalGenerator(name); if (!gen) { std::string kdevError; std::string vsError; if (name.find("KDevelop3", 0) != std::string::npos) { kdevError = "\nThe KDevelop3 generator is not supported anymore."; } - if (!allowArch && cmHasLiteralPrefix(name, "Visual Studio ") && + if (cmHasLiteralPrefix(name, "Visual Studio ") && name.length() >= cmStrLen("Visual Studio xx xxxx ")) { vsError = "\nUsing platforms in Visual Studio generator names is not " "supported in CMakePresets.json."; @@ -2070,7 +2064,7 @@ bool cmake::CreateAndSetGlobalGenerator(const std::string& name, void cmake::PrintPresetList(const cmCMakePresetsGraph& graph) const { std::vector generators; - this->GetRegisteredGenerators(generators, false); + this->GetRegisteredGenerators(generators); auto filter = [&generators](const cmCMakePresetsGraph::ConfigurePreset& preset) -> bool { if (preset.Generator.empty()) { diff --git a/Source/cmake.h b/Source/cmake.h index 572adc834b..f44a41bd61 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -246,10 +246,10 @@ public: //! Create a GlobalGenerator std::unique_ptr CreateGlobalGenerator( - const std::string& name, bool allowArch = true); + const std::string& name); //! Create a GlobalGenerator and set it as our own - bool CreateAndSetGlobalGenerator(const std::string& name, bool allowArch); + bool CreateAndSetGlobalGenerator(const std::string& name); #ifndef CMAKE_BOOTSTRAP //! Print list of configure presets @@ -274,8 +274,7 @@ public: void SetGlobalGenerator(std::unique_ptr); //! Get the names of the current registered generators - void GetRegisteredGenerators(std::vector& generators, - bool includeNamesWithPlatform = true) const; + void GetRegisteredGenerators(std::vector& generators) const; //! Set the name of the selected generator-specific instance. void SetGeneratorInstance(std::string const& instance)