Changeset 144 for cpp/frams/util

Timestamp:

02/26/14 20:04:49 (11 years ago)

Author:

sz

Message:

Param and ExtValue? improvements (better control on conversions, "load" returns the number of loaded fields)

Location:

cpp/frams/util

Files:

• extvalue.cpp (modified) (4 diffs)
• extvalue.h (modified) (2 diffs)

cpp/frams/util/extvalue.cpp

@@ -250 +250 @@
 }
 
+static long compareNull(const ExtValue& v)
+{
+switch(v.type)
+        {
+        case TDouble: return v.getDouble()!=0.0;
+        case TInt: return v.getInt()?1:0;
+        case TString: return 1;
+        default: return !v.isNull();
+        }
+}
+
 long ExtValue::compare(const ExtValue& src) const
 {
 if (type==TUnknown)
-        {
-        if (src.type==TDouble)
-                return (src.getDouble()!=0.0);
-        if (src.type==TString)
-                return 1;
-        return src.getInt()?1:0;
-        }
+        return compareNull(src);
 else if (src.type==TUnknown)
-        {
-        if (type==TDouble)
-                return (getDouble()!=0.0);
-        if (type==TString)
-                return 1;
-        return getInt()?1:0;
-        }
+        return compareNull(*this);
 switch(type)
         {
@@ -545 +544 @@
 }
 
+long ExtValue::getInt(const char* s)
+{
+if ((s[0]=='0')&&(s[1]=='x'))
+        {
+        long val;
+        sscanf(s+2,"%lx",&val);
+        return val;
+        }
+else
+        {
+        if (strchr(s,'e')||(strchr(s,'E')))
+                return (long)atof(s);
+        else
+                return atol(s);
+        }
+}
+
+double ExtValue::getDouble(const char* s)
+{
+if ((s[0]=='0')&&(s[1]=='x'))
+        {
+        long val;
+        sscanf(s+2,"%lx",&val);
+        return val;
+        }
+else
+        return atof(s);
+}
+
 long ExtValue::getInt() const
 {
@@ -551 +579 @@
         case TInt: return idata();
         case TDouble: return (int)ddata();
-        case TString:
-        {
-        const char* s=(const char*)sdata();
-        if ((s[0]=='0')&&(s[1]=='x'))
-                {
-                long val;
-                sscanf(s+2,"%lx",&val);
-                return val;
-                }
-        else
-                {
-                if (strchr(s,'e')||(strchr(s,'E')))
-                        return (long)atof(s);
-                else
-                        return atol(s);
-                }
-        }
-        case TObj: return (long)odata().param;
+        case TString: return getInt((const char*)sdata());
+        case TObj:
+                FMprintf("ExtValue","getInt",FMLV_WARN,"Getting integer value from object reference (%s)",(const char*)getString());
+                return (long)odata().param;
         default:;
         }
 return 0;
 }
+
 double ExtValue::getDouble() const
 {
@@ -579 +594 @@
         case TDouble: return ddata();
         case TInt: return (double)idata();
-        case TString:
-        {
-        const char* s=(const char*)sdata();
-        if ((s[0]=='0')&&(s[1]=='x'))
-                {
-                long val;
-                sscanf(s+2,"%lx",&val);
-                return val;
-                }
-        else
-                return atof(s);
-        }
-        case TObj: return (double)(long)odata().param;
+        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());
+                return (double)(long)odata().param;
         default:;
         }

cpp/frams/util/extvalue.h

@@ -147 +147 @@
 void setString(const SString &v) {if (type!=TString) setrs(v); else sdata()=v;}
 void setObject(const ExtObject &src) {if (type!=TObj) setro(src); else odata()=src;}
+static long getInt(const char* s);
+static double getDouble(const char* s);
 long getInt() const;
 double getDouble() const;
@@ -153 +155 @@
 SString serialize() const;
 ExtObject getObject() const;
+bool isNull() const {return (type==TUnknown)||((type==TObj)&&odata().isEmpty());}
 const char* parseNumber(const char* in);
 const char* deserialize(const char* in);//< @return first character after the succesfully parsed string or NULL if failed