Let paragraph::requestSpellcheck() consider contained insets

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

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 3a6f9018feb3926549c5af73e125c406b6279d7f..ca14220cfcb1997c547a05438123ced165c357c3 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -12,13 +12,13 @@
 
 #include <config.h>
 
-#include "support/convert.h"
 #include "support/debug.h"
+
+#include "support/convert.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/ProgressInterface.h"
-#include "support/regex.h"
 
 #include <iostream>
 #include <iomanip>
@@ -31,14 +31,14 @@ namespace lyx {
 
 namespace {
 
-struct ErrorItem {
+struct DebugErrorItem {
        Debug::Type level;
        char const * name;
        char const * desc;
 };
 
 
-ErrorItem errorTags[] = {
+DebugErrorItem errorTags[] = {
        { Debug::NONE,      "none",      N_("No debugging messages")},
        { Debug::INFO,      "info",      N_("General information")},
        { Debug::INIT,      "init",      N_("Program initialisation")},
@@ -60,7 +60,7 @@ ErrorItem errorTags[] = {
        { Debug::INSETS,    "insets",    N_("LyX Insets")},
        { Debug::FILES,     "files",     N_("Files used by LyX")},
        { Debug::WORKAREA,  "workarea",  N_("Workarea events")},
-       { Debug::INSETTEXT, "insettext", N_("Insettext/tabular messages")},
+       { Debug::CLIPBOARD, "clipboard", N_("Clipboard handling")},
        { Debug::GRAPHICS,  "graphics",  N_("Graphics conversion and loading")},
        { Debug::CHANGES,   "changes",   N_("Change tracking")},
        { Debug::EXTERNAL,  "external",  N_("External template/inset messages")},
@@ -72,13 +72,14 @@ ErrorItem errorTags[] = {
        { Debug::SELECTION, "selection", N_("Selection copy/paste mechanism")},
        { Debug::FIND,      "find",      N_("Find and replace mechanism")},
        { 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")}
 };
 
 
 int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 
-} // namespace anon
+} // namespace
 
 
 int Debug::levelCount()
@@ -128,31 +129,59 @@ Debug::Type Debug::value(string const & val)
                if (isStrInt(tmp))
                        l |= static_cast<Type>(convert<int>(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 +191,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(10) << static_cast<unsigned int>(item.level)
+                  << setw(13) << item.name
+                  << "  " << to_utf8(_(item.desc)) << '\n';
        os.flush();
 }
 
@@ -201,22 +230,20 @@ void LyXErr::endl()
 char const * LyXErr::stripName(char const * n)
 {
        string const name = n;
-       // find the last occurence of /src/ in name
-       static regex re("[\\/]src[\\/]");
-       string::const_iterator const begin = name.begin();
-       string::const_iterator it = begin;
-       string::const_iterator const end = name.end();
-       smatch results;
-       while (regex_search(it, end, results, re)) {
-               it = results[0].second;
-       }
-       return n + std::distance(begin, it);
+       // find the last occurrence of /src/ in name
+       size_t pos = name.rfind("/src/");
+       if (pos == string::npos)
+               pos = name.rfind("\\src\\");
+       if (pos == string::npos)
+               return n;
+       else
+               return n + pos + 5;
 }
 
 
 // It seems not possible to instantiate operator template out of class body
 template<class T>
-LyXErr & toStream(LyXErr & l, T t)     
+LyXErr & toStream(LyXErr & l, T t)
 {
        if (l.enabled()){
                l.stream() << t;
@@ -243,6 +270,12 @@ LyXErr & operator<<(LyXErr & l, long t)
 { return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
 { return toStream(l, t); }
+#ifdef HAVE_LONG_LONG_INT
+LyXErr & operator<<(LyXErr & l, long long t)
+{ return toStream(l, t); }
+LyXErr & operator<<(LyXErr & l, unsigned long long t)
+{ return toStream(l, t); }
+#endif
 LyXErr & operator<<(LyXErr & l, double t)
 { return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, string const & t)