two patches from john

[lyx.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index a6495f33fd3f4f8f7c23aa8f238a221972ef1321..38c0b7e3df2514c91b5252a2ff7e3592c97f4b27 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,8 +1,23 @@
 // -*- C++ -*-
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
 
 #ifndef LYXDEBUG_H
 #define LYXDEBUG_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include <iosfwd>
+
 #include "LString.h"
 
 /** Ideally this should have been a namespace, but since we try to be
@@ -21,7 +36,7 @@ struct Debug {
                ///
                KEY        = (1 << 2),   // 4
                ///
-               TOOLBAR    = (1 << 3),   // 8
+               GUI        = (1 << 3),   // 8
                ///
                PARSER     = (1 << 4),   // 16
                ///
@@ -41,54 +56,55 @@ struct Debug {
                ///
                LYXSERVER  = (1 << 12),  // 4096
                ///
-               ROFF       = (1 << 13) 
+               ROFF       = (1 << 13),  // 8192
+               ///
+               ACTION     = (1 << 14),   // 16384
+               ///
+               LYXLEX     = (1 << 15),
+               ///
+               DEPEND     = (1 << 16),
+               ///
+               INSETS     = (1 << 17),
+               ///
+               FILES      = (1 << 18),
+               ///
+               WORKAREA   = (1 << 19),
+               ///
+               INSETTEXT  = (1 << 20)
        };
        ///
-       static const type ANY = type(INFO | INIT | KEY | TOOLBAR |
-                                    PARSER | LYXRC | KBMAP | LATEX |
-                                    MATHED | FONT | TCLASS | LYXVC |
-                                    LYXSERVER | ROFF);
+       static type const ANY;
 
        /** A function to convert symbolic string names on debug levels
            to their numerical value.
        */
-       static Debug::type value(string const & val) {
-               int l = Debug::NONE;
-               string v(val);
-               while (!v.empty()) {
-                       string::size_type st = v.find(',');
-                       string tmp(v.substr(0, st));
-                       if (tmp.empty()) break;
-                       if (val == "NONE") l |= Debug::NONE;
-                       else if (val == "INFO") l |= Debug::INFO;
-                       else if (val == "INIT") l |= Debug::INIT;
-                       else if (val == "KEY") l |= Debug::KEY; 
-                       else if (val == "TOOLBAR") l |= Debug::TOOLBAR;
-                       else if (val == "PARSER") l |= Debug::PARSER; 
-                       else if (val == "LYXRC") l |= Debug::LYXRC; 
-                       else if (val == "KBMAP") l |= Debug::KBMAP;  
-                       else if (val == "LATEX") l |= Debug::LATEX;  
-                       else if (val == "MATHED") l |= Debug::MATHED; 
-                       else if (val == "FONT") l |= Debug::FONT;   
-                       else if (val == "TCLASS") l |= Debug::TCLASS; 
-                       else if (val == "LYXVC") l |= Debug::LYXVC;  
-                       else if (val == "LYXSERVER") l |= Debug::LYXSERVER;
-                       else if (val == "ROFF") l |= Debug::ROFF;
-                       else break; // unknown string
-                       if (st == string::npos) break;
-                       v.erase(0, st + 1);
-               }
-               return Debug::type(l);
-       }
+       static Debug::type value(string const & val); 
+
+       /** Display the tags and descriptions of the current debug level 
+           of ds 
+       */
+       static void showLevel(std::ostream & o, type level);
+
+       /** show all the possible tags that can be used for debugging */
+       static void showTags(std::ostream & o);
+
 };
 
-///
-ostream & operator<<(ostream & o, Debug::type t);
+
+
+inline
+void operator|=(Debug::type & d1, Debug::type d2)
+{
+       d1 = static_cast<Debug::type>(d1 | d2);
+}
+
 
 #include "support/DebugStream.h"
 
-extern DebugStream lyxerr;
 
-#endif
 
+std::ostream & operator<<(std::ostream & o, Debug::type t);
 
+extern DebugStream lyxerr;
+
+#endif