diff options
author | Ander Conselvan de Oliveira <ander.deoliveira@mapbox.com> | 2019-04-02 11:59:13 +0300 |
---|---|---|
committer | Ander Conselvan de Oliveira <ander.deoliveira@mapbox.com> | 2019-05-21 12:14:22 +0300 |
commit | 33cfd080c2ce0f2ed0c9ee3102cedc4baedf0d8c (patch) | |
tree | 61524ba15c720b2957454f9841856d4618330329 /include | |
parent | 11055f9a8887eec8c69b14cd1417c29abce43d89 (diff) | |
download | qtlocation-mapboxgl-33cfd080c2ce0f2ed0c9ee3102cedc4baedf0d8c.tar.gz |
[core] Fix most identity function with default legacy expression tests
Add handling of default value to the conversion of legacy identity
functions. The color and enum tests still don't pass though.
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/style/expression/dsl.hpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp index bd94a765e7..dc0f1ab90f 100644 --- a/include/mbgl/style/expression/dsl.hpp +++ b/include/mbgl/style/expression/dsl.hpp @@ -31,14 +31,21 @@ std::unique_ptr<Expression> literal(Value value); std::unique_ptr<Expression> literal(std::initializer_list<double> value); std::unique_ptr<Expression> literal(std::initializer_list<const char *> value); -std::unique_ptr<Expression> assertion(type::Type, std::unique_ptr<Expression>); -std::unique_ptr<Expression> number(std::unique_ptr<Expression>); -std::unique_ptr<Expression> string(std::unique_ptr<Expression>); -std::unique_ptr<Expression> boolean(std::unique_ptr<Expression>); - -std::unique_ptr<Expression> toColor(std::unique_ptr<Expression>); -std::unique_ptr<Expression> toString(std::unique_ptr<Expression>); -std::unique_ptr<Expression> toFormatted(std::unique_ptr<Expression>); +std::unique_ptr<Expression> assertion(type::Type, std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); +std::unique_ptr<Expression> number(std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); +std::unique_ptr<Expression> string(std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); +std::unique_ptr<Expression> boolean(std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); + +std::unique_ptr<Expression> toColor(std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); +std::unique_ptr<Expression> toString(std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); +std::unique_ptr<Expression> toFormatted(std::unique_ptr<Expression>, + optional<std::unique_ptr<Expression>> def = {}); std::unique_ptr<Expression> get(const char* value); std::unique_ptr<Expression> get(std::unique_ptr<Expression>); |