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

Timestamp:

04/26/15 00:59:09 (8 years ago)

Author:

Maciej Komosinski

Message:

Renamed logging functions to more intuitive and simple names

File:

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

cpp/frams/util/extvalue.cpp

@@ -98 +98 @@
         if (warn)
         {
-                Hprintf("ExtValue", "getObjectTarget", HMLV_WARN, "%s object expected, %s found", classname, interfaceName());
+                logPrintf("ExtValue", "getObjectTarget", LOG_WARN, "%s object expected, %s found", classname, interfaceName());
         }
 
@@ -269 +269 @@
                         if (tmp.len() > 30) tmp = tmp.substr(0, 30) + "...";
                         if (type == TString) tmp = SString("\"") + tmp + SString("\"");
-                        Hprintf("ExtValue", "getObjectTarget", HMLV_WARN, "%s object expected, %s found", classname, tmp.c_str());
+                        logPrintf("ExtValue", "getObjectTarget", LOG_WARN, "%s object expected, %s found", classname, tmp.c_str());
                 }
                 return NULL;
@@ -419 +419 @@
                                 context->v2->typeAndValue().c_str());
                 }
-                Hprintf("ExtValue", "interpretCompare", HMLV_ERROR, "%s", msg.c_str());
+                logPrintf("ExtValue", "interpretCompare", LOG_ERROR, "%s", msg.c_str());
                 ret = -1;
         }
@@ -448 +448 @@
                 {
                 case TDouble:
-                        Hprintf("ExtValue", "add", HMLV_WARN, "Adding %s to %s", src.typeAndValue().c_str(), typeAndValue().c_str());
+                        logPrintf("ExtValue", "add", LOG_WARN, "Adding %s to %s", src.typeAndValue().c_str(), typeAndValue().c_str());
                         setDouble(double(getInt()) + src.getDouble());
                         return;
@@ -487 +487 @@
         default:;
         }
-        Hprintf("ExtValue", "add", HMLV_ERROR, "Can't add %s to %s", src.typeAndValue().c_str(), typeAndValue().c_str());
+        logPrintf("ExtValue", "add", LOG_ERROR, "Can't add %s to %s", src.typeAndValue().c_str(), typeAndValue().c_str());
 }
 
@@ -502 +502 @@
                         return;
                 case TDouble:
-                        Hprintf("ExtValue", "subtract", HMLV_WARN, "Subtracting %s from %s", src.typeAndValue().c_str(), typeAndValue().c_str());
+                        logPrintf("ExtValue", "subtract", LOG_WARN, "Subtracting %s from %s", src.typeAndValue().c_str(), typeAndValue().c_str());
                         setDouble(double(getInt()) - src.getDouble());
                         return;
@@ -520 +520 @@
         default:;
         }
-        Hprintf("ExtValue", "subtract", HMLV_ERROR, "Can't subtract %s from %s", src.typeAndValue().c_str(), typeAndValue().c_str());
+        logPrintf("ExtValue", "subtract", LOG_ERROR, "Can't subtract %s from %s", src.typeAndValue().c_str(), typeAndValue().c_str());
 }
 
@@ -535 +535 @@
                         return;
                 case TDouble:
