X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=c844fb4c1ca56d4a3baecdd5d44d1032e8250c4d;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=cfbb720555e1330656991a7f5353c5b2ed41923d;hpb=fa6aa115e72e5fdefddeb2d1e364a062d46d0437;p=lyx.git

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index cfbb720555..c844fb4c1c 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,87 +1,117 @@
 // -*- 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/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 <istream>
+#include <stack>
+#include <vector>
+
+
+namespace lyx {
+
+namespace support { class FileName; }
 
 ///
-struct LyXLex::Pimpl {
-	///
-	enum {
-		///
-		LEX_MAX_BUFF = 2048
-	};
-	
+class LyXLex::Pimpl : boost::noncopyable {
+public:
 	///
-	struct pushed_table {
-		///
-		pushed_table(){
-			next = 0;
-			table_elem = 0;
-		}
-		///
-		pushed_table * next;
-		///
-		keyword_item * table_elem;
-		///
-		int table_siz;
-	};
-	
 	Pimpl(keyword_item * tab, int num);
-	
-	string const GetString() const;
-	
-	void printError(string const & message) const;
-	
+	///
+	std::string const getString() const;
+	///
+	docstring const getDocString() const;
+	///
+	void printError(std::string const & message) const;
+	///
 	void printTable(std::ostream & os);
-	
+	///
 	void pushTable(keyword_item * tab, int num);
-	
+	///
 	void popTable();
-	
-	bool setFile(string const & filename);
-	
+	///
+	bool setFile(support::FileName 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