echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmListCommand: handle empty lists for list(REMOVE_AT)

Browse Source 
Treat an empty list as a list with no valid bounds and return an error
message indicating that any given indices are out-of-bounds.
This commit is contained in:
Ben Boeckel 2018-10-11 17:26:44 -04:00
parent acfe53c588
commit 121a036f73
9 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Help/release/dev/better-empty-list-behavior.rst
View File

@ -4,3 +4,6 @@ better-empty-list-behavior
* The :command:`list` operations ``REMOVE_ITEM``, ``REMOVE_DUPLICATES``, * The :command:`list` operations ``REMOVE_ITEM``, ``REMOVE_DUPLICATES``,
``SORT``, ``REVERSE``, and ``FILTER`` all now accept a non-existent variable ``SORT``, ``REVERSE``, and ``FILTER`` all now accept a non-existent variable
as the list since these operations on empty lists is also the empty list. as the list since these operations on empty lists is also the empty list.
* The :command:`list` operation ``REMOVE_AT`` now indicates that the given
indices are invalid for a non-existent variable or empty list.

16
Source/cmListCommand.cxx
View File

@ -1225,13 +1225,17 @@ bool cmListCommand::HandleRemoveAtCommand(std::vector<std::string> const& args)
const std::string& listName = args[1]; const std::string& listName = args[1];
// expand the variable // expand the variable
std::vector<std::string> varArgsExpanded; std::vector<std::string> varArgsExpanded;
if (!this->GetList(varArgsExpanded, listName)) { if (!this->GetList(varArgsExpanded, listName) || varArgsExpanded.empty()) {
this->SetError("sub-command REMOVE_AT requires list to be present."); std::ostringstream str;
return false; str << "index: ";
for (size_t i = 1; i < args.size(); ++i) {
str << args[i];
if (i != args.size() - 1) {
str << ", ";
} }
// FIXME: Add policy to make non-existing lists an error like empty lists. }
if (varArgsExpanded.empty()) { str << " out of range (0, 0)";
this->SetError("REMOVE_AT given empty list"); this->SetError(str.str());
return false; return false;
} }

2
Tests/RunCMake/list/EmptyRemoveAt0-stderr.txt
View File

@ -1,4 +1,4 @@
CMake Error at EmptyRemoveAt0.cmake:2 \(list\): CMake Error at EmptyRemoveAt0.cmake:2 \(list\):
list REMOVE_AT given empty list list index: mylist, 0 out of range \(0, 0\)
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$ CMakeLists.txt:3 \(include\)$

1
Tests/RunCMake/list/REMOVE_AT-EmptyList-result.txt Normal file
View File

@ -0,0 +1 @@
1

4
Tests/RunCMake/list/REMOVE_AT-EmptyList-stderr.txt Normal file
View File

@ -0,0 +1,4 @@
^CMake Error at REMOVE_AT-EmptyList.cmake:2 \(list\):
list index: nosuchlist, 0 out of range \(0, 0\)
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$

6
Tests/RunCMake/list/REMOVE_AT-EmptyList.cmake Normal file
View File

@ -0,0 +1,6 @@
set(nosuchlist "")
list(REMOVE_AT nosuchlist 0)
if (NOT DEFINED nosuchlist OR NOT nosuchlist STREQUAL "")
message(FATAL_ERROR
"list(REMOVE_AT) modified our list")
endif ()

2
Tests/RunCMake/list/REMOVE_AT-NotList-stderr.txt
View File

@ -1,4 +1,4 @@
^CMake Error at REMOVE_AT-NotList.cmake:2 \(list\): ^CMake Error at REMOVE_AT-NotList.cmake:2 \(list\):
list sub-command REMOVE_AT requires list to be present. list index: nosuchlist, 0 out of range \(0, 0\)
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$ CMakeLists.txt:3 \(include\)$

4
Tests/RunCMake/list/REMOVE_AT-NotList.cmake
View File

@ -1,2 +1,6 @@
unset(nosuchlist) unset(nosuchlist)
list(REMOVE_AT nosuchlist 0) list(REMOVE_AT nosuchlist 0)
if (DEFINED nosuchlist)
message(FATAL_ERROR
"list(REMOVE_AT) created our list")
endif ()

2
Tests/RunCMake/list/RunCMakeTest.cmake
View File

@ -22,6 +22,8 @@ run_cmake(REMOVE_DUPLICATES-TooManyArguments)
run_cmake(REVERSE-TooManyArguments) run_cmake(REVERSE-TooManyArguments)
run_cmake(SUBLIST-TooManyArguments) run_cmake(SUBLIST-TooManyArguments)
run_cmake(REMOVE_AT-EmptyList)
run_cmake(FILTER-NotList) run_cmake(FILTER-NotList)
run_cmake(REMOVE_AT-NotList) run_cmake(REMOVE_AT-NotList)
run_cmake(REMOVE_DUPLICATES-NotList) run_cmake(REMOVE_DUPLICATES-NotList)