Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 8f9b86ff11c7f48d1c1bb2b09cbdf1f4da8ca3aa..7da1fbef105ff296f19cabad3af133cabe7bef0f 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;
@@ -52,7 +47,7 @@ LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
 }
 
 
-string const LyXLex::Pimpl::GetString() const
+string LyXLex::Pimpl::GetString() const
 {
        return string(buff);
 }
@@ -140,8 +135,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 +340,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 +397,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 +447,9 @@ bool LyXLex::Pimpl::nextToken()
        buff[0] = '\0';
        return false;
 }
+
+
+void LyXLex::Pimpl::pushToken(string const & pt)
+{
+       pushTok = pt;
+}