X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdebug.cpp;h=3a6f9018feb3926549c5af73e125c406b6279d7f;hb=3f59d7e2cc6a3f9a09631c804b49b6d28e05d857;hp=6f3ce34e09064e94a567db8fc392635d95660626;hpb=12efe108db4fa722c480bee7cb8f65e8303c6901;p=lyx.git

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 6f3ce34e09..3a6f9018fe 100644
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -14,14 +14,16 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/FileName.h"
 #include "support/ProgressInterface.h"
+#include "support/regex.h"
 
 #include <iostream>
 #include <iomanip>
 
+
 using namespace std;
 using namespace lyx::support;
 
@@ -37,7 +39,7 @@ struct ErrorItem {
 
 
 ErrorItem errorTags[] = {
-	{ Debug::NONE,      "none",      N_("No debugging message")},
+	{ Debug::NONE,      "none",      N_("No debugging messages")},
 	{ Debug::INFO,      "info",      N_("General information")},
 	{ Debug::INIT,      "init",      N_("Program initialisation")},
 	{ Debug::KEY,       "key",       N_("Keyboard events handling")},
@@ -79,15 +81,20 @@ int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 } // namespace anon
 
 
-const std::vector<Debug::Type> Debug::levels()
+int Debug::levelCount()
 {
-	std::vector<Debug::Type> vec;
-	for (int i = 0 ; i < numErrorTags ; ++i) {
-		vec.push_back(errorTags[i].level);
-	}
-	return vec;
+	return numErrorTags;
 }
 
+
+Debug::Type Debug::value(int idx)
+{
+	if (idx > 0 && idx < numErrorTags)
+		return errorTags[idx].level;
+	return Debug::NONE;
+}
+
+
 string const Debug::description(Debug::Type val)
 {
 	for (int i = 0 ; i < numErrorTags ; ++i) {
@@ -138,10 +145,10 @@ Debug::Type Debug::value(string const & val)
 void Debug::showLevel(ostream & os, Debug::Type level)
 {
 	// Show what features are traced
-	for (int i = 0; i != numErrorTags; ++i) {
+	for (int i = 0; i < numErrorTags; ++i) {
 		if (errorTags[i].level != Debug::ANY
-		    && errorTags[i].level != Debug::NONE
-		    && errorTags[i].level & level) {
+		      && errorTags[i].level != Debug::NONE
+		      && errorTags[i].level & level) {
 			// avoid to_utf8(_(...)) re-entrance problem
 			docstring const s = _(errorTags[i].desc);
 			os << to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
@@ -177,7 +184,7 @@ void LyXErr::enable()
 
 bool LyXErr::debugging(Debug::Type t) const
 {
-	return (dt & t);
+	return (dt_ & t);
 }
 
 
@@ -185,55 +192,74 @@ void LyXErr::endl()
 {
 	if (enabled_) {
 		stream() << std::endl;
-		if (second_used_)
-			second() << "\n";
+		if (second_enabled_)
+			secondStream() << std::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);
+}
+
+
 // It seems not possible to instantiate operator template out of class body
-#define STREAM_OPERATOR(t)	\
-{\
-	if (l.enabled()){\
-		l.stream() << t;\
-		if (l.second_used()){\
-			l.second() << t;\
-			ProgressInterface::instance()->lyxerrFlush();\
-		}\
-	}\
-	return l;\
+template<class T>
+LyXErr & toStream(LyXErr & l, T t)	
+{
+	if (l.enabled()){
+		l.stream() << t;
+		if (l.secondEnabled()) {
+			l.secondStream() << t;
+			ProgressInterface::instance()->lyxerrFlush();
+		}
+	}
+	return l;
 }
 
 
 LyXErr & operator<<(LyXErr & l, void const * t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, char const * t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, char t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, int t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned int t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, long t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, double t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, string const & t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, docstring const & t)
-STREAM_OPERATOR(to_utf8(t));
+{ return toStream(l, to_utf8(t)); }
 LyXErr & operator<<(LyXErr & l, FileName const & t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, ostream &(*t)(ostream &))
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, ios_base &(*t)(ios_base &))
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 
 
 // The global instance
 LyXErr lyxerr;
 
+
+
 } // namespace lyx