Fixed bug #80: removed Int64Min / Int64Max

7 files changed, 14 insertions, 163 deletions

diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp
index 0cb2d0e055e..6c815f4eaa9 100644
--- a/cpp/src/FreezeScript/DumpDescriptors.cpp
+++ b/cpp/src/FreezeScript/DumpDescriptors.cpp
@@ -1571,9 +1571,8 @@ FreezeScript::SymbolTableI::getConstantValue(const string& name) const
             case Slice::Builtin::KindInt:
             case Slice::Builtin::KindLong:
             {
-                string::size_type end;
                 Ice::Long n;
-                if(!IceUtil::stringToInt64(value, n, end))
+                if(!IceUtil::stringToInt64(value, n))
                 {
                     assert(false);
                 }
diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l
index 22b23fe4c59..203841fba05 100644
--- a/cpp/src/FreezeScript/Scanner.l
+++ b/cpp/src/FreezeScript/Scanner.l
@@ -122,10 +122,9 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
 {integer_constant} {
     IntegerTokPtr itp = new IntegerTok;
     *yylvalp = itp;
-    errno = 0;
-    itp->v = IceUtil::strToInt64(yytext, 0, 0);
-    if(errno == ERANGE && (itp->v == IceUtil::Int64Min || itp->v == IceUtil::Int64Max))
+    if(!IceUtil::stringToInt64(string(yytext), itp->v))
     {
+	assert(itp->v != 0);
         string msg = "integer constant `";
         msg += yytext;
         msg += "' out of range";
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index 45dca260c89..15772e6698b 100644
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -75,9 +75,8 @@ FreezeScript::TransformVisitor::visitInteger(const IntegerDataPtr& dest)
             if(s)
             {
                 string str = s->getValue();
-                string::size_type pos;
                 Ice::Long value;
-                if(IceUtil::stringToInt64(str, value, pos))
+                if(IceUtil::stringToInt64(str, value))
                 {
                     dest->setValue(value, false);
                 }
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index c85cc3f9e10..69a44669407 100644
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -2334,9 +2334,8 @@ FreezeScript::SymbolTableI::getConstantValue(const string& name) const
             case Slice::Builtin::KindInt:
             case Slice::Builtin::KindLong:
             {
-                string::size_type end;
                 Ice::Long n;
-                if(!IceUtil::stringToInt64(value, n, end))
+                if(!IceUtil::stringToInt64(value, n))
                 {
                     assert(false);
                 }
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index 06ace23ba51..1ec040a9def 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -13,138 +13,15 @@
 
 using namespace std;
 
-static const string allDigits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-//
-// Table to convert ASCII digits/letters into their value (100 for unused slots)
-//
-static const char digitVal[] =
-{
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9,		// '0' - '9'
-    100, 100, 100, 100, 100, 100, 100,		// punctuation
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,	// 'A' - 'J'
-    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,	// 'K' - 'T'
-    30, 31, 32, 33, 34, 35			// 'U' - 'Z'
-};
 
 namespace IceUtil
 {
 
-//
-// strToInt64 emulates strtoll() for Windows
-//
-
 Int64
 strToInt64(const char* s, char** endptr, int base)
 {
 #if defined(_WIN32)
-    //
-    // Assume nothing will be there to convert for now
-    //
-    if(endptr)
-    {
-	*endptr = const_cast<char *>(s);
-    }
-
-    //
-    // Skip leading whitespace
-    //
-    while(*s && isspace(*s))
-    {
-	++s;
-    }
-
-    //
-    // Check for sign
-    //
-    int sign = 1;
-    if(*s == '+')
-    {
-	++s;
-    }
-    else if(*s == '-')
-    {
-	sign = -1;
-	++s;
-    }
-
-    //
-    // Check that base is valid
-    //
-    if(base == 0)
-    {
-	if(*s == '0')
-	{
-	    base = 8;
-	    if(*++s == 'x' || *s == 'X')
-	    {
-		base = 16;
-		++s;
-	    }
-	}
-	else
-	{
-	    base = 10;
-	}
-    }
-    else if(base < 2 || base > 36)
-    {
-	errno = EINVAL;
-	return 0;
-    }
-
-    //
-    // Check that we have something left to parse
-    //
-    if(*s == '/0')
-    {
-	return 0;
-    }
-
-    Int64 result = 0;
-    bool overflow = false;
-    const string validDigits(allDigits.begin(), allDigits.begin() + base);
-    while(*s && validDigits.find_first_of(toupper(*s)) != validDigits.npos)
-    {	
-	if(!overflow)
-	{
-	    int digit = digitVal[toupper(*s) - '0'];
-	    assert(digit != 100);
-	    if(result < Int64Max / base)
-	    {
-		result *= base;
-		result += digit;
-	    }
-	    else if((digit <= Int64Max % base) || (sign == -1 && digit == Int64Max % base + 1))
-	    {
-		result *= base;
-		result += digit;
-	    }
-	    else
-	    {
-		overflow = true;
-		result = sign == -1 ? Int64Min : Int64Max;
-	    }
-	}
-	++s;
-    }
-
-    if(overflow)
-    {
-	errno = ERANGE;
-    }
-    else
-    {
-	result *= sign;
-    }
-
-    if(endptr)
-    {
-	*endptr = const_cast<char *>(s);
-    }
-
-    return result;
-
+    return _strtoi64(s, endptr, base);
 #elif defined(ICE_64)
     return strtol(s, endptr, base);
 #elif defined(__hpux)
@@ -155,33 +32,13 @@ strToInt64(const char* s, char** endptr, int base)
 }
 
 bool
-stringToInt64(const string& stringToParse, Int64& result, string::size_type& pos)
+stringToInt64(const string& s, Int64& result)
 {
-    string::const_iterator i = stringToParse.begin();
-    while(i != stringToParse.end() && isspace(*i))
-    {
-	++i;
-    }
-    if(i == stringToParse.end())	// String empty or nothing but whitespace
-    {
-	result = 0;
-	pos = string::npos;
-	return false;
-    }
-    string::const_reverse_iterator j = stringToParse.rbegin();
-    while(isspace(*j))
-    {
-	++j;
-    }					// j now points at last non-whitespace char
-
-    string nonWhite(i, j.base());	// nonWhite has trailing whitespace stripped
-
+    const char* start = s.c_str();
+    char* end = 0;
     errno = 0;
-    const char* startp = nonWhite.c_str();
-    char* endp;
-    result = strToInt64(startp, &endp, 0);
-    pos = *endp == '\0' ? string::npos : (i - stringToParse.begin()) + (endp - startp);
-    return startp != endp && errno != ERANGE && errno != EINVAL;
+    result = strToInt64(start, &end, 0);
+    return (errno == 0 && start != end);
 }
 
 }
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 87bc16b3eab..6f4beebf727 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -1235,8 +1235,7 @@ Slice::Python::CodeVisitor::visitConst(const ConstPtr& p)
         case Slice::Builtin::KindLong:
         {
             IceUtil::Int64 l;
-            string::size_type pos;
-            IceUtil::stringToInt64(value, l, pos);
+            IceUtil::stringToInt64(value, l);
             //
             // The platform's 'long' type may not be 64 bits, so we store 64-bit
             // values as a string.
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 561575ff044..101d87e108a 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -318,10 +318,9 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
 {integer_constant} {
     IntegerTokPtr itp = new IntegerTok;
     *yylvalp = itp;
-    errno = 0;
-    itp->v = IceUtil::strToInt64(yytext, 0, 0);
-    if(errno == ERANGE && (itp->v == IceUtil::Int64Min || itp->v == IceUtil::Int64Max))
+    if(!IceUtil::stringToInt64(string(yytext), itp->v))
     {
+	assert(itp->v != 0);
 	string msg = "integer constant `";
 	msg += yytext;
 	msg += "' out of range";