The Gtk patch.

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 0e1b1f265cae2593985b97b5080238707be13d56..c7acd92e7901f88a8d446e1bb9c05cc9e3d13131 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,42 +1,33 @@
 // -*- C++ -*-
+/**
+ * \file lyxlex_pimpl.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYXLEX_PIMPL_H
 #define LYXLEX_PIMPL_H
 
-#include <fstream>
-
 #include "lyxlex.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "support/gzstream.h"
+
+#include <boost/utility.hpp>
+
+#include <fstream>
+#include <stack>
+#include <vector>
 
 ///
-struct LyXLex::Pimpl {
-       ///
-       enum {
-               ///
-               LEX_MAX_BUFF = 2048
-       };
-       
-       ///
-       struct pushed_table {
-               ///
-               pushed_table(){
-                       next = 0;
-                       table_elem = 0;
-               }
-               ///
-               pushed_table * next;
-               ///
-               keyword_item * table_elem;
-               ///
-               int table_siz;
-       };
+struct LyXLex::Pimpl : boost::noncopyable {
        ///
        Pimpl(keyword_item * tab, int num);
        ///
-       string GetString() const;
+       string const getString() const;
        ///
        void printError(string const & message) const;
        ///
@@ -50,37 +41,59 @@ struct LyXLex::Pimpl {
        ///
        void setStream(std::istream & i);
        ///
+       void setCommentChar(char c);
+       ///
        bool next(bool esc = false);
        ///
        int search_kw(char const * const tag) const;
        ///
        int lex();
        ///
-       bool EatLine();
+       bool eatLine();
        ///
        bool nextToken();
        ///
        void pushToken(string const &);
-
-       /// fb__ is only used to open files, the stream is accessed through is
+       /// fb__ is only used to open files, the stream is accessed through is.
        std::filebuf fb__;
+       /// gz__ is only used to open files, the stream is accessed through is.
+       gz::gzstreambuf gz__;
+
        /// the stream that we use.
        std::istream is;
-       /// 
+       ///
        string name;
        ///
        keyword_item * table;
        ///
        int no_items;
        ///
-       char buff[LEX_MAX_BUFF];
-       ///
-       short status;
+       std::vector<char> buff;
        ///
-       pushed_table * pushed;
+       int status;
        ///
        int lineno;
        ///
        string pushTok;
+       ///
+       char commentChar;
+private:
+       ///
+       void verifyTable();
+       ///
+       struct pushed_table {
+               ///
+               pushed_table()
+                       : table_elem(0), table_siz(0) {}
+               ///
+               pushed_table(keyword_item * ki, int siz)
+                       : table_elem(ki), table_siz(siz) {}
+               ///
+               keyword_item * table_elem;
+               ///
+               int table_siz;
+       };
+       ///
+       std::stack<pushed_table> pushed;
 };
 #endif