Changeset 326 for cpp/frams/util

Timestamp:

02/06/15 00:15:08 (10 years ago)

Author:

Maciej Komosinski

Message:

Unified parsing of ints and floats; hex notation

Location:

cpp/frams/util

Files:

• extvalue.cpp (modified) (4 diffs)
• extvalue.h (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -610 +610 @@
 }
 
-bool ExtValue::parseInt(const char* s, paInt &result, bool strict)
+bool ExtValue::parseInt(const char* s, paInt &result, bool strict, bool error)
 {
         ExtValue tmp;
         const char* after = tmp.parseNumber(s, strict ? TInt : TUnknown);
-        if (after == NULL) return false;
-        if (after[0] != 0) return false;
+        if ((after == NULL) || (after[0] != 0))
+                {
+                if (error) 
+                        FMprintf("ExtValue", "parseInt", FMLV_ERROR, "Could not parse '%s'%s", s, strict?" (strict)":"");
+                return false;
+                }
         result = tmp.getInt();
         return true;
 }
 
-bool ExtValue::parseDouble(const char* s, double &result)
+bool ExtValue::parseDouble(const char* s, double &result, bool error)
 {
         ExtValue tmp;
         const char* after = tmp.parseNumber(s, TDouble);
-        if (after == NULL) return false;
-        if (after[0] != 0) return false;
+        if ((after == NULL) || (after[0] != 0))
+                {
+                if (error) 
+                        FMprintf("ExtValue", "parseDouble", FMLV_ERROR, "Could not parse '%s'", s);
+                return false;
+                }
         result = tmp.getDouble();
         return true;
@@ -633 +641 @@
 {
         paInt result;
-        if (parseInt(s, result, strict))
+        if (parseInt(s, result, strict, true))
                 return result;
-        FMprintf("ExtValue", "getInt", FMLV_ERROR, "Could not parse '%s'%s", s, strict?" (strict)":"");
         return 0;
 }
@@ -642 +649 @@
 {
         double result;
-        if (parseDouble(s, result))
+        if (parseDouble(s, result, true))
                 return result;
-        FMprintf("ExtValue", "getDouble", FMLV_ERROR, "Could not parse '%s'", s);
         return 0;
 }
@@ -729 +735 @@
         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;
+        bool minus = (in[0] == '-');
+        bool plus = (in[0] == '+');
+        if (((in[0] == '0') && ((in[1] == 'x') || (in[1]=='X')))
+             || (((minus || plus) && (in[1] == '0') && ((in[2] == 'x') || (in[2] == 'X')))))
+        {
+                in += (minus || plus) ? 3 : 2;
                 if (isspace(*in)) return NULL;
                 errno = 0;

cpp/frams/util/extvalue.h

@@ -160 +160 @@
         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 bool parseInt(const char* s, paInt &result, bool strict = false);
-        static bool parseDouble(const char* s, double &result);
+        static bool parseInt(const char* s, paInt &result, bool strict, bool error);
+        static bool parseDouble(const char* s, double &result, bool error);
         static paInt getInt(const char* s, bool strict = false);//< @param strict=true will fail on floating point
         static double getDouble(const char* s);