tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] ["to-array", <item type>, <empty array>] should work for any item type

Browse Source 
Ports https://github.com/mapbox/mapbox-gl-js/pull/7261.
This commit is contained in:
John Firebaugh
2018-09-11 13:30:31 -07:00
parent 9efdc4c6c3
commit df93047d40
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mbgl/style/expression/check_subtype.cpp
View File

@@ -15,11 +15,19 @@ optional<std::string> checkSubtype(const Type& expected, const Type& t) {
optional<std::string> result = expected.match(
[&] (const Array& expectedArray) -> optional<std::string> {
if (!t.is<Array>()) { return {errorMessage(expected, t)}; }
if (!t.is<Array>()) {
return {errorMessage(expected, t)};
}
const auto& actualArray = t.get<Array>();
const auto err = checkSubtype(expectedArray.itemType, actualArray.itemType);
if (err) return { errorMessage(expected, t) };
if (expectedArray.N && expectedArray.N != actualArray.N) return { errorMessage(expected, t) };
if (!actualArray.N || *actualArray.N != 0 || actualArray.itemType != type::Value) {
const auto err = checkSubtype(expectedArray.itemType, actualArray.itemType);
if (err) {
return { errorMessage(expected, t) };
}
}
if (expectedArray.N && expectedArray.N != actualArray.N) {
return { errorMessage(expected, t) };
}
return {};
},
[&] (const ValueType&) -> optional<std::string> {