Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more error reporting in ToInteger()

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@35316 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com
1999-06-15 02:03:33 +00:00
parent 56837741f7
commit 1e824d81bc
3 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/string/obsolete/nsString2.cpp
View File

@@ -756,7 +756,7 @@ PRInt32 GetNumericSubstring(nsString2& aString,PRUint32& aRadix) {
else if((*cp>='A') && (*cp<='F')) {
continue;
}
else if((*cp>='-') || (*cp>='+')){
else if((*cp=='-') || (*cp=='+')){
break;
}
else {
@@ -794,13 +794,17 @@ PRInt32 nsString2::ToInteger(PRInt32* anErrorCode) const {
********************************************************************************/
//copy chars to local buffer -- step down from 2 bytes to 1 if necessary...
nsAutoString2 theString(*this,eOneByte);
PRUint32 theRadix=10;
PRInt32 result=GetNumericSubstring(theString,theRadix);
PRInt32 result=0;
if(0<mLength) {
nsAutoString2 theString(*this,eOneByte);
PRUint32 theRadix=10;
*anErrorCode=GetNumericSubstring(theString,theRadix);
if(NS_OK==result){
result=_ToInteger(theString,anErrorCode,theRadix);
if(NS_OK==*anErrorCode){
result=_ToInteger(theString,anErrorCode,theRadix);
}
}
else *anErrorCode=NS_ERROR_ILLEGAL_VALUE;
return result;
}
@@ -2175,8 +2179,13 @@ CStringTester::CStringTester() {
//try a few numeric conversion routines...
{
nsString2 str1("10000",theSize);
nsString2 str2("hello");
nsString2 str3;
PRInt32 err;
PRInt32 theInt=str1.ToInteger(&err);
theInt=str2.ToInteger(&err);
theInt=str3.ToInteger(&err);
str1="100.100";
float theFloat=str1.ToFloat(&err);
}

21
mozilla/xpcom/ds/nsString2.cpp
View File

@@ -756,7 +756,7 @@ PRInt32 GetNumericSubstring(nsString2& aString,PRUint32& aRadix) {
else if((*cp>='A') && (*cp<='F')) {
continue;
}
else if((*cp>='-') || (*cp>='+')){
else if((*cp=='-') || (*cp=='+')){
break;
}
else {
@@ -794,13 +794,17 @@ PRInt32 nsString2::ToInteger(PRInt32* anErrorCode) const {
********************************************************************************/
//copy chars to local buffer -- step down from 2 bytes to 1 if necessary...
nsAutoString2 theString(*this,eOneByte);
PRUint32 theRadix=10;
PRInt32 result=GetNumericSubstring(theString,theRadix);
PRInt32 result=0;
if(0<mLength) {
nsAutoString2 theString(*this,eOneByte);
PRUint32 theRadix=10;
*anErrorCode=GetNumericSubstring(theString,theRadix);
if(NS_OK==result){
result=_ToInteger(theString,anErrorCode,theRadix);
if(NS_OK==*anErrorCode){
result=_ToInteger(theString,anErrorCode,theRadix);
}
}
else *anErrorCode=NS_ERROR_ILLEGAL_VALUE;
return result;
}
@@ -2175,8 +2179,13 @@ CStringTester::CStringTester() {
//try a few numeric conversion routines...
{
nsString2 str1("10000",theSize);
nsString2 str2("hello");
nsString2 str3;
PRInt32 err;
PRInt32 theInt=str1.ToInteger(&err);
theInt=str2.ToInteger(&err);
theInt=str3.ToInteger(&err);
str1="100.100";
float theFloat=str1.ToFloat(&err);
}

21
mozilla/xpcom/string/obsolete/nsString2.cpp
View File

@@ -756,7 +756,7 @@ PRInt32 GetNumericSubstring(nsString2& aString,PRUint32& aRadix) {
else if((*cp>='A') && (*cp<='F')) {
continue;
}
else if((*cp>='-') || (*cp>='+')){
else if((*cp=='-') || (*cp=='+')){
break;
}
else {
@@ -794,13 +794,17 @@ PRInt32 nsString2::ToInteger(PRInt32* anErrorCode) const {
********************************************************************************/
//copy chars to local buffer -- step down from 2 bytes to 1 if necessary...
nsAutoString2 theString(*this,eOneByte);
PRUint32 theRadix=10;
PRInt32 result=GetNumericSubstring(theString,theRadix);
PRInt32 result=0;
if(0<mLength) {
nsAutoString2 theString(*this,eOneByte);
PRUint32 theRadix=10;
*anErrorCode=GetNumericSubstring(theString,theRadix);
if(NS_OK==result){
result=_ToInteger(theString,anErrorCode,theRadix);
if(NS_OK==*anErrorCode){
result=_ToInteger(theString,anErrorCode,theRadix);
}
}
else *anErrorCode=NS_ERROR_ILLEGAL_VALUE;
return result;
}
@@ -2175,8 +2179,13 @@ CStringTester::CStringTester() {
//try a few numeric conversion routines...
{
nsString2 str1("10000",theSize);
nsString2 str2("hello");
nsString2 str3;
PRInt32 err;
PRInt32 theInt=str1.ToInteger(&err);
theInt=str2.ToInteger(&err);
theInt=str3.ToInteger(&err);
str1="100.100";
float theFloat=str1.ToFloat(&err);
}