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

Smartly size the integer returned from a Boxed_POD_Value operation to return an "int" if the resulting value is small enough

Browse Source
This commit is contained in:
Jason Turner 2009-12-01 03:52:57 +00:00
parent e2a2c14c0d
commit 636c55493c
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/chaiscript/dispatchkit/boxed_value.hpp
View File

@ -711,7 +711,7 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i + r.i);
return smart_size(i + r.i);
}
return Boxed_Value(((m_isfloat)?d:i) + ((r.m_isfloat)?r.d:r.i));
@ -721,7 +721,7 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i - r.i);
return smart_size(i - r.i);
}
return Boxed_Value(((m_isfloat)?d:i) - ((r.m_isfloat)?r.d:r.i));
@ -761,7 +761,7 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i / r.i);
return smart_size(i / r.i);
}
return Boxed_Value(((m_isfloat)?d:i) / ((r.m_isfloat)?r.d:r.i));
@ -771,7 +771,7 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i << r.i);
return smart_size(i << r.i);
}
throw bad_boxed_cast("<< only valid for integer types");
@ -782,7 +782,7 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i * r.i);
return smart_size(i * r.i);
}
return Boxed_Value(((m_isfloat)?d:i) * ((r.m_isfloat)?r.d:r.i));
@ -793,7 +793,7 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i % r.i);
return smart_size(i % r.i);
}
throw bad_boxed_cast("% only valid for integer types");
@ -803,12 +803,23 @@ namespace chaiscript
{
if (!m_isfloat && !r.m_isfloat)
{
return Boxed_Value(i >> r.i);
return smart_size(i >> r.i);
}
throw bad_boxed_cast(">> only valid for integer types");
}
Boxed_Value smart_size(boost::int64_t i) const
{
if (i < std::numeric_limits<int>::min()
|| i > std::numeric_limits<int>::max())
{
return Boxed_Value(i);
} else {
return Boxed_Value(static_cast<int>(i));
}
}
double d;