X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=79f4393acef51621bf74b71f86cf0513b947fc12;hb=37d42d45f3f4a5d3e916a080af50b37ae4a9d118;hp=2991328f79c46f42f0ce15d03c1789ee28e52a0f;hpb=e5f1824f33b51af675f8d345d5871a76dbd54465;p=lyx.git

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 2991328f79..79f4393ace 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,87 +1,107 @@
 // -*- 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
+#ifdef USE_COMPRESSION
+# include "support/gzstream.h"
 #endif
 
+#include <boost/utility.hpp>
+
+#include <fstream>
+#include <istream>
+#include <stack>
+#include <vector>
+
 ///
-struct LyXLex::Pimpl {
+class LyXLex::Pimpl : boost::noncopyable {
+public:
 	///
-	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;
-	};
-	
 	Pimpl(keyword_item * tab, int num);
-	
-	string GetString() const;
-	
-	void printError(string const & message) const;
-	
+	///
+	std::string const getString() 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(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_;
+
+#ifdef USE_COMPRESSION
+	/// gz_ is only used to open files, the stream is accessed through is.
+	gz::gzstreambuf gz_;
+#endif
 
-	/// 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];
+	std::vector<char> buff;
 	///
-	short status;
-	///
-	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;
 };
 #endif