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

list(): restore SUBLIST behavior

Browse Source 
Fixes: #25002
This commit is contained in:
Marc Chevrier 2023-06-16 15:09:57 +02:00
parent 8a99acd289
commit 1cfaed0684
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmList.h
View File

@ -322,7 +322,7 @@ public:
// extract sublist in range [first, last) // extract sublist in range [first, last)
cmList sublist(const_iterator first, const_iterator last) const cmList sublist(const_iterator first, const_iterator last) const
{ {
return cmList{ first, last }; return cmList{ first, last, ExpandElements::No, EmptyElements::Yes };
} }
// Extract sublist in range [first, last) // Extract sublist in range [first, last)
// Throw std::out_of_range if pos is invalid // Throw std::out_of_range if pos is invalid

51
Tests/RunCMake/list/SUBLIST.cmake
View File

@ -44,3 +44,54 @@ list(SUBLIST mylist 1 -1 result)
if (NOT result STREQUAL "bravo;charlie;delta") if (NOT result STREQUAL "bravo;charlie;delta")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"bravo;charlie;delta\"") message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"bravo;charlie;delta\"")
endif() endif()
set(mylist ";;")
unset(result)
list(SUBLIST mylist 0 0 result)
if (NOT result STREQUAL "")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"")
endif()
unset(result)
list(SUBLIST mylist 0 1 result)
if (NOT result STREQUAL "")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"")
endif()
unset(result)
list(SUBLIST mylist 0 2 result)
if (NOT result STREQUAL ";")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";\"")
endif()
unset(result)
list(SUBLIST mylist 0 3 result)
if (NOT result STREQUAL ";;")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";;\"")
endif()
set(mylist [[a\;b;c\;d;e]])
unset(result)
list(SUBLIST mylist 1 2 result)
if (NOT result STREQUAL "c;d;e")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c;d;e\"")
endif()
set(mylist [[a\;b;c\\;d;e;f;g;h]])
unset(result)
list(SUBLIST mylist 1 -1 result)
if (NOT result STREQUAL "c\\;d;e;f;g;h")
message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c\\;d;e;f;g;h\"")
endif()