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

Merge topic 'string-JSON-error-typo'

Browse Source 
e0d3e6e147 string(JSON): Fix typo in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7547
This commit is contained in:
Brad King 2022-08-05 12:54:38 +00:00 committed by Kitware Robot
commit c3da25f3d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmStringCommand.cxx
View File

@ -1014,7 +1014,7 @@ int ParseIndex(
Json::ArrayIndex index = static_cast<Json::ArrayIndex>(lindex); Json::ArrayIndex index = static_cast<Json::ArrayIndex>(lindex);
if (index >= max) { if (index >= max) {
cmAlphaNum sizeStr{ max }; cmAlphaNum sizeStr{ max };
throw json_error({ "expected an index less then "_s, sizeStr.View(), throw json_error({ "expected an index less than "_s, sizeStr.View(),
" got '"_s, str, "'"_s }, " got '"_s, str, "'"_s },
progress); progress);
} }

6
Tests/RunCMake/string/JSON.cmake
View File

@ -129,7 +129,7 @@ assert_strequal("${error}" "member '0' not found")
string(JSON result ERROR_VARIABLE error GET "${json1}" array 10) string(JSON result ERROR_VARIABLE error GET "${json1}" array 10)
assert_strequal("${result}" "array-10-NOTFOUND") assert_strequal("${result}" "array-10-NOTFOUND")
assert_strequal("${error}" "expected an index less then 4 got '10'") assert_strequal("${error}" "expected an index less than 4 got '10'")
string(JSON result ERROR_VARIABLE error GET "${json1}" array 2 some notThere) string(JSON result ERROR_VARIABLE error GET "${json1}" array 2 some notThere)
assert_strequal("${result}" "array-2-some-notThere-NOTFOUND") assert_strequal("${result}" "array-2-some-notThere-NOTFOUND")
@ -240,7 +240,7 @@ endif()
string(JSON result ERROR_VARIABLE error MEMBER "${json1}" values 100) string(JSON result ERROR_VARIABLE error MEMBER "${json1}" values 100)
assert_strequal("${result}" "values-100-NOTFOUND") assert_strequal("${result}" "values-100-NOTFOUND")
assert_strequal("${error}" "expected an index less then 5 got '100'") assert_strequal("${error}" "expected an index less than 5 got '100'")
# Test length loops # Test length loops
string(JSON arrayLength ERROR_VARIABLE error LENGTH "${json1}" types array) string(JSON arrayLength ERROR_VARIABLE error LENGTH "${json1}" types array)
@ -301,7 +301,7 @@ assert_json_equal("${error}" "${result}"
string(JSON result ERROR_VARIABLE error REMOVE ${json2} array 100) string(JSON result ERROR_VARIABLE error REMOVE ${json2} array 100)
assert_strequal("${result}" "array-100-NOTFOUND") assert_strequal("${result}" "array-100-NOTFOUND")
assert_strequal("${error}" "expected an index less then 4 got '100'") assert_strequal("${error}" "expected an index less than 4 got '100'")
# Test SET # Test SET
string(JSON result ERROR_VARIABLE error SET ${json2} new 5) string(JSON result ERROR_VARIABLE error SET ${json2} new 5)