small changes to ButtonController usage

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 8f9b86ff11c7f48d1c1bb2b09cbdf1f4da8ca3aa..cc0c0d537ea538db7b1f61e29cabd8a45b889a83 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -19,12 +19,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 +30,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)
 {
-       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();
 }
 
 
@@ -77,49 +61,53 @@ 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"
+               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);
@@ -132,7 +120,7 @@ bool LyXLex::Pimpl::setFile(string const & filename)
        
 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());
@@ -140,8 +128,14 @@ void LyXLex::Pimpl::setStream(istream & i)
 }
 
 
-bool LyXLex::Pimpl::next(bool esc = false)
+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;
@@ -339,12 +333,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;
@@ -395,6 +390,13 @@ bool LyXLex::Pimpl::EatLine()
 
 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;
@@ -438,3 +440,9 @@ bool LyXLex::Pimpl::nextToken()
        buff[0] = '\0';
        return false;
 }
+
+
+void LyXLex::Pimpl::pushToken(string const & pt)
+{
+       pushTok = pt;
+}