generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename of numeric to number

Browse Source
This commit is contained in:
Jason Turner
2011-06-08 13:53:55 -06:00
parent 6d4041b2a1
commit 7a9baeb350
7 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@@ -11,7 +11,7 @@
#include "dynamic_object.hpp"
#include "register_function.hpp"
#include "operators.hpp"
#include "boxed_numeric.hpp"
#include "boxed_number.hpp"
#include <boost/function_types/result_type.hpp>
namespace chaiscript
@@ -21,15 +21,15 @@ namespace chaiscript
{
namespace detail
{
/// \brief Constructs a new POD value object from a Boxed_Numeric
/// \param[in] v Boxed_Numeric to copy into the new object
/// \brief Constructs a new POD value object from a Boxed_Number
/// \param[in] v Boxed_Number to copy into the new object
/// \returns The newly created object.
template<typename P1>
boost::shared_ptr<P1> construct_pod(Boxed_Numeric v)
boost::shared_ptr<P1> construct_pod(Boxed_Number v)
{
boost::shared_ptr<P1> p(new P1());
Boxed_Value bv(p);
Boxed_Numeric nb(bv);
Boxed_Number nb(bv);
nb = v;
return p;
}
@@ -210,41 +210,41 @@ namespace chaiscript
*/
static void opers_arithmetic_pod(ModulePtr m = ModulePtr(new Module()))
{
m->add(fun(&Boxed_Numeric::operator&=), "&=");
m->add(fun(&Boxed_Numeric::operator|=), "|=");
m->add(fun(&Boxed_Numeric::operator%=), "%=");
m->add(fun(&Boxed_Numeric::operator^=), "^=");
m->add(fun(&Boxed_Numeric::operator<<=), "<<=");
m->add(fun(&Boxed_Numeric::operator>>=), ">>=");
m->add(fun(&Boxed_Number::operator&=), "&=");
m->add(fun(&Boxed_Number::operator|=), "|=");
m->add(fun(&Boxed_Number::operator%=), "%=");
m->add(fun(&Boxed_Number::operator^=), "^=");
m->add(fun(&Boxed_Number::operator<<=), "<<=");
m->add(fun(&Boxed_Number::operator>>=), ">>=");
m->add(fun(&Boxed_Numeric::operator&), "&");
m->add(fun(&Boxed_Numeric::operator~), "~");
m->add(fun(&Boxed_Numeric::operator^), "^");
m->add(fun(&Boxed_Numeric::operator|), "|");
m->add(fun(&Boxed_Numeric::operator<<), "<<");
m->add(fun(&Boxed_Numeric::operator%), "%");
m->add(fun(&Boxed_Numeric::operator>>), ">>");
m->add(fun(&Boxed_Number::operator&), "&");
m->add(fun(&Boxed_Number::operator~), "~");
m->add(fun(&Boxed_Number::operator^), "^");
m->add(fun(&Boxed_Number::operator|), "|");
m->add(fun(&Boxed_Number::operator<<), "<<");
m->add(fun(&Boxed_Number::operator%), "%");
m->add(fun(&Boxed_Number::operator>>), ">>");
m->add(fun<Boxed_Value (Boxed_Numeric::*)(const Boxed_Numeric &) const>(&Boxed_Numeric::operator=), "=");
m->add(fun(&Boxed_Numeric::operator*=), "*=");
m->add(fun(&Boxed_Numeric::operator/=), "/=");
m->add(fun(&Boxed_Numeric::operator+=), "+=");
m->add(fun(&Boxed_Numeric::operator-=), "-=");
m->add(fun(&Boxed_Numeric::operator--), "--");
m->add(fun(&Boxed_Numeric::operator++), "++");
m->add(fun(&Boxed_Numeric::operator/), "/");
m->add(fun(&Boxed_Numeric::operator*), "*");
m->add(fun<Boxed_Value (Boxed_Numeric::*)() const>(&Boxed_Numeric::operator+), "+");
m->add(fun<Boxed_Value (Boxed_Numeric::*)() const>(&Boxed_Numeric::operator-), "-");
m->add(fun<Boxed_Value (Boxed_Numeric::*)(const Boxed_Numeric &) const>(&Boxed_Numeric::operator+), "+");
m->add(fun<Boxed_Value (Boxed_Numeric::*)(const Boxed_Numeric &) const>(&Boxed_Numeric::operator-), "-");
m->add(fun<Boxed_Value (Boxed_Number::*)(const Boxed_Number &) const>(&Boxed_Number::operator=), "=");
m->add(fun(&Boxed_Number::operator*=), "*=");
m->add(fun(&Boxed_Number::operator/=), "/=");
m->add(fun(&Boxed_Number::operator+=), "+=");
m->add(fun(&Boxed_Number::operator-=), "-=");
m->add(fun(&Boxed_Number::operator--), "--");
m->add(fun(&Boxed_Number::operator++), "++");
m->add(fun(&Boxed_Number::operator/), "/");
m->add(fun(&Boxed_Number::operator*), "*");
m->add(fun<Boxed_Value (Boxed_Number::*)() const>(&Boxed_Number::operator+), "+");
m->add(fun<Boxed_Value (Boxed_Number::*)() const>(&Boxed_Number::operator-), "-");
m->add(fun<Boxed_Value (Boxed_Number::*)(const Boxed_Number &) const>(&Boxed_Number::operator+), "+");
m->add(fun<Boxed_Value (Boxed_Number::*)(const Boxed_Number &) const>(&Boxed_Number::operator-), "-");
m->add(fun(&Boxed_Numeric::operator==), "==");
m->add(fun(&Boxed_Numeric::operator>), ">");
m->add(fun(&Boxed_Numeric::operator>=), ">=");
m->add(fun(&Boxed_Numeric::operator<), "<");
m->add(fun(&Boxed_Numeric::operator<=), "<=");
m->add(fun(&Boxed_Numeric::operator!=), "!=");
m->add(fun(&Boxed_Number::operator==), "==");
m->add(fun(&Boxed_Number::operator>), ">");
m->add(fun(&Boxed_Number::operator>=), ">=");
m->add(fun(&Boxed_Number::operator<), "<");
m->add(fun(&Boxed_Number::operator<=), "<=");
m->add(fun(&Boxed_Number::operator!=), "!=");
}
/**
@@ -369,7 +369,7 @@ namespace chaiscript
m->add(user_type<void>(), "void");
m->add(user_type<bool>(), "bool");
m->add(user_type<Boxed_Value>(), "Object");
m->add(user_type<Boxed_Numeric>(), "PODObject");
m->add(user_type<Boxed_Number>(), "Number");
m->add(user_type<Proxy_Function>(), "Function");
m->add(user_type<std::exception>(), "exception");

74
include/chaiscript/dispatchkit/boxed_numeric.hpp → include/chaiscript/dispatchkit/boxed_number.hpp
View File

@@ -19,7 +19,7 @@ namespace chaiscript
{
/// \brief Represents any numeric type, generically. Used internally for generic operations between POD values
class Boxed_Numeric
class Boxed_Number
{
private:
struct boolean
@@ -301,7 +301,7 @@ namespace chaiscript
public:
Boxed_Numeric(const Boxed_Value &v)
Boxed_Number(const Boxed_Value &v)
: bv(v)
{
const Type_Info &inp_ = v.get_type_info();
@@ -317,32 +317,32 @@ namespace chaiscript
}
bool operator==(const Boxed_Numeric &t_rhs) const
bool operator==(const Boxed_Number &t_rhs) const
{
return boxed_cast<bool>(oper(Operators::equals, this->bv, t_rhs.bv));
}
bool operator<(const Boxed_Numeric &t_rhs) const
bool operator<(const Boxed_Number &t_rhs) const
{
return boxed_cast<bool>(oper(Operators::less_than, this->bv, t_rhs.bv));
}
bool operator>(const Boxed_Numeric &t_rhs) const
bool operator>(const Boxed_Number &t_rhs) const
{
return boxed_cast<bool>(oper(Operators::greater_than, this->bv, t_rhs.bv));
}
bool operator>=(const Boxed_Numeric &t_rhs) const
bool operator>=(const Boxed_Number &t_rhs) const
{
return boxed_cast<bool>(oper(Operators::greater_than_equal, this->bv, t_rhs.bv));
}
bool operator<=(const Boxed_Numeric &t_rhs) const
bool operator<=(const Boxed_Number &t_rhs) const
{
return boxed_cast<bool>(oper(Operators::less_than_equal, this->bv, t_rhs.bv));
}
bool operator!=(const Boxed_Numeric &t_rhs) const
bool operator!=(const Boxed_Number &t_rhs) const
{
return boxed_cast<bool>(oper(Operators::not_equal, this->bv, t_rhs.bv));
}
@@ -357,7 +357,7 @@ namespace chaiscript
return oper(Operators::pre_increment, this->bv, var(0));
}
Boxed_Value operator+(const Boxed_Numeric &t_rhs) const
Boxed_Value operator+(const Boxed_Number &t_rhs) const
{
return oper(Operators::sum, this->bv, t_rhs.bv);
}
@@ -372,47 +372,47 @@ namespace chaiscript
return oper(Operators::unary_minus, this->bv, Boxed_Value(0));
}
Boxed_Value operator-(const Boxed_Numeric &t_rhs) const
Boxed_Value operator-(const Boxed_Number &t_rhs) const
{
return oper(Operators::difference, this->bv, t_rhs.bv);
}
Boxed_Value operator&=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator&=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_bitwise_and, this->bv, t_rhs.bv);
}
Boxed_Value operator=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign, this->bv, t_rhs.bv);
}
Boxed_Value operator|=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator|=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_bitwise_or, this->bv, t_rhs.bv);
}
Boxed_Value operator^=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator^=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_bitwise_xor, this->bv, t_rhs.bv);
}
Boxed_Value operator%=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator%=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_remainder, this->bv, t_rhs.bv);
}
Boxed_Value operator<<=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator<<=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_shift_left, this->bv, t_rhs.bv);
}
Boxed_Value operator>>=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator>>=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_shift_right, this->bv, t_rhs.bv);
}
Boxed_Value operator&(const Boxed_Numeric &t_rhs) const
Boxed_Value operator&(const Boxed_Number &t_rhs) const
{
return oper(Operators::bitwise_and, this->bv, t_rhs.bv);
}
@@ -422,54 +422,54 @@ namespace chaiscript
return oper(Operators::bitwise_complement, this->bv, Boxed_Value(0));
}
Boxed_Value operator^(const Boxed_Numeric &t_rhs) const
Boxed_Value operator^(const Boxed_Number &t_rhs) const
{
return oper(Operators::bitwise_xor, this->bv, t_rhs.bv);
}
Boxed_Value operator|(const Boxed_Numeric &t_rhs) const
Boxed_Value operator|(const Boxed_Number &t_rhs) const
{
return oper(Operators::bitwise_or, this->bv, t_rhs.bv);
}
Boxed_Value operator*=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator*=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_product, this->bv, t_rhs.bv);
}
Boxed_Value operator/=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator/=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_quotient, this->bv, t_rhs.bv);
}
Boxed_Value operator+=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator+=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_sum, this->bv, t_rhs.bv);
}
Boxed_Value operator-=(const Boxed_Numeric &t_rhs) const
Boxed_Value operator-=(const Boxed_Number &t_rhs) const
{
return oper(Operators::assign_difference, this->bv, t_rhs.bv);
}
Boxed_Value operator/(const Boxed_Numeric &t_rhs) const
Boxed_Value operator/(const Boxed_Number &t_rhs) const
{
return oper(Operators::quotient, this->bv, t_rhs.bv);
}
Boxed_Value operator<<(const Boxed_Numeric &t_rhs) const
Boxed_Value operator<<(const Boxed_Number &t_rhs) const
{
return oper(Operators::shift_left, this->bv, t_rhs.bv);
}
Boxed_Value operator*(const Boxed_Numeric &t_rhs) const
Boxed_Value operator*(const Boxed_Number &t_rhs) const
{
return oper(Operators::product, this->bv, t_rhs.bv);
}
Boxed_Value operator%(const Boxed_Numeric &t_rhs) const
Boxed_Value operator%(const Boxed_Number &t_rhs) const
{
return oper(Operators::remainder, this->bv, t_rhs.bv);
}
Boxed_Value operator>>(const Boxed_Numeric &t_rhs) const
Boxed_Value operator>>(const Boxed_Number &t_rhs) const
{
return oper(Operators::shift_right, this->bv, t_rhs.bv);
}
@@ -490,32 +490,32 @@ namespace chaiscript
namespace detail
{
/**
* Cast_Helper for converting from Boxed_Value to Boxed_Numeric
* Cast_Helper for converting from Boxed_Value to Boxed_Number
*/
template<>
struct Cast_Helper<Boxed_Numeric>
struct Cast_Helper<Boxed_Number>
{
typedef Boxed_Numeric Result_Type;
typedef Boxed_Number Result_Type;
static Result_Type cast(const Boxed_Value &ob)
{
return Boxed_Numeric(ob);
return Boxed_Number(ob);
}
};
/**
* Cast_Helper for converting from Boxed_Value to Boxed_Numeric
* Cast_Helper for converting from Boxed_Value to Boxed_Number
*/
template<>
struct Cast_Helper<const Boxed_Numeric &> : Cast_Helper<Boxed_Numeric>
struct Cast_Helper<const Boxed_Number &> : Cast_Helper<Boxed_Number>
{
};
/**
* Cast_Helper for converting from Boxed_Value to Boxed_Numeric
* Cast_Helper for converting from Boxed_Value to Boxed_Number
*/
template<>
struct Cast_Helper<const Boxed_Numeric> : Cast_Helper<Boxed_Numeric>
struct Cast_Helper<const Boxed_Number> : Cast_Helper<Boxed_Number>
{
};
}

2
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@@ -811,7 +811,7 @@ namespace chaiscript
const size_t rhssize = rhsparamtypes.size();
const Type_Info boxed_type = user_type<Boxed_Value>();
const Type_Info boxed_pod_type = user_type<Boxed_Numeric>();
const Type_Info boxed_pod_type = user_type<Boxed_Number>();
boost::shared_ptr<const dispatch::Dynamic_Proxy_Function> dynamic_lhs(boost::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(lhs));
boost::shared_ptr<const dispatch::Dynamic_Proxy_Function> dynamic_rhs(boost::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(rhs));

4
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@@ -20,7 +20,7 @@
namespace chaiscript
{
class Boxed_Numeric;
class Boxed_Number;
struct AST_Node;
typedef boost::shared_ptr<struct AST_Node> AST_NodePtr;
@@ -139,7 +139,7 @@ namespace chaiscript
if (ti.is_undef()
|| ti.bare_equal(user_type<Boxed_Value>())
|| (!bv.get_type_info().is_undef()
&& (ti.bare_equal(user_type<Boxed_Numeric>())
&& (ti.bare_equal(user_type<Boxed_Number>())
|| ti.bare_equal(bv.get_type_info())
|| chaiscript::detail::dynamic_cast_converts(ti, bv.get_type_info())
|| bv.get_type_info().bare_equal(user_type<boost::shared_ptr<const Proxy_Function_Base> >())