Changeset 325 for cpp/frams/util/extvalue.cpp

Timestamp:

02/05/15 00:26:20 (9 years ago)

Author:

Maciej Komosinski

Message:

More strict parsing of int and float numbers from string

File:

• cpp/frams/util/extvalue.cpp (modified) (7 diffs)

cpp/frams/util/extvalue.cpp

@@ -12 +12 @@
 #include <common/nonstd_math.h>
 #include <common/Convert.h>
+#include <climits>
 
 #ifndef NO_BARRIER
@@ -609 +610 @@
 }
 
-paInt ExtValue::getInt(const char* s)
-{
-if ((s[0]=='0')&&(s[1]=='x'))
-        {
-        paInt val;
-        sscanf(s+2,PA_INT_SCANF_X,&val);
-        return val;
-        }
-else
-        {
-        if (strchr(s,'e')||(strchr(s,'E')))
-                return (paInt)atof(s);
-        else
-                return atoi(s);
-        }
+bool ExtValue::parseInt(const char* s, paInt &result, bool strict)
+{
+        ExtValue tmp;
+        const char* after = tmp.parseNumber(s, strict ? TInt : TUnknown);
+        if (after == NULL) return false;
+        if (after[0] != 0) return false;
+        result = tmp.getInt();
+        return true;
+}
+
+bool ExtValue::parseDouble(const char* s, double &result)
+{
+        ExtValue tmp;
+        const char* after = tmp.parseNumber(s, TDouble);
+        if (after == NULL) return false;
+        if (after[0] != 0) return false;
+        result = tmp.getDouble();
+        return true;
+}
+
+paInt ExtValue::getInt(const char* s,bool strict)
+{
+        paInt result;
+        if (parseInt(s, result, strict))
+                return result;
+        FMprintf("ExtValue", "getInt", FMLV_ERROR, "Could not parse '%s'%s", s, strict?" (strict)":"");
+        return 0;
 }
 
 double ExtValue::getDouble(const char* s)
 {
-if ((s[0]=='0')&&(s[1]=='x'))
-        {
-        paInt val;
-        sscanf(s+2,PA_INT_SCANF_X,&val);
-        return val;
-        }
-else
-        return atof(s);
+        double result;
+        if (parseDouble(s, result))
+                return result;
+        FMprintf("ExtValue", "getDouble", FMLV_ERROR, "Could not parse '%s'", s);
+        return 0;
 }
 
 paInt ExtValue::getInt() const
 {
-switch(type)
+        switch (type)
         {
         case TInt: return idata();
@@ -646 +656 @@
         case TString: return getInt((const char*)sdata());
         case TObj:
-                FMprintf("ExtValue","getInt",FMLV_WARN,"Getting integer value from object reference (%s)",(const char*)getString());
+                FMprintf("ExtValue", "getInt", FMLV_WARN, "Getting integer value from object reference (%s)", (const char*)getString());
                 return (paInt)(intptr_t)odata().param;
         default:;
         }
-return 0;
+        return 0;
 }
 
 double ExtValue::getDouble() const
 {
-switch(type)
+        switch (type)
         {
         case TDouble: return ddata();
@@ -661 +671 @@
         case TString: return getDouble((const char*)sdata());
         case TObj:
-                FMprintf("ExtValue","getDouble",FMLV_WARN,"Getting floating point value from object reference (%s)",(const char*)getString());
+                FMprintf("ExtValue", "getDouble", FMLV_WARN, "Getting floating point value from object reference (%s)", (const char*)getString());
                 return (double)(intptr_t)odata().param;
         default:;
         }
-return 0.0;
-}
+        return 0.0;
+}
+
 SString ExtValue::getString() const
 {
-switch(type)
+        switch (type)
         {
         case TString: return sdata();
@@ -682 +693 @@
 const SString* ExtValue::getStringPtr() const
 {
-if (type==TString)
-        return &sdata();
-return NULL;
+        if (type == TString)
+                return &sdata();
+        return NULL;
 }
 
@@ -710 +721 @@
 }
 
-//returns the first character after the parsed number or NULL if not a number
-const char* ExtValue::parseNumber(const char* in)
-{
-if (isdigit(*in)||((*in=='-')&&(isdigit(in[1]))))
-        {
-        const char* p=in;
-        if (*p=='-') p++;
-        while(isdigit(*p)) p++;
-        bool fp=false;
-        if ((*p=='.') && isdigit(p[1]))
-                {
-                p++;
-                while(isdigit(*p)) p++;
-                fp=true;
-                }
-        if (((*p=='e')||(*p=='E')) && (isdigit(p[1]) || (((p[1]=='-') || (p[1]=='+')) && isdigit(p[2]))))
-                {
-                p++;
-                if ((*p=='-')||(*p=='+')) p++;
-                while(isdigit(*p)) p++;
-                fp=true;
-                }
-
-        if (fp)
-                {
-                setDouble(atof(in));
-                return p;
-                }
-        else
-                {
-                setInt(atoi(in));
-                return p;
-                }
-        }
-return NULL;
+/// returns the first character after the parsed number, or NULL if not a number
+/// @param strict_type = restrict the allowed return value (TUnknown = unrestricted)
+const char* ExtValue::parseNumber(const char* in, ExtPType strict_type)
+{
+        char* after;
+        if (in == NULL) return NULL;
+        if (in[0] == 0) return NULL;
+        while (isspace(*in)) in++;
+        bool minus = false;
+        if (((in[0] == '0') && (in[1] == 'x'))
+                || (((minus = (in[0] == '-')) && (in[1] == '0') && (in[2] == 'x'))))
+        {
+                in += minus ? 3 : 2;
+                if (isspace(*in)) return NULL;
+                errno = 0;
+                unsigned long intvalue = strtoul(in, &after, 16);
+                if ((after > in) && (errno == 0) && (intvalue <= 0xffffffff))
+                {
+                        if (strict_type == TDouble)
+                                setDouble(minus ? -(double)intvalue : (double)intvalue);
+                        else
+                                setInt(minus ? -intvalue : intvalue);
+                        return after;
+                }
+                else
+                        return NULL;
+        }
+
+        errno = 0;
+        double fpvalue = strtod(in, &after);
+        if ((after > in) && (errno == 0))
+        {
+                if (strict_type != TDouble)
+                {
+                        if ((memchr(in, '.', after - in) == NULL) && (memchr(in, 'e', after - in) == NULL) && (memchr(in, 'E', after - in) == NULL) // no "special" characters
+                                && (fpvalue == floor(fpvalue)) // value is integer
+                                && (fpvalue >= INT_MIN) && (fpvalue <= INT_MAX)) // within limits
+                        {
+                                setInt(fpvalue);
+                                return after;
+                        }
+                        else if (strict_type == TInt)
+                                return NULL;
+                }
+                setDouble(fpvalue);
+                return after;
+        }
+        return NULL;
 }
 
@@ -858 +882 @@
         in++;
         ExtValue ref;
-        ret=ref.parseNumber(in);
+        ret=ref.parseNumber(in,TInt);
         if (ret && (ref.getType()==TInt))
                 {