-                        Hprintf("ExtValue", "multiply", HMLV_WARN, "Multiplying %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
+                        logPrintf("ExtValue", "multiply", LOG_WARN, "Multiplying %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
                         setDouble(double(getInt())*src.getDouble());
                         return;
@@ -591 +591 @@
         default:;
         }
-        Hprintf("ExtValue", "multiply", HMLV_WARN, "Can't multiply %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
+        logPrintf("ExtValue", "multiply", LOG_WARN, "Can't multiply %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
 }
 
@@ -611 +611 @@
         else
         {
-                Hprintf("ExtValue", "divide", HMLV_CRITICAL, "Division by zero: %d/0", idata());
+                logPrintf("ExtValue", "divide", LOG_CRITICAL, "Division by zero: %d/0", idata());
                 setInvalid();
         }
@@ -620 +620 @@
         if (a == 0.0)
         {
-                Hprintf("ExtValue", "divide", HMLV_CRITICAL, "Division by zero: %s/0.0", getString().c_str());
+                logPrintf("ExtValue", "divide", LOG_CRITICAL, "Division by zero: %s/0.0", getString().c_str());
                 setInvalid();
         }
@@ -629 +629 @@
                 if (!finite(tmp))
                 {
-                        Hprintf("ExtValue", "divide", HMLV_CRITICAL, "Overflow %s/%g", getString().c_str(), a); setInvalid();
+                        logPrintf("ExtValue", "divide", LOG_CRITICAL, "Overflow %s/%g", getString().c_str(), a); setInvalid();
                 }
                 else
@@ -635 +635 @@
                 // niby dobrze ale lepiej byloby to robic bardziej systematycznie a nie tylko w dzieleniu?
                 //if (isnan(ddata())) //http://www.digitalmars.com/d/archives/c++/Traping_divide_by_zero_5728.html
-                //        { Hprintf("ExtValue","divide",HMLV_ERROR,"not-a-number",(const char*)getString()); setInvalid(); }
+                //        { logPrintf("ExtValue","divide",LOG_ERROR,"not-a-number",(const char*)getString()); setInvalid(); }
                 fpExceptEnable();
         }
@@ -651 +651 @@
                         return;
                 case TDouble:
-                        Hprintf("ExtValue", "divide", HMLV_WARN, "Dividing %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
+                        logPrintf("ExtValue", "divide", LOG_WARN, "Dividing %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
                         divDouble(src.ddata());
                         return;
@@ -673 +673 @@
         default:;
         }
-        Hprintf("ExtValue", "divide", HMLV_ERROR, "Can't divide %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
+        logPrintf("ExtValue", "divide", LOG_ERROR, "Can't divide %s by %s", typeAndValue().c_str(), src.typeAndValue().c_str());
 }
 
@@ -778 +778 @@
 
         case TObj: case TUnknown: case TInvalid:
-                Hprintf("ExtValue", "modulo", HMLV_WARN, "Can't apply modulo to %s", typeDescription().c_str());
+                logPrintf("ExtValue", "modulo", LOG_WARN, "Can't apply modulo to %s", typeDescription().c_str());
 
         default:;
@@ -791 +791 @@
         {
                 if (error)
-                        Hprintf("ExtValue", "parseInt", HMLV_ERROR, "Could not parse '%s'%s", s, strict ? " (strict)" : "");
+                        logPrintf("ExtValue", "parseInt", LOG_ERROR, "Could not parse '%s'%s", s, strict ? " (strict)" : "");
                 return false;
         }
@@ -805 +805 @@
         {
                 if (error)
-                        Hprintf("ExtValue", "parseDouble", HMLV_ERROR, "Could not parse '%s'", s);
+                        logPrintf("ExtValue", "parseDouble", LOG_ERROR, "Could not parse '%s'", s);
                 return false;
         }
@@ -836 +836 @@
         case TString: return getInt(sdata().c_str());
         case TObj:
-                Hprintf("ExtValue", "getInt", HMLV_WARN, "Getting integer value from object reference (%s)", getString().c_str());
+                logPrintf("ExtValue", "getInt", LOG_WARN, "Getting integer value from object reference (%s)", getString().c_str());
                 return (paInt)(intptr_t)odata().param;
         default:;
@@ -851 +851 @@
         case TString: return getDouble(sdata().c_str());
         case TObj:
-                Hprintf("ExtValue", "getDouble", HMLV_WARN, "Getting floating point value from object reference (%s)", getString().c_str());
+                logPrintf("ExtValue", "getDouble", LOG_WARN, "Getting floating point value from object reference (%s)", getString().c_str());
                 return (double)(intptr_t)odata().param;
         default:;
@@ -989 +989 @@
                 else
                 {
-                        Hprintf("ExtValue", "deserialize", HMLV_ERROR, "Missing '\"' in string: '%s'", ret);
+                        logPrintf("ExtValue", "deserialize", LOG_ERROR, "Missing '\"' in string: '%s'", ret);
                         return NULL;
                 }
@@ -1011 +1011 @@
                                 else if (*p != ']')
                                 {
-                                        Hprintf("ExtValue", "deserialize", HMLV_ERROR, "Missing ',' in Vector: '%s'", p);
+                                        logPrintf("ExtValue", "deserialize", LOG_ERROR, "Missing ',' in Vector: '%s'", p);
                                         return NULL;
                                 }
@@ -1037 +1037 @@
                         if ((!ret) || (args[1].getType() != TString)) { p = NULL; break; }
                         p = ret;
-                        if (*p != ':') { Hprintf("ExtValue", "deserialize", HMLV_ERROR, "Missing ':' in Dictionary: '%s'", p); p = NULL; break; }
+                        if (*p != ':') { logPrintf("ExtValue", "deserialize", LOG_ERROR, "Missing ':' in Dictionary: '%s'", p); p = NULL; break; }
                         p++;
                         ret = args[0].deserialize(p);
@@ -1046 +1046 @@
                         else if (*p != '}')
                         {
-                                Hprintf("ExtValue", "deserialize", HMLV_ERROR, "Missing ',' in Dictionary: '%s'", p);
+                                logPrintf("ExtValue", "deserialize", LOG_ERROR, "Missing ',' in Dictionary: '%s'", p);
                                 return NULL;
                         }
@@ -1086 +1086 @@
                         }
                 }
-                Hprintf("ExtValue", "deserialize", HMLV_ERROR, "Invalid reference: '%s'", in - 1);
+                logPrintf("ExtValue", "deserialize", LOG_ERROR, "Invalid reference: '%s'", in - 1);
                 return NULL;
         }
@@ -1133 +1133 @@
                 }
                 setEmpty();
-                Hprintf("ExtValue", "deserialize", HMLV_WARN, "object of class \"%s\" could not be deserialized", clsname.c_str());
+                logPrintf("ExtValue", "deserialize", LOG_WARN, "object of class \"%s\" could not be deserialized", clsname.c_str());
                 return ret;
         }
-        Hprintf("ExtValue", "deserialize", HMLV_ERROR, "Bad syntax: '%s'", in);
+        logPrintf("ExtValue", "deserialize", LOG_ERROR, "Bad syntax: '%s'", in);
         setEmpty();
         return NULL;