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

Slight cleanup of the boxed_number cleanups from mgee

Browse Source
This commit is contained in:
Jason Turner
2012-05-14 18:09:55 -06:00
parent 94fefa0690
commit 437f6a03a9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@@ -303,8 +303,9 @@ namespace chaiscript
} }
Boxed_Number(const Boxed_Value &v) Boxed_Number(const Boxed_Value &v)
: bv(v)
{ {
operator=(v); validate_boxed_number(v);
} }
@@ -373,10 +374,8 @@ namespace chaiscript
return oper(Operators::assign_bitwise_and, this->bv, t_rhs.bv); return oper(Operators::assign_bitwise_and, this->bv, t_rhs.bv);
} }
Boxed_Number operator=(const Boxed_Value &v) void validate_boxed_number(const Boxed_Value &v)
{ {
bv = v;
const Type_Info &inp_ = v.get_type_info(); const Type_Info &inp_ = v.get_type_info();
if (inp_ == typeid(bool)) if (inp_ == typeid(bool))
{ {
@@ -387,7 +386,12 @@ namespace chaiscript
{ {
throw boost::bad_any_cast(); throw boost::bad_any_cast();
} }
}
Boxed_Number operator=(const Boxed_Value &v)
{
validate_boxed_number(v);
bv = v;
return *this; return *this;
} }