From 15ba70b5ff018ec2285e0459bf557d1f61240c41 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 28 Feb 2018 15:03:47 -0800 Subject: Infer type assertions for object Cross-ports https://github.com/mapbox/mapbox-gl-js/pull/6243. --- src/mbgl/style/expression/parsing_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mbgl/style/expression/parsing_context.cpp b/src/mbgl/style/expression/parsing_context.cpp index 0215982209..880772d926 100644 --- a/src/mbgl/style/expression/parsing_context.cpp +++ b/src/mbgl/style/expression/parsing_context.cpp @@ -147,7 +147,7 @@ ParseResult ParsingContext::parse(const Convertible& value, TypeAnnotationOption }; const type::Type actual = (*parsed)->getType(); - if ((*expected == type::String || *expected == type::Number || *expected == type::Boolean) && actual == type::Value) { + if ((*expected == type::String || *expected == type::Number || *expected == type::Boolean || *expected == type::Object) && actual == type::Value) { if (typeAnnotationOption == includeTypeAnnotations) { parsed = { std::make_unique(*expected, array(std::move(*parsed))) }; } -- cgit v1.2.1