Changeset 478 for cpp/frams/util

Timestamp:

03/22/16 01:19:47 (9 years ago)

Author:

Maciej Komosinski

Message:

Accessing const objects, short -> paInt, less critical messages when not necessary, accessing dictionaries with "->"

Location:

cpp/frams/util

Files:

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

cpp/frams/util/extvalue.cpp

@@ -104 +104 @@
 }
 
+bool ExtObject::callDelegate(const char* delegate,ExtValue *args,ExtValue *ret)
+{
+Param tmp;
+ParamInterface *pi=getParamInterface(tmp);
+if (pi)
+        {
+        int f=pi->findId(delegate);
+        if (f>=0)
+                {
+                pi->call(f,args,ret);
+                return true;
+                }
+        }
+logPrintf("Genotype","get", LOG_ERROR, "Could not call delegate '%s.%s'", pi?pi->getName():"NULL",delegate);
+return false;
+}
 
 SString ExtObject::toString() const
@@ -644 +660 @@
         else
         {
-                logPrintf("ExtValue", "divide", LOG_CRITICAL, "Division by zero: %d/0", idata());
+                logPrintf("ExtValue", "divide", LOG_ERROR, "Division by zero: %d/0", idata());
                 setInvalid();
         }
@@ -653 +669 @@
         if (a == 0.0)
         {
-                logPrintf("ExtValue", "divide", LOG_CRITICAL, "Division by zero: %s/0.0", getString().c_str());
+                logPrintf("ExtValue", "divide", LOG_ERROR, "Division by zero: %s/0.0", getString().c_str());
                 setInvalid();
         }
@@ -662 +678 @@
                 if (!finite(tmp))
                 {
-                        logPrintf("ExtValue", "divide", LOG_CRITICAL, "Overflow %s/%g", getString().c_str(), a); setInvalid();
+                        logPrintf("ExtValue", "divide", LOG_ERROR, "Overflow %s/%g", getString().c_str(), a); setInvalid();
                 }
                 else
@@ -868 +884 @@
         case TString: return getInt(sdata().c_str());
         case TObj:
-                logPrintf("ExtValue", "getInt", LOG_WARN, "Getting integer value from object reference (%s)", getString().c_str());
+                logPrintf("ExtValue", "getInt", LOG_ERROR, "Getting integer value from object reference (%s)", getString().c_str());
                 return (paInt)(intptr_t)odata().param;
         default:;
@@ -883 +899 @@
         case TString: return getDouble(sdata().c_str());
         case TObj:
-                logPrintf("ExtValue", "getDouble", LOG_WARN, "Getting floating point value from object reference (%s)", getString().c_str());
+                logPrintf("ExtValue", "getDouble", LOG_ERROR, "Getting floating point value from object reference (%s)", getString().c_str());
                 return (double)(intptr_t)odata().param;
         default:;

cpp/frams/util/extvalue.h

@@ -67 +67 @@
         void* getTarget() const { return (subtype & 1) ? dbobject : object; }
         void* getTarget(const char* classname, bool through_barrier = true, bool warn = true) const;
+        bool callDelegate(const char* delegate,ExtValue *args,ExtValue *ret);
         void setEmpty() { decref(); subtype = 0; param = NULL; object = NULL; }
         int isEmpty() const { return !param; }