libcore: Minor improvements

New utility method for Record, and cleaning escape sequences out of fatal error messages.
skyjake · Jul 5, 2016 · bf3e332 · bf3e332
1 parent 030a6ea
commit bf3e332
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/doomsday/sdk/libcore/include/de/data/record.h b/doomsday/sdk/libcore/include/de/data/record.h
@@ -383,6 +383,8 @@ class DENG2_PUBLIC Record
 
     Variable &appendUniqueWord(String const &name, String const &word, String const &separator = " ");
 
+    Variable &appendToArray(String const &name, Value *value);
+
     /**
      * Looks up a variable in the record. Variables in subrecords can be accessed
      * using the member notation: <code>subrecord-name.variable-name</code>

diff --git a/doomsday/sdk/libcore/include/de/filesys/package.h b/doomsday/sdk/libcore/include/de/filesys/package.h
@@ -216,6 +216,7 @@ class DENG2_PUBLIC Package : public IObject
     static String const VAR_PACKAGE;
     static String const VAR_PACKAGE_ID;
     static String const VAR_PACKAGE_ALIAS;
+    static String const VAR_PACKAGE_TITLE;
     static String const VAR_TITLE;
 
 private:

diff --git a/doomsday/sdk/libcore/src/core/app.cpp b/doomsday/sdk/libcore/src/core/app.cpp
@@ -27,6 +27,7 @@
 #include "de/Config"
 #include "de/DictionaryValue"
 #include "de/DirectoryFeed"
+#include "de/EscapeParser"
 #include "de/FileLogSink"
 #include "de/LibraryFile"
 #include "de/Log"
@@ -409,7 +410,10 @@ void App::handleUncaughtException(String message)
 {
     LOG_CRITICAL(message);
 
-    if (d->terminateFunc) d->terminateFunc(message.toUtf8().constData());
+    EscapeParser esc;
+    esc.parse(message);
+
+    if (d->terminateFunc) d->terminateFunc(esc.plainText().toUtf8());
 }
 
 bool App::processEvent(Event const &ev)

diff --git a/doomsday/sdk/libcore/src/data/record.cpp b/doomsday/sdk/libcore/src/data/record.cpp
@@ -574,6 +574,19 @@ Variable &Record::appendUniqueWord(String const &name, String const &word, Strin
     return (*this)[name];
 }
 
+Variable &Record::appendToArray(String const &name, Value *value)
+{
+    if (!has(name))
+    {
+        return addArray(name, new ArrayValue({ value }));
+    }
+
+    Variable &var = (*this)[name];
+    DENG2_ASSERT(var.value().is<ArrayValue>());
+    var.value<ArrayValue>().add(value);
+    return var;
+}
+
 Variable &Record::operator [] (String const &name)
 {
     return const_cast<Variable &>((*const_cast<Record const *>(this))[name]);

diff --git a/doomsday/sdk/libcore/src/filesys/package.cpp b/doomsday/sdk/libcore/src/filesys/package.cpp
@@ -32,6 +32,7 @@ namespace de {
 String const Package::VAR_PACKAGE      ("package");
 String const Package::VAR_PACKAGE_ID   ("package.ID");
 String const Package::VAR_PACKAGE_ALIAS("package.alias");
+String const Package::VAR_PACKAGE_TITLE("package.title");
 String const Package::VAR_TITLE        ("title");
 
 static String const PACKAGE_ORDER      ("package.__order__");
@@ -361,16 +362,7 @@ StringList Package::requires(File const &packageFile)
 
 void Package::addRequiredPackage(File &packageFile, String const &id)
 {
-    Record &names = packageFile.objectNamespace();
-
-    if (!names.has(PACKAGE_REQUIRES))
-    {
-        names.addArray(PACKAGE_REQUIRES, new ArrayValue({ new TextValue(id) }));
-    }
-    else
-    {
-        names[PACKAGE_REQUIRES].value<ArrayValue>().add(new TextValue(id));
-    }
+    packageFile.objectNamespace().appendToArray(PACKAGE_REQUIRES, new TextValue(id));
 }
 
 static String stripAfterFirstUnderscore(String str)