Revert "WIP: refactor Systemcall"

[features.git] / src / support / debug.cpp

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 6ec52a069c9587148a0f1b430d1748b0cd2e8cf3..29dd9f2076368539fd35a43fca87bbf4eb43be3c 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -47,7 +47,8 @@ DebugErrorItem errorTags[] = {
        { Debug::PARSER,    "parser",    N_("Lyxlex grammar parser")},
        { Debug::LYXRC,     "lyxrc",     N_("Configuration files reading")},
        { Debug::KBMAP,     "kbmap",     N_("Custom keyboard definition")},
-       { Debug::LATEX,     "latex",     N_("LaTeX generation/execution")},
+       { Debug::OUTFILE,   "outfile",   N_("Output source file generation/processing")},
+       { Debug::OUTFILE,   "latex",     N_("Output source file generation/processing (alias to 'outfile')")},
        { Debug::MATHED,    "mathed",    N_("Math editor")},
        { Debug::FONT,      "font",      N_("Font handling")},
        { Debug::TCLASS,    "tclass",    N_("Textclass files reading")},
@@ -70,9 +71,11 @@ DebugErrorItem errorTags[] = {
        { Debug::RTL,       "rtl",       N_("RTL/Bidi")},
        { Debug::LOCALE,    "locale",    N_("Locale/Internationalisation")},
        { Debug::SELECTION, "selection", N_("Selection copy/paste mechanism")},
-       { Debug::FIND,      "find",      N_("Find and replace mechanism")},
+       { Debug::FIND,      "find",      N_("Find and replace mechanism, terse version")},
+       { Debug::FINDVERBOSE,"findverbose", N_("Find and replace mechanism, verbose version")},
        { Debug::DEBUG,     "debug",     N_("Developers' general debug messages")},
-       { Debug::ANY,       "any",       N_("All debugging messages")}
+       { Debug::ANY,       "any",       N_("All debugging messages")},
+       { Debug::ANY,       "all",       N_("All debugging messages (alias to 'all')")}
 };
 
 
@@ -97,9 +100,9 @@ Debug::Type Debug::value(int idx)
 
 string const Debug::description(Debug::Type val)
 {
-       for (int i = 0 ; i < numErrorTags ; ++i) {
-               if (errorTags[i].level == val)
-                       return errorTags[i].desc;
+       for (const auto & errorTag : errorTags) {
+               if (errorTag.level == val)
+                       return errorTag.desc;
        }
        return "unknown level";
 }
@@ -107,14 +110,22 @@ string const Debug::description(Debug::Type val)
 
 string const Debug::name(Debug::Type val)
 {
-       for (int i = 0 ; i < numErrorTags ; ++i) {
-               if (errorTags[i].level == val)
-                       return errorTags[i].name;
+       for (const auto & errorTag : errorTags) {
+               if (errorTag.level == val)
+                       return errorTag.name;
        }
        return "unknown level";
 }
 
 
+string const Debug::realName(int idx)
+{
+       if (idx < numErrorTags)
+               return errorTags[idx].name;
+       return "unknown index";
+}
+
+
 Debug::Type Debug::value(string const & val)
 {
        Type l = Debug::NONE;
@@ -126,33 +137,61 @@ Debug::Type Debug::value(string const & val)
                        break;
                // Is it a number?
                if (isStrInt(tmp))
-                       l |= static_cast<Type>(convert<int>(tmp));
+                       l |= static_cast<Type>(convert<unsigned long long>(tmp));
                else
-               // Search for an explicit name
-               for (int i = 0 ; i < numErrorTags ; ++i)
-                       if (tmp == errorTags[i].name) {
-                               l |= errorTags[i].level;
-                               break;
-                       }
+                       // Search for an explicit name
+                       for (DebugErrorItem const & item : errorTags)
+                               if (tmp == item.name) {
+                                       l |= item.level;
+                                       break;
+                               }
                if (st == string::npos)
-               break;
+                       break;
                v.erase(0, st + 1);
        }
        return l;
 }
 
 
+string Debug::badValue(string const & val)
+{
+       string v = val;
+       while (!v.empty()) {
+               size_t const st = v.find(',');
+               string const tmp = ascii_lowercase(v.substr(0, st));
+               if (tmp.empty())
+                       break;
+               // Is it a number?
+               if (!tmp.empty() && !isStrInt(tmp)) {
+                       // Search for an explicit name
+                       bool found = false;
+                       for (DebugErrorItem const & item : errorTags)
+                               if (tmp == item.name) {
+                                       found = true;
+                                       break;
+                               }
+                       if (!found)
+                               return tmp;
+               }
+               if (st == string::npos)
+                       break;
+               v.erase(0, st + 1);
+       }
+       return empty_string();
+}
+
+
 void Debug::showLevel(ostream & os, Debug::Type level)
 {
        // Show what features are traced
-       for (int i = 0; i < numErrorTags; ++i) {
-               if (errorTags[i].level != Debug::ANY
-                     && errorTags[i].level != Debug::NONE
-                     && errorTags[i].level & level) {
+       for (DebugErrorItem const & item : errorTags) {
+               if (item.level != Debug::ANY
+                     && item.level != Debug::NONE
+                     && item.level & level) {
                        // avoid to_utf8(_(...)) re-entrance problem
-                       docstring const s = _(errorTags[i].desc);
+                       docstring const s = _(item.desc);
                        os << to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
-                                       from_utf8(errorTags[i].name), s))
+                                       from_utf8(item.name), s))
                           << '\n';
                }
        }
@@ -162,10 +201,10 @@ void Debug::showLevel(ostream & os, Debug::Type level)
 
 void Debug::showTags(ostream & os)
 {
-       for (int i = 0; i != numErrorTags ; ++i)
-               os << setw(10) << static_cast<unsigned int>(errorTags[i].level)
-                  << setw(13) << errorTags[i].name
-                  << "  " << to_utf8(_(errorTags[i].desc)) << '\n';
+       for (DebugErrorItem const & item : errorTags)
+               os << setw(12) << static_cast<Debug::base_type>(item.level)
+                  << setw(13) << item.name
+                  << "  " << to_utf8(_(item.desc)) << '\n';
        os.flush();
 }
 
@@ -182,7 +221,7 @@ void LyXErr::enable()
 }
 
 
-bool LyXErr::debugging(Debug::Type t) const
+bool LyXErr::debugging(Debug::base_type t) const
 {
        return (dt_ & t);
 }