* gcc does not like missing characters in keywords

[lyx.git] / src / Lexer.cpp

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 4406d074977dbeb64ec4f02475a2eeb83104443f..e3f1bae89acc46e511f5f83d6780e2c2c2deaae7 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -19,17 +19,13 @@
 
 #include "support/convert.h"
 #include "support/filetools.h"
+#include "support/gzstream.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/types.h"
 #include "support/unicode.h"
 
-#include <boost/iostreams/filtering_streambuf.hpp>
-#include <boost/iostreams/filter/gzip.hpp>
-#include <boost/iostreams/device/file.hpp>
-#include <boost/utility.hpp>
-
-namespace io = boost::iostreams;
+#include <boost/noncopyable.hpp>
 
 #include <functional>
 #include <istream>
@@ -42,7 +38,6 @@ namespace lyx {
 
 using support::compare_ascii_no_case;
 using support::FileName;
-using support::getFormatFromContents;
 using support::isStrDbl;
 using support::isStrInt;
 using support::ltrim;
@@ -110,7 +105,7 @@ public:
        std::filebuf fb_;
 
        /// gz_ is only used to open files, the stream is accessed through is.
-       io::filtering_istreambuf gz_;
+       gz::gzstreambuf gz_;
 
        /// the stream that we use.
        std::istream is;
@@ -257,32 +252,31 @@ void Lexer::Pimpl::popTable()
 bool Lexer::Pimpl::setFile(FileName const & filename)
 {
        // Check the format of the file.
-       string const format = getFormatFromContents(filename);
+       string const format = filename.guessFormatFromContents();
 
        if (format == "gzip" || format == "zip" || format == "compress") {
                LYXERR(Debug::LYXLEX) << "lyxlex: compressed" << endl;
-
                // 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_.empty() || istream::off_type(is.tellg()) > -1)
-                       LYXERR(Debug::LYXLEX) << "Error in Lexer::setFile: "
+               if (gz_.is_open() || istream::off_type(is.tellg()) > -1)
+                       lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
-               gz_.push(io::gzip_decompressor());
-               gz_.push(io::file_source(filename.toFilesystemEncoding()));
+               gz_.open(filename.toFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&gz_);
                name = filename.absFilename();
                lineno = 0;
-               return gz_.component<io::file_source>(1)->is_open() && is.good();
+               return gz_.is_open() && is.good();
        } else {
                LYXERR(Debug::LYXLEX) << "lyxlex: UNcompressed" << endl;
 
                // 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)
+               if (fb_.is_open() || istream::off_type(is.tellg()) > 0) {
                        LYXERR(Debug::LYXLEX) << "Error in Lexer::setFile: "
                                "file or stream already set." << endl;
+               }
                fb_.open(filename.toFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&fb_);
                name = filename.absFilename();
@@ -294,9 +288,10 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
 
 void Lexer::Pimpl::setStream(istream & i)
 {
-       if (fb_.is_open() || istream::off_type(is.tellg()) > 0)
+       if (fb_.is_open() || istream::off_type(is.tellg()) > 0) {
                LYXERR(Debug::LYXLEX)  << "Error in Lexer::setStream: "
                        "file or stream already set." << endl;
+       }
        is.rdbuf(i.rdbuf());
        lineno = 0;
 }
@@ -417,7 +412,7 @@ bool Lexer::Pimpl::next(bool esc /* = false */)
                        c = cc;
 
                        // skip ','s
-                       if (c == ',') 
+                       if (c == ',')
                                continue;
 
                        if (c == commentChar) {
@@ -525,7 +520,7 @@ int Lexer::Pimpl::search_kw(char const * const tag) const
 int Lexer::Pimpl::lex()
 {
        //NOTE: possible bug.
-       if (next() && status == LEX_TOKEN) 
+       if (next() && status == LEX_TOKEN)
                return search_kw(getString().c_str());
        return status;
 }
@@ -619,7 +614,7 @@ bool Lexer::Pimpl::nextToken()
 
 bool Lexer::Pimpl::inputAvailable()
 {
-       return is.good(); 
+       return is.good();
 }
 
 
@@ -771,7 +766,7 @@ string const Lexer::getString() const
 docstring const Lexer::getDocString() const
 {
        lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
-       
+
        if (lastReadOk_)
                return pimpl_->getDocString();