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

be more consistent with JS logic when evaluating operators on unicode_strings

Browse source 
'abc' + 'de' -> 'abcde'
'abc' ( - | * | / | % ) 'de' -> value_null
This commit is contained in:
artemp 2014-05-19 12:36:44 +01:00
parent cf9e5fad3e
commit 509a59353c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/mapnik/value.hpp
View file

@ -425,7 +425,7 @@ struct sub : public boost::static_visitor<V>
value_type operator() (value_unicode_string const& lhs,
value_unicode_string const& ) const
{
return lhs;
return value_type();
}
value_type operator() (value_double lhs, value_integer rhs) const
@ -462,7 +462,7 @@ struct mult : public boost::static_visitor<V>
value_type operator() (value_unicode_string const& lhs,
value_unicode_string const& ) const
{
return lhs;
return value_type();
}
value_type operator() (value_double lhs, value_integer rhs) const
@ -510,7 +510,7 @@ struct div: public boost::static_visitor<V>
value_type operator() (value_unicode_string const& lhs,
value_unicode_string const&) const
{
return lhs;
return value_type();
}
value_type operator() (value_double lhs, value_integer rhs) const
@ -545,7 +545,7 @@ struct mod: public boost::static_visitor<V>
value_type operator() (value_unicode_string const& lhs,
value_unicode_string const&) const
{
return lhs;
return value_type();
}
value_type operator() (value_bool lhs,
@ -595,8 +595,7 @@ struct negate : public boost::static_visitor<V>
value_type operator() (value_unicode_string const& ustr) const
{
value_unicode_string inplace(ustr);
return inplace.reverse();
return value_type();
}
};