Changeset 786 for cpp/frams/param/param.h

Timestamp:

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

Author:

Maciej Komosinski

Message:

Improved shortening of long stringified values in error messages

File:

• cpp/frams/param/param.h (modified) (2 diffs)

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()
+                                );
                 }
         }