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

Greatly simplify integer sizing code

Browse Source
This commit is contained in:
Jason Turner 2015-10-03 17:11:03 -06:00
parent beedf13d01
commit e221ceaa4c
1 changed files with 17 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
include/chaiscript/language/chaiscript_parser.hpp
View File

@ -648,87 +648,34 @@ namespace chaiscript
} }
} }
const auto val = prefixed?std::string(t_val.begin()+2,t_val.end()):t_val; const auto val = prefixed?std::string(t_val.begin()+2,t_val.end()):t_val;
static_assert(sizeof(long) == sizeof(uint64_t) || sizeof(long) * 2 == sizeof(uint64_t), "Unexpected sizing of integer types"); // static_assert(sizeof(long) == sizeof(uint64_t) || sizeof(long) * 2 == sizeof(uint64_t), "Unexpected sizing of integer types");
bool unsignedrequired = false;
try { try {
auto u = std::stoll(val,nullptr,base); auto u = std::stoll(val,nullptr,base);
if ((u >> (sizeof(int) * 8)) > 0) if (!unsigned_ && !long_ && u >= std::numeric_limits<int>::min() && u <= std::numeric_limits<int>::max()) {
{ return const_var(static_cast<int>(u));
//requires something bigger than int } else if ((unsigned_ || base != 10) && !long_ && u >= std::numeric_limits<unsigned int>::min() && u <= std::numeric_limits<unsigned int>::max()) {
long_ = true; return const_var(static_cast<unsigned int>(u));
} } else if (!unsigned_ && !longlong_ && u >= std::numeric_limits<long>::min() && u <= std::numeric_limits<long>::max()) {
return const_var(static_cast<long>(u));
if ((sizeof(long) < sizeof(uint64_t)) } else if ((unsigned_ || base != 10) && !longlong_ && u >= std::numeric_limits<unsigned long>::min() && u <= std::numeric_limits<unsigned long>::max()) {
&& (u >> ((sizeof(uint64_t) - sizeof(long)) * 8)) > 0) return const_var(static_cast<unsigned long>(u));
{ } else if (!unsigned_ && u >= std::numeric_limits<long long>::min() && u <= std::numeric_limits<long long>::max()) {
//requires something bigger than long return const_var(static_cast<long long>(u));
longlong_ = true;
}
const size_t size = [&]()->size_t{
if (longlong_)
{
return sizeof(int64_t) * 8;
} else if (long_) {
return sizeof(long) * 8;
} else { } else {
return sizeof(int) * 8; return const_var(static_cast<unsigned long long>(u));
} }
}();
if ( (u >> (size - 1)) > 0)
{
unsignedrequired = true;
}
} catch (const std::out_of_range &) { } catch (const std::out_of_range &) {
// it cannot fit in a signed long long... auto u = std::stoull(val,nullptr,base);
std::cout << "forcing long long for '" << val << "'\n";
unsignedrequired = true;
long_ = sizeof(unsigned long long) == sizeof(unsigned long); if (u >= std::numeric_limits<unsigned long>::min() && u <= std::numeric_limits<unsigned long>::max()) {
longlong_ = sizeof(unsigned long long) != sizeof(unsigned long); return const_var(static_cast<unsigned long>(u));
}
if (unsignedrequired && !unsigned_)
{
if (base != 10)
{
// with bin, hex and oct we are happy to just make it unsigned
unsigned_ = true;
} else { } else {
// with decimal we must bump it up to the next size return const_var(static_cast<unsigned long long>(u));
if (long_)
{
longlong_ = true;
} else if (!long_ && !longlong_) {
long_ = true;
}
}
}
if (unsigned_)
{
if (longlong_)
{
return const_var(stoull(val,nullptr,base));
} else if (long_) {
return const_var(stoul(val,nullptr,base));
} else {
return const_var(static_cast<unsigned int>(stoul(val,nullptr,base)));
}
} else {
if (longlong_)
{
return const_var(stoll(val,nullptr,base));
} else if (long_) {
return const_var(stol(val,nullptr,base));
} else {
return const_var(stoi(val,nullptr,base));
} }
} }
} }