// 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;
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)
{
- 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();
}
}
-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"
+ 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())
+ if (fb__.is_open() || is.tellg() > 0)
lyxerr << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
fb__.open(filename.c_str(), ios::in);
void LyXLex::Pimpl::setStream(istream & i)
{
- if (fb__.is_open() || is.rdbuf()->in_avail())
+ if (fb__.is_open() || is.tellg() > 0)
lyxerr << "Error in LyXLex::setStream: "
"file or stream already set." << endl;
is.rdbuf(i.rdbuf());
bool LyXLex::Pimpl::next(bool esc /* = false */)
{
+ if (!pushTok.empty()) {
+ pushTok.copy(buff, string::npos);
+ buff[pushTok.length()] = '\0';
+ pushTok.erase();
+ return true;
+ }
if (!esc) {
unsigned char c = 0; // getc() returns an int
char cc = 0;
}
}
- ///
+
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;
bool LyXLex::Pimpl::nextToken()
{
+ if (!pushTok.empty()) {
+ pushTok.copy(buff, string::npos);
+ buff[pushTok.length()] = '\0';
+ pushTok.erase();
+ return true;
+ }
+
status = 0;
while (is && !status) {
unsigned char c = 0;
buff[0] = '\0';
return false;
}
+
+
+void LyXLex::Pimpl::pushToken(string const & pt)
+{
+ pushTok = pt;
+}