X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=a5cb4a9d78e9e3ccf908cf9c643374386905d289;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=0e1b1f265cae2593985b97b5080238707be13d56;hpb=7110b8eda4ab2dc3e87c53c89225caaff972f9eb;p=lyx.git

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 0e1b1f265c..a5cb4a9d78 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,44 +1,47 @@
 // -*- 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 "lyxlex.h"
+
+#include "support/types.h"
+
+# include <boost/iostreams/filtering_streambuf.hpp>
+# include <boost/iostreams/filter/gzip.hpp>
+# include <boost/iostreams/device/file.hpp>
+namespace io = boost::iostreams;
+
+#include <boost/utility.hpp>
+
 #include <fstream>
+#include <istream>
+#include <stack>
+#include <vector>
 
-#include "lyxlex.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+namespace lyx {
 
 ///
-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;
-	};
+class LyXLex::Pimpl : boost::noncopyable {
+public:
 	///
 	Pimpl(keyword_item * tab, int num);
 	///
-	string GetString() const;
+	std::string const getString() const;
 	///
-	void printError(string const & message) const;
+	docstring const getDocString() const;
+	///
+	void printError(std::string const & message) const;
 	///
 	void printTable(std::ostream & os);
 	///
@@ -46,41 +49,68 @@ struct LyXLex::Pimpl {
 	///
 	void popTable();
 	///
-	bool setFile(string const & filename);
+	bool setFile(std::string const & filename);
 	///
 	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 &);
+	void pushToken(std::string const &);
+	/// 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.
+	io::filtering_istreambuf gz_;
 
-	/// fb__ is only used to open files, the stream is accessed through is
-	std::filebuf fb__;
 	/// the stream that we use.
 	std::istream is;
-	/// 
-	string name;
+	///
+	std::string name;
 	///
 	keyword_item * table;
 	///
 	int no_items;
 	///
-	char buff[LEX_MAX_BUFF];
-	///
-	short status;
+	std::string buff;
 	///
-	pushed_table * pushed;
+	int status;
 	///
 	int lineno;
 	///
-	string pushTok;
+	std::string pushTok;
+	///
+	char commentChar;
+private:
+	///
+	void verifyTable();
+	///
+	class pushed_table {
+	public:
+		///
+		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;
 };
+
+} // namespace lyx
+
 #endif