X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.C;h=b0587400dfccc9e78bf1c88752cf22c41d0d0001;hb=53c5edb99e5566fd7c0a1192a697b7b7796919d8;hp=f7674d3991fb4d0060533796f43034babed3913c;hpb=3df345c9383480f68fad51feae8b9c64425c8729;p=lyx.git

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index f7674d3991..b0587400df 100644
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -9,6 +9,9 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "debug.h"
+#if 1 // to get NEW_INSETS
+#include "lyxparagraph.h"
+#endif
 
 using std::sort;
 using std::ostream;
@@ -19,12 +22,7 @@ using std::lower_bound;
 
 // namespace {
 struct compare_tags {
-	// used by lower_bound
-	inline
-	int operator()(keyword_item const & a, char const * const tag) const {
-		return compare_no_case(a.tag, tag) < 0;
-	}
-	// used by sorted and sort
+	// used by lower_bound, sort and sorted
 	inline
 	int operator()(keyword_item const & a, keyword_item const & b) const {
 		return compare_no_case(a.tag, b.tag) < 0;
@@ -35,20 +33,9 @@ struct compare_tags {
 
 LyXLex::Pimpl::Pimpl(keyword_item * tab, int num) 
 	: is(&fb__), table(tab), no_items(num),
-	  status(0), pushed(0), lineno(0)
+	  status(0), lineno(0), commentChar('#')
 {
-	if (table && !sorted(table, table + no_items, compare_tags())) {
-		lyxerr << "The table passed to LyXLex is not sorted!!\n"
-		       << "Tell the developers to fix it!" << endl;
-		// We sort it anyway to avoid problems.
-		lyxerr << "\nUnsorted:\n";
-		printTable(lyxerr);
-		
-		sort(table, table + no_items,
-		     compare_tags());
-		lyxerr << "\nSorted:\n";
-		printTable(lyxerr);
-	}
+	verifyTable();
 }
 
 
@@ -69,7 +56,7 @@ void LyXLex::Pimpl::printError(string const & message) const
 void LyXLex::Pimpl::printTable(ostream & os)
 {
 	os << "\nNumber of tags: " << no_items << '\n';
-	for(int i= 0; i < no_items; ++i)
+	for (int i= 0; i < no_items; ++i)
 		os << "table[" << i
 		   << "]:  tag: `" << table[i].tag
 		   << "'  code:" << table[i].code << '\n';
@@ -77,50 +64,57 @@ void LyXLex::Pimpl::printTable(ostream & os)
 }
 
 
-void LyXLex::Pimpl::pushTable(keyword_item * tab, int num)
+void LyXLex::Pimpl::verifyTable()
 {
-	pushed_table * tmppu = new pushed_table;
-	tmppu->next = pushed;
-	tmppu->table_elem = table;
-	tmppu->table_siz = no_items;
-	pushed = tmppu;
-	table = tab;
-	no_items = num;
 	// Check if the table is sorted and if not, sort it.
 	if (table
-	    && !sorted(table, table + no_items, compare_tags())) {
-		lyxerr << "The table passed to LyXLex is not sorted!!\n"
+	    && !lyx::sorted(table, table + no_items, compare_tags())) {
+		lyxerr << "The table passed to LyXLex is not sorted!\n"
 		       << "Tell the developers to fix it!" << endl;
 		// We sort it anyway to avoid problems.
 		lyxerr << "\nUnsorted:\n";
 		printTable(lyxerr);
-		
+
 		sort(table, table + no_items, compare_tags());
 		lyxerr << "\nSorted:\n";
 		printTable(lyxerr);
 	}
 }
 
+
+void LyXLex::Pimpl::pushTable(keyword_item * tab, int num)
+{
+	pushed_table tmppu(table, no_items);
+	pushed.push(tmppu);
+
+	table = tab;
+	no_items = num;
+
+	verifyTable();
+}
+
 	
 void LyXLex::Pimpl::popTable()
 {
-	if (pushed == 0)
+	if (pushed.empty()) {
 		lyxerr << "LyXLex error: nothing to pop!" << endl;
+		return;
+	}
 	
-	pushed_table * tmp;
-	tmp = pushed;
-	table = tmp->table_elem;
-	no_items = tmp->table_siz;
-	tmp->table_elem = 0;
-	pushed = tmp->next;
-	delete tmp;
+	pushed_table tmp = pushed.top();
+	pushed.pop();
+	table = tmp.table_elem;
+	no_items = tmp.table_siz;
 }
 
 
 bool LyXLex::Pimpl::setFile(string const & filename)
 {
-	if (fb__.is_open())
-		lyxerr << "Error in LyXLex::setFile: "
+	// 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() || is.tellg() > 0)
+		lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
 			"file or stream already set." << endl;
 	fb__.open(filename.c_str(), ios::in);
 	is.rdbuf(&fb__);
@@ -132,16 +126,45 @@ bool LyXLex::Pimpl::setFile(string const & filename)
 	
 void LyXLex::Pimpl::setStream(istream & i)
 {
-	if (fb__.is_open() || is.rdbuf()->in_avail())
-		lyxerr << "Error in LyXLex::setStream: "
+	if (fb__.is_open() || is.tellg() > 0)
+		lyxerr[Debug::LYXLEX]  << "Error in LyXLex::setStream: "
 			"file or stream already set." << endl;
 	is.rdbuf(i.rdbuf());
 	lineno = 0;
 }
 
+void LyXLex::Pimpl::setCommentChar(char c)
+{
+	commentChar = c;
+}
+
 
 bool LyXLex::Pimpl::next(bool esc /* = false */)
 {
+	if (!pushTok.empty()) {
+#ifndef NEW_INSETS
+		pushTok.copy(buff, string::npos);
+		buff[pushTok.length()] = '\0';
+		pushTok.erase();
+		return true;
+#else
+		// There can have been a whole line pushed so
+		// we extract the first word and leaves the rest
+		// in pushTok. (Lgb)
+		if (pushTok.find(' ') != string::npos) {
+			string tmp;
+			pushTok = split(pushTok, tmp, ' ');
+			tmp.copy(buff, string::npos);
+			buff[tmp.length()] = '\0';
+			return true;
+		} else {
+			pushTok.copy(buff, string::npos);
+			buff[pushTok.length()] = '\0';
+			pushTok.erase();
+			return true;
+		}     
+#endif
+	}
 	if (!esc) {
 		unsigned char c = 0; // getc() returns an int
 		char cc = 0;
@@ -149,11 +172,17 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
 		while (is && !status) {
 			is.get(cc);
 			c = cc;
-			if (c == '#') {
+			if (c == commentChar) {
 				// Read rest of line (fast :-)
+				// That is not fast... (Lgb)
+#if 1
 				is.getline(buff, sizeof(buff));
 				lyxerr[Debug::LYXLEX] << "Comment read: `" << c
 						      << buff << "'" << endl;
+#else
+				// unfortunately is ignore buggy (Lgb)
+				is.ignore(100, '\n');
+#endif
 				++lineno;
 				continue;
 			}
@@ -259,11 +288,18 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
 				continue;
 			}
 			
-			if (c == '#') {
+			if (c == commentChar) {
 				// Read rest of line (fast :-)
+				// That is still not fast... (Lgb)
+#if 1
 				is.getline(buff, sizeof(buff));
 				lyxerr[Debug::LYXLEX] << "Comment read: `" << c
 						      << buff << "'" << endl;
+#else
+				// but ignore is also still buggy (Lgb)
+				// This is fast (Lgb)
+				is.ignore(100, '\n');
+#endif
 				++lineno;
 				continue;
 			}
@@ -339,12 +375,13 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
 	}
 }
 
-	///
+
 int LyXLex::Pimpl::search_kw(char const * const tag) const
 {
+	keyword_item search_tag = { tag, 0 };
 	keyword_item * res =
 		lower_bound(table, table + no_items,
-			    tag, compare_tags());
+			    search_tag, compare_tags());
 	if (res != table + no_items
 	    && !compare_no_case(res->tag, tag))
 		return res->code;
@@ -364,6 +401,15 @@ int LyXLex::Pimpl::lex()
 	
 bool LyXLex::Pimpl::EatLine()
 {
+#ifndef NEW_INSETS
+	// This is not handling the pushed token
+	if (!pushTok.empty()) {
+		pushTok.copy(buff, string::npos);
+		buff[pushTok.length()] = '\0';
+		pushTok.erase();
+		return true;
+	}
+#endif
 	int i = 0;
 	unsigned char c = '\0';
 	char cc = 0;
@@ -395,6 +441,31 @@ bool LyXLex::Pimpl::EatLine()
 
 bool LyXLex::Pimpl::nextToken()
 {
+	if (!pushTok.empty()) {
+#ifndef NEW_INSETS
+		pushTok.copy(buff, string::npos);
+		buff[pushTok.length()] = '\0';
+		pushTok.erase();
+		return true;
+#else
+		// There can have been a whole line pushed so
+		// we extract the first word and leaves the rest
+		// in pushTok. (Lgb)
+		if (pushTok.find(' ') != string::npos) {
+			string tmp;
+			pushTok = split(pushTok, tmp, ' ');
+			tmp.copy(buff, string::npos);
+			buff[tmp.length()] = '\0';
+			return true;
+		} else {
+			pushTok.copy(buff, string::npos);
+			buff[pushTok.length()] = '\0';
+			pushTok.erase();
+			return true;
+		}
+#endif
+	}
+
 	status = 0;
 	while (is && !status) {
 		unsigned char c = 0;
@@ -438,3 +509,9 @@ bool LyXLex::Pimpl::nextToken()
 	buff[0] = '\0';
 	return false;
 }
+
+
+void LyXLex::Pimpl::pushToken(string const & pt)
+{
+	pushTok = pt;
+}