sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add int(),'float() and str()` implicit conversions ref #4477.

Browse source
This commit is contained in:
Artem Pavlenko 2024-11-08 09:53:43 +00:00
parent bb3106d04f
commit 3422472c7d
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -209,14 +209,17 @@ struct unary_function_types_ : x3::symbols<unary_function_impl>
{ {
unary_function_types_() unary_function_types_()
{ {
add("sin", sin_impl()) // add("sin", sin_impl()) //
("cos", cos_impl()) // ("cos", cos_impl()) //
("tan", tan_impl()) // ("tan", tan_impl()) //
("atan", atan_impl()) // ("atan", atan_impl()) //
("exp", exp_impl()) // ("exp", exp_impl()) //
("log", log_impl()) // ("log", log_impl()) //
("abs", abs_impl()) // ("abs", abs_impl()) //
("length", length_impl()) // ("length", length_impl()) //
("int", int_impl()) //
("float", float_impl()) //
("str", str_impl()) //
; ;
} }
} const unary_func_types; } const unary_func_types;

19
include/mapnik/function_call.hpp
View file

@ -89,6 +89,25 @@ struct length_impl
value_type operator()(value_type const& val) const { return val.to_unicode().length(); } value_type operator()(value_type const& val) const { return val.to_unicode().length(); }
}; };
// str
struct str_impl
{
value_type operator()(value_type const& val) const { return val.to_unicode(); }
};
// int
struct int_impl
{
value_type operator()(value_type const& val) const { return val.to_int(); }
};
// float
struct float_impl
{
value_type operator()(value_type const& val) const { return val.to_double(); }
};
// min // min
inline value_type min_impl(value_type const& arg1, value_type const& arg2) inline value_type min_impl(value_type const& arg1, value_type const& arg2)
{ {