* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 415402b4cc9a5d8a7c4e3756864540605ed9cabd..0ae2b1391c85323f36a6f4d3aef64ef6543879bb 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -24,11 +24,15 @@
 
 #include <functional>
 
-using lyx::support::compare_ascii_no_case;
-using lyx::support::getFormatFromContents;
-using lyx::support::makeDisplayPath;
-using lyx::support::split;
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::FileName;
+using support::getFormatFromContents;
+using support::makeDisplayPath;
+using support::split;
+using support::subst;
 
 using std::endl;
 using std::getline;
@@ -67,15 +71,13 @@ LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
 
 string const LyXLex::Pimpl::getString() const
 {
-       return string(buff.begin(), buff.end());
+       return buff;
 }
 
 
-lyx::docstring const LyXLex::Pimpl::getDocString() const
+docstring const LyXLex::Pimpl::getDocString() const
 {
-       std::vector<boost::uint32_t> res = utf8_to_ucs4(buff);
-       lyx::docstring dstr(res.begin(), res.end());
-       return dstr;
+       return from_utf8(buff);
 }
 
 
@@ -83,7 +85,7 @@ void LyXLex::Pimpl::printError(string const & message) const
 {
        string const tmpmsg = subst(message, "$$Token", getString());
        lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
-               << " of file " << lyx::to_utf8(makeDisplayPath(name)) << ']' << endl;
+               << " of file " << to_utf8(makeDisplayPath(name)) << ']' << endl;
 }
 
 
@@ -142,7 +144,7 @@ void LyXLex::Pimpl::popTable()
 }
 
 
-bool LyXLex::Pimpl::setFile(string const & filename)
+bool LyXLex::Pimpl::setFile(FileName const & filename)
 {
        // Check the format of the file.
        string const format = getFormatFromContents(filename);
@@ -157,9 +159,9 @@ bool LyXLex::Pimpl::setFile(string const & filename)
                        lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
                gz_.push(io::gzip_decompressor());
-               gz_.push(io::file_source(filename));
+               gz_.push(io::file_source(filename.toFilesystemEncoding()));
                is.rdbuf(&gz_);
-               name = filename;
+               name = filename.absFilename();
                lineno = 0;
                return gz_.component<io::file_source>(1)->is_open() && is.good();
        } else {
@@ -171,9 +173,9 @@ bool LyXLex::Pimpl::setFile(string const & filename)
                if (fb_.is_open() || istream::off_type(is.tellg()) > 0)
                        lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
-               fb_.open(filename.c_str(), ios::in);
+               fb_.open(filename.toFilesystemEncoding().c_str(), ios::in);
                is.rdbuf(&fb_);
-               name = filename;
+               name = filename.absFilename();
                lineno = 0;
                return fb_.is_open() && is.good();
        }
@@ -203,13 +205,12 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
                if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
-                       string tmp;
-                       pushTok = split(pushTok, tmp, ' ');
-                       buff.assign(tmp.begin(), tmp.end());
+                       buff.clear();
+                       pushTok = split(pushTok, buff, ' ');
                        return true;
                } else {
-                       buff.assign(pushTok.begin(), pushTok.end());
-                       pushTok.erase();
+                       buff = pushTok;
+                       pushTok.clear();
                        return true;
                }
        }
@@ -253,7 +254,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                ++lineno;
                                }
 
-                               buff.pop_back();
+                               buff.resize(buff.size()-1);
                                status = LEX_DATA;
                                break;
                        }
@@ -374,7 +375,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                ++lineno;
                                }
 
-                               buff.pop_back();
+                               buff.resize(buff.size() -1);
                                status = LEX_DATA;
                                break;
                        }
@@ -453,7 +454,7 @@ bool LyXLex::Pimpl::eatLine()
 
        if (c == '\n') {
                ++lineno;
-               buff.pop_back();
+               buff.resize(buff.size() - 1);
                status = LEX_DATA;
                return true;
        } else {
@@ -469,13 +470,12 @@ bool LyXLex::Pimpl::nextToken()
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
                if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
-                       string tmp;
-                       pushTok = split(pushTok, tmp, ' ');
-                       buff.assign(tmp.begin(), tmp.end());
+                       buff.clear();
+                       pushTok = split(pushTok, buff, ' ');
                        return true;
                } else {
-                       buff.assign(pushTok.begin(), pushTok.end());
-                       pushTok.erase();
+                       buff = pushTok;
+                       pushTok.clear();
                        return true;
                }
        }
@@ -523,3 +523,6 @@ void LyXLex::Pimpl::pushToken(string const & pt)
 {
        pushTok = pt;
 }
+
+
+} // namespace lyx