Changeset 786 for cpp/frams

Timestamp:

05/21/18 14:01:14 (7 years ago)

Author:

Maciej Komosinski

Message:

Improved shortening of long stringified values in error messages

Location:

cpp/frams

Files:

• param/param.h (modified) (2 diffs)
• util/extvalue.cpp (modified) (1 diff)
• util/sstringutils.cpp (modified) (1 diff)
• util/sstringutils.h (modified) (1 diff)

cpp/frams/param/param.h

@@ -252 +252 @@
 };
 
+template<typename T> struct quote_in_messages { constexpr static const char* value = "'"; };
+template<> struct quote_in_messages < SString > { constexpr static const char* value = "\""; };
+template<typename T> struct length_in_messages { static const bool value = false; };
+template<> struct length_in_messages < SString > { static const bool value = true; };
+
 class SimpleAbstractParam : public virtual ParamInterface
 {
@@ -298 +303 @@
                         SString actual = get(i);
                         bool s_type = type(i)[0] == 's';
-                        logPrintf("Param", "set", LOG_WARN, "Setting '%s.%s = %s' exceeded allowed range (too %s). %s to %s.",
-                                getName(), id(i), sstringShorten(svaluetoset, 30).c_str(), (setflags&PSET_HITMAX) ? (s_type ? "long" : "big") : "small", s_type ? "Truncated" : "Adjusted", sstringShorten(actual, 30).c_str());
+                        logPrintf("Param", "set", LOG_WARN, "Setting %s.%s = %s exceeded allowed range (too %s). %s to %s.",
+                                getName(), id(i),
+                                ::sstringDelimitAndShorten(svaluetoset, 30, length_in_messages<T>::value, quote_in_messages<T>::value, quote_in_messages<T>::value).c_str(),
+                                (setflags&PSET_HITMAX) ? (s_type ? "long" : "big") : "small", s_type ? "Truncated" : "Adjusted",
+                                ::sstringDelimitAndShorten(actual, 30, length_in_messages<T>::value, quote_in_messages<T>::value, quote_in_messages<T>::value).c_str()
+                                );
                 }
         }

cpp/frams/util/extvalue.cpp

@@ -305 +305 @@
 {
         SString msg = typeDescription();
+        SString delimit("'");
         switch (type)
         {
-        case TInt: case TDouble: case TString: case TObj:
-                msg += " '";
-                msg += sstringShorten(getString(), 30);
-                msg += "'";
+        case TString:
+                delimit = "\"";
+        case TInt: case TDouble: case TObj:
+                msg += " ";
+                msg += sstringDelimitAndShorten(getString(), 50, (type == TString), delimit, delimit);
         default:;
         }

cpp/frams/util/sstringutils.cpp

@@ -157 +157 @@
 }
 
-SString sstringShorten(const SString &in, int maxlen)
+SString sstringDelimitAndShorten(const SString &in, int maxlen, bool show_length, const SString& before, const SString& after)
 {
         SString out;
         if (in.len() > maxlen)
-                out = in.substr(0, maxlen / 2) + "..." + in.substr(in.len() - maxlen + maxlen / 2) + SString::sprintf(" (length %d)", in.len());
+                out = in.substr(0, maxlen / 2) + "..." + in.substr(in.len() - maxlen + maxlen / 2);
         else
-                out = in;
+        {
+                out = in; show_length = false;
+        }
         sstringQuote(out);
+        out = before + out + after;
+        if (show_length)
+                out += SString::sprintf(" (length %d)", in.len());
         return out;
 }

cpp/frams/util/sstringutils.h

@@ -19 +19 @@
 bool strContainsOneOf(const char* str, const char* chars);
 bool sstringQuote(SString& target);
-SString sstringShorten(const SString &in, int maxlen);
+SString sstringDelimitAndShorten(const SString &in, int maxlen, bool show_length, const SString& before, const SString& after);
 const char* skipQuoteString(const char* txt, const char* limit);
 int sstringUnquote(SString &target);