#include "Lexer.h"
-#include "debug.h"
+#include "support/debug.h"
#include "support/convert.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gzstream.h"
#include "support/lstrings.h"
#include <sstream>
#include <vector>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::compare_ascii_no_case;
-using support::FileName;
-using support::isStrDbl;
-using support::isStrInt;
-using support::ltrim;
-using support::makeDisplayPath;
-using support::prefixIs;
-using support::split;
-using support::subst;
-using support::trim;
-
-using std::endl;
-using std::getline;
-using std::lower_bound;
-using std::sort;
-using std::string;
-using std::ios;
-using std::istream;
-using std::ostream;
-
-
//////////////////////////////////////////////////////////////////////
//
// Lexer::Pimpl
///
Pimpl(keyword_item * tab, int num);
///
- std::string const getString() const;
+ string const getString() const;
///
docstring const getDocString() const;
///
- void printError(std::string const & message) const;
+ void printError(string const & message) const;
///
- void printTable(std::ostream & os);
+ void printTable(ostream & os);
///
void pushTable(keyword_item * tab, int num);
///
void popTable();
///
- bool setFile(support::FileName const & filename);
+ bool setFile(FileName const & filename);
///
- void setStream(std::istream & i);
+ void setStream(istream & i);
///
void setCommentChar(char c);
///
/// test if there is a pushed token or the stream is ok
bool inputAvailable();
///
- void pushToken(std::string const &);
+ void pushToken(string const &);
/// fb_ is only used to open files, the stream is accessed through is.
- std::filebuf fb_;
+ filebuf fb_;
/// gz_ is only used to open files, the stream is accessed through is.
gz::gzstreambuf gz_;
/// the stream that we use.
- std::istream is;
+ istream is;
///
- std::string name;
+ string name;
///
keyword_item * table;
///
int no_items;
///
- std::string buff;
+ string buff;
///
int status;
///
int lineno;
///
- std::string pushTok;
+ string pushTok;
///
char commentChar;
private:
int table_siz;
};
///
- std::stack<pushed_table> pushed;
+ stack<pushed_table> pushed;
};
namespace {
class compare_tags
- : public std::binary_function<keyword_item, keyword_item, bool> {
+ : public binary_function<keyword_item, keyword_item, bool> {
public:
// used by lower_bound, sort and sorted
bool operator()(keyword_item const & a, keyword_item const & b) const
// a bug in compaq cxx 6.2, where is_open() returns 'true' for
// a fresh new filebuf. (JMarc)
if (gz_.is_open() || istream::off_type(is.tellg()) > -1)
- lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
- "file or stream already set." << endl;
+ LYXERR(Debug::LYXLEX, "Error in LyXLex::setFile: "
+ "file or stream already set.");
gz_.open(filename.toFilesystemEncoding().c_str(), ios::in);
is.rdbuf(&gz_);
name = filename.absFilename();
}
-bool Lexer::setFile(support::FileName const & filename)
+bool Lexer::setFile(FileName const & filename)
{
return pimpl_->setFile(filename);
}
Lexer::operator void const *() const
{
- // This behaviour is NOT the same as the std::streams which would
+ // This behaviour is NOT the same as the streams which would
// use fail() here. However, our implementation of getString() et al.
// can cause the eof() and fail() bits to be set, even though we
// haven't tried to read 'em.
}
-Lexer & Lexer::operator>>(std::string & s)
+Lexer & Lexer::operator>>(string & s)
{
if (isOK()) {
next();
/// quotes a string, e.g. for use in preferences files or as an argument of the "log" dialog
string const Lexer::quoteString(string const & arg)
{
- std::ostringstream os;
+ ostringstream os;
os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"';
return os.str();
}