[core] Convert legacy functions directly to expressions

This commit is contained in:
John Firebaugh
2018-06-29 12:52:08 -07:00
parent bea8f8d177
commit a6727921fc
22 changed files with 777 additions and 1193 deletions

View File

@@ -1,4 +1,5 @@
#include <mbgl/style/expression/dsl.hpp>
#include <mbgl/style/expression/error.hpp>
#include <mbgl/style/expression/literal.hpp>
#include <mbgl/style/expression/assertion.hpp>
#include <mbgl/style/expression/coercion.hpp>
@@ -28,6 +29,10 @@ static std::unique_ptr<Expression> compound(const char* op, Args... args) {
return std::move(*result);
}
std::unique_ptr<Expression> error(std::string message) {
return std::make_unique<Error>(std::move(message));
}
std::unique_ptr<Expression> literal(const char* value) {
return literal(std::string(value));
}
@@ -60,6 +65,10 @@ std::unique_ptr<Expression> string(std::unique_ptr<Expression> value) {
return std::make_unique<Assertion>(type::String, vec(std::move(value)));
}
std::unique_ptr<Expression> boolean(std::unique_ptr<Expression> value) {
return std::make_unique<Assertion>(type::Boolean, vec(std::move(value)));
}
std::unique_ptr<Expression> toColor(const char* value) {
return toColor(literal(value));
}