InsetIndex: hide printTree behind a LYX_INSET_INDEX_DEBUG flag

[features.git] / src / Lexer.cpp

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index b11bf4743a549c4044fcd94c288dd25ef178bbc4..c6402aec6f39f69e966b6afe17710d44aebeb5e8 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -14,7 +14,6 @@
 #include <config.h>
 
 #include "Lexer.h"
-#include "Format.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -25,6 +24,7 @@
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 
+#include <algorithm> // sort, lower_bound
 #include <functional>
 #include <fstream>
 #include <istream>
@@ -80,9 +80,6 @@ public:
        bool inputAvailable();
        ///
        void pushToken(string const &);
-       /// fb_ is only used to open files, the stream is accessed through is.
-       filebuf fb_;
-
        /// gz_ is only used to open files, the stream is accessed through is.
        gz::gzstreambuf gz_;
 
@@ -148,7 +145,7 @@ bool compareTags(LexerKeyword const & a, LexerKeyword const & b)
 
 
 Lexer::Pimpl::Pimpl(LexerKeyword * tab, int num)
-       : is(&fb_), table(tab), no_items(num),
+       : is(&gz_), table(tab), no_items(num),
          status(0), lineno(0), commentChar('#')
 {
        verifyTable();
@@ -234,38 +231,14 @@ void Lexer::Pimpl::popTable()
 
 bool Lexer::Pimpl::setFile(FileName const & filename)
 {
-       // Check the format of the file.
-       if (theFormats().isZippedFile(filename)) {
-               LYXERR(Debug::LYXLEX, "lyxlex: compressed");
-               // The check only outputs a debug message, because it triggers
-               // a bug in compaq cxx 6.2, where is_open() returns 'true' for
-               // a fresh new filebuf.  (JMarc)
                if (gz_.is_open() || istream::off_type(is.tellg()) > -1)
-                       LYXERR(Debug::LYXLEX, "Error in LyXLex::setFile: "
-                               "file or stream already set.");
+                       LYXERR0("Error in LyXLex::setFile: file or stream already set.");
                gz_.open(filename.toFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&gz_);
                name = filename.absFileName();
                lineno = 0;
                if (!gz_.is_open() || !is.good())
                        return false;
-       } else {
-               LYXERR(Debug::LYXLEX, "lyxlex: UNcompressed");
-
-               // The check only outputs a debug message, because it triggers
-               // a bug in compaq cxx 6.2, where is_open() returns 'true' for
-               // a fresh new filebuf.  (JMarc)
-               if (fb_.is_open() || istream::off_type(is.tellg()) > 0) {
-                       LYXERR(Debug::LYXLEX, "Error in Lexer::setFile: "
-                               "file or stream already set.");
-               }
-               fb_.open(filename.toSafeFilesystemEncoding().c_str(), ios::in);
-               is.rdbuf(&fb_);
-               name = filename.absFileName();
-               lineno = 0;
-               if (!fb_.is_open() || !is.good())
-                       return false;
-       }
 
        // Skip byte order mark.
        if (is.peek() == 0xef) {
@@ -283,10 +256,8 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
 
 void Lexer::Pimpl::setStream(istream & i)
 {
-       if (fb_.is_open() || istream::off_type(is.tellg()) > 0) {
-               LYXERR(Debug::LYXLEX, "Error in Lexer::setStream: "
-                       "file or stream already set.");
-       }
+       if (gz_.is_open() || istream::off_type(is.tellg()) > 0)
+               LYXERR0("Error in Lexer::setStream: file or stream already set.");
        is.rdbuf(i.rdbuf());
        lineno = 0;
 }
@@ -944,9 +915,9 @@ bool Lexer::checkFor(char const * required)
 }
 
 
-void Lexer::setContext(std::string const & str)
+void Lexer::setContext(std::string const & functionName)
 {
-       pimpl_->context = str;
+       pimpl_->context = functionName;
 }