#include "lyxlex_pimpl.h"
#include "support/lyxalgo.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include "debug.h"
using std::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;
+ // we use the ascii version, because in turkish, 'i'
+ // is not the lowercase version of 'I', and thus
+ // turkish locale breaks parsing of tags.
+ return compare_ascii_no_case(a.tag, b.tag) < 0;
}
};
// } // end of anon namespace
-LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
+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();
}
-string LyXLex::Pimpl::GetString() const
+string const LyXLex::Pimpl::getString() const
{
return string(buff);
}
void LyXLex::Pimpl::printError(string const & message) const
{
- string tmpmsg = subst(message, "$$Token", GetString());
+ string const tmpmsg = subst(message, "$$Token", getString());
lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
<< " of file " << MakeDisplayPath(name) << ']' << endl;
}
-
+
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';
}
-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;
-
- pushed_table * tmp;
- tmp = pushed;
- table = tmp->table_elem;
- no_items = tmp->table_siz;
- tmp->table_elem = 0;
- pushed = tmp->next;
- delete tmp;
+ return;
+ }
+
+ 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: "
- // "file or stream already set." << endl;
+ // 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__);
+ is.rdbuf(&fb__);
name = filename;
lineno = 0;
return fb__.is_open() && is.good();
}
-
+
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()) {
- pushTok.copy(buff, string::npos);
- buff[pushTok.length()] = '\0';
- pushTok.erase();
- return true;
+ // 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;
+ }
}
if (!esc) {
unsigned char c = 0; // getc() returns an int
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 ignore is buggy (Lgb)
+ is.ignore(100, '\n');
+#endif
++lineno;
continue;
}
-
+
if (c == '\"') {
int i = -1;
do {
buff[++i] = c;
} while (c != '\"' && c != '\n' && is &&
i != (LEX_MAX_BUFF - 2));
-
+
if (i == (LEX_MAX_BUFF - 2)) {
printError("Line too long");
c = '\"'; // Pretend we got a "
++i;
}
-
+
if (c != '\"') {
printError("Missing quote");
if (c == '\n')
++lineno;
}
-
+
buff[i] = '\0';
status = LEX_DATA;
- break;
+ break;
}
-
+
if (c == ',')
continue; /* Skip ','s */
-
+
// using relational operators with chars other
// than == and != is not safe. And if it is done
// the type _have_ to be unsigned. It usually a
is.get(cc);
c = cc;
} while (c > ' ' && c != ',' && is
- && (i != LEX_MAX_BUFF - 1) );
+ && (i != LEX_MAX_BUFF - 1));
if (i == LEX_MAX_BUFF - 1) {
printError("Line too long");
}
buff[i] = '\0';
status = LEX_TOKEN;
}
-
+
if (c == '\r' && is) {
// The Windows support has lead to the
// possibility of "\r\n" at the end of
is.get(cc);
c = cc;
}
-
+
if (c == '\n')
++lineno;
-
+
}
if (status) return true;
-
+
status = is.eof() ? LEX_FEOF: LEX_UNDEF;
buff[0] = '\0';
return false;
} else {
unsigned char c = 0; // getc() returns an int
char cc = 0;
-
+
status = 0;
while (is && !status) {
is.get(cc);
c = cc;
-
+
// skip ','s
if (c == ',') continue;
-
+
if (c == '\\') {
// escape
int i = 0;
is.get(cc);
c = cc;
} while (c > ' ' && c != ',' && is
- && (i != LEX_MAX_BUFF - 1) );
+ && (i != LEX_MAX_BUFF - 1));
if (i == LEX_MAX_BUFF - 1) {
printError("Line too long");
}
status = LEX_TOKEN;
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;
}
-
+
// string
if (c == '\"') {
int i = -1;
// escape the next char
is.get(cc);
c = cc;
- escaped = true;
+ if (c == '\"' || c == '\\')
+ escaped = true;
+ else
+ buff[++i] = '\\';
}
buff[++i] = c;
-
+
if (!escaped && c == '\"') break;
} while (c != '\n' && is &&
i != (LEX_MAX_BUFF - 2));
-
+
if (i == (LEX_MAX_BUFF - 2)) {
printError("Line too long");
c = '\"'; // Pretend we got a "
++i;
}
-
+
if (c != '\"') {
printError("Missing quote");
if (c == '\n')
++lineno;
}
-
+
buff[i] = '\0';
status = LEX_DATA;
- break;
+ break;
}
-
+
if (c > ' ' && is) {
int i = 0;
do {
is.get(cc);
c = cc;
} while (c > ' ' && c != ',' && is
- && (i != LEX_MAX_BUFF-1) );
+ && (i != LEX_MAX_BUFF-1));
if (i == LEX_MAX_BUFF-1) {
printError("Line too long");
}
if (c == '\n')
++lineno;
}
-
+
if (status) return true;
-
+
status = is.eof() ? LEX_FEOF : LEX_UNDEF;
buff[0] = '\0';
return false;
return status;
}
-
-bool LyXLex::Pimpl::EatLine()
+
+bool LyXLex::Pimpl::eatLine()
{
int i = 0;
unsigned char c = '\0';
char cc = 0;
- while(is && c != '\n' && i != (LEX_MAX_BUFF - 1)) {
+ while (is && c != '\n' && i != (LEX_MAX_BUFF - 1)) {
is.get(cc);
c = cc;
- lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
- << c << "'" << endl;
+ //lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
+ // << c << "'" << endl;
if (c != '\r')
buff[i++] = c;
}
bool LyXLex::Pimpl::nextToken()
{
if (!pushTok.empty()) {
- pushTok.copy(buff, string::npos);
- buff[pushTok.length()] = '\0';
- pushTok.erase();
- return true;
+ // 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;
+ }
}
status = 0;
} while (c >= ' ' && c != '\\' && is
&& i != (LEX_MAX_BUFF-1));
}
-
+
if (i == (LEX_MAX_BUFF - 1)) {
printError("Line too long");
}
-
+
if (c == '\\') is.putback(c); // put it back
buff[i] = '\0';
status = LEX_TOKEN;
}
-
+
if (c == '\n')
++lineno;
-
+
}
if (status) return true;
-
+
status = is.eof() ? LEX_FEOF: LEX_UNDEF;
buff[0] = '\0';
return false;