Add some more operator action
This commit is contained in:
@@ -135,12 +135,31 @@ Ret add(P1 p1, P2 p2)
|
|||||||
return p1 + p2;
|
return p1 + p2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename Ret, typename P1, typename P2>
|
||||||
|
Ret subtract(P1 p1, P2 p2)
|
||||||
|
{
|
||||||
|
return p1 - p2;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename Ret, typename P1, typename P2>
|
||||||
|
Ret divide(P1 p1, P2 p2)
|
||||||
|
{
|
||||||
|
return p1 - p2;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
template<typename Ret, typename P1, typename P2>
|
template<typename Ret, typename P1, typename P2>
|
||||||
Ret multiply(P1 p1, P2 p2)
|
Ret multiply(P1 p1, P2 p2)
|
||||||
{
|
{
|
||||||
return p1 * p2;
|
return p1 * p2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename P1, typename P2>
|
||||||
|
P1 ×equal(P1 &p1, P2 p2)
|
||||||
|
{
|
||||||
|
return (p1 *= p2);
|
||||||
|
}
|
||||||
|
|
||||||
template<typename Input>
|
template<typename Input>
|
||||||
std::string to_string(Input i)
|
std::string to_string(Input i)
|
||||||
{
|
{
|
||||||
@@ -156,11 +175,22 @@ void bootstrap(BoxedCPP_System &s)
|
|||||||
s.register_type<std::string>("string");
|
s.register_type<std::string>("string");
|
||||||
|
|
||||||
s.register_function(boost::function<std::string (const std::string &, const std::string&)>(&add<std::string, const std::string &, const std::string &>), "+");
|
s.register_function(boost::function<std::string (const std::string &, const std::string&)>(&add<std::string, const std::string &, const std::string &>), "+");
|
||||||
|
|
||||||
s.register_function(boost::function<int (int, int)>(&add<int, int, int>), "+");
|
s.register_function(boost::function<int (int, int)>(&add<int, int, int>), "+");
|
||||||
s.register_function(boost::function<double (int, double)>(&add<double, int, double>), "+");
|
s.register_function(boost::function<double (int, double)>(&add<double, int, double>), "+");
|
||||||
s.register_function(boost::function<double (double, int)>(&add<double, double, int>), "+");
|
s.register_function(boost::function<double (double, int)>(&add<double, double, int>), "+");
|
||||||
s.register_function(boost::function<double (double, double)>(&add<double, double, double>), "+");
|
s.register_function(boost::function<double (double, double)>(&add<double, double, double>), "+");
|
||||||
|
|
||||||
|
s.register_function(boost::function<int (int, int)>(&subtract<int, int, int>), "-");
|
||||||
|
s.register_function(boost::function<double (int, double)>(&subtract<double, int, double>), "-");
|
||||||
|
s.register_function(boost::function<double (double, int)>(&subtract<double, double, int>), "-");
|
||||||
|
s.register_function(boost::function<double (double, double)>(&subtract<double, double, double>), "-");
|
||||||
|
|
||||||
|
s.register_function(boost::function<int (int, int)>(÷<int, int, int>), "/");
|
||||||
|
s.register_function(boost::function<double (int, double)>(÷<double, int, double>), "/");
|
||||||
|
s.register_function(boost::function<double (double, int)>(÷<double, double, int>), "/");
|
||||||
|
s.register_function(boost::function<double (double, double)>(÷<double, double, double>), "/");
|
||||||
|
|
||||||
s.register_function(boost::function<int (int, int)>(&multiply<int, int, int>), "*");
|
s.register_function(boost::function<int (int, int)>(&multiply<int, int, int>), "*");
|
||||||
s.register_function(boost::function<double (int, double)>(&multiply<double, int, double>), "*");
|
s.register_function(boost::function<double (int, double)>(&multiply<double, int, double>), "*");
|
||||||
s.register_function(boost::function<double (double, int)>(&multiply<double, double, int>), "*");
|
s.register_function(boost::function<double (double, int)>(&multiply<double, double, int>), "*");
|
||||||
@@ -171,6 +201,15 @@ void bootstrap(BoxedCPP_System &s)
|
|||||||
s.register_function(boost::function<std::string (char)>(&to_string<char>), "to_string");
|
s.register_function(boost::function<std::string (char)>(&to_string<char>), "to_string");
|
||||||
s.register_function(boost::function<std::string (double)>(&to_string<double>), "to_string");
|
s.register_function(boost::function<std::string (double)>(&to_string<double>), "to_string");
|
||||||
|
|
||||||
|
s.register_function(boost::function<int &(int&, int)>(×equal<int, int>), "*=");
|
||||||
|
s.register_function(boost::function<double &(double&, int)>(×equal<double, int>), "*=");
|
||||||
|
s.register_function(boost::function<double &(double&, double)>(×equal<double, double>), "*=");
|
||||||
|
s.register_function(boost::function<int &(int&, double)>(×equal<int, double>), "*=");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user