#include "debug.h"
#include "lyxlex_pimpl.h"
+#include "support/convert.h"
#include "support/lstrings.h"
-using lyx::support::compare_ascii_no_case;
-using lyx::support::isStrDbl;
-using lyx::support::isStrInt;
-using lyx::support::ltrim;
-using lyx::support::prefixIs;
-using lyx::support::strToDbl;
-using lyx::support::strToInt;
-using lyx::support::subst;
-using lyx::support::trim;
+#include <sstream>
-using std::endl;
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::isStrDbl;
+using support::isStrInt;
+using support::ltrim;
+using support::prefixIs;
+using support::subst;
+using support::trim;
+
+using std::endl;
+using std::string;
using std::istream;
using std::ostream;
}
-bool LyXLex::setFile(string const & filename)
+bool LyXLex::setFile(support::FileName const & filename)
{
return pimpl_->setFile(filename);
}
int LyXLex::getInteger() const
{
if (isStrInt(pimpl_->getString()))
- return strToInt(pimpl_->getString());
+ return convert<int>(pimpl_->getString());
pimpl_->printError("Bad integer `$$Token'");
return -1;
}
-float LyXLex::getFloat() const
+double LyXLex::getFloat() const
{
// replace comma with dot in case the file was written with
// the wrong locale (should be rare, but is easy enough to
// avoid).
- string str = subst(pimpl_->getString(), ",", ".");
+ string const str = subst(pimpl_->getString(), ",", ".");
if (isStrDbl(str))
- return strToDbl(str);
+ return convert<double>(str);
pimpl_->printError("Bad float `$$Token'");
return -1;
}
}
+docstring const LyXLex::getDocString() const
+{
+ return pimpl_->getDocString();
+}
+
+
// I would prefer to give a tag number instead of an explicit token
-// here, but it is not possible because Buffer::readBody uses
+// here, but it is not possible because Buffer::readDocument uses
// explicit tokens (JMarc)
string const LyXLex::getLongString(string const & endtoken)
{
pimpl_->pushToken(pt);
}
+LyXLex::operator void const *() const
+{
+ // This behaviour is NOT the same as the std::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.
+ return pimpl_->is.bad() ? 0 : this;
+}
+
-int LyXLex::findToken(char const * str[])
+bool LyXLex::operator!() const
{
- if (!next()) {
- pimpl_->printError("file ended while scanning string token");
- return -1;
+ return pimpl_->is.bad();
+}
+
+
+LyXLex & LyXLex::operator>>(std::string & s)
+{
+ if (isOK()) {
+ next();
+ s = getString();
}
+ return *this;
+}
- int i = 0;
- string const search_token = pimpl_->getString();
+LyXLex & LyXLex::operator>>(docstring & s)
+{
+ if (isOK()) {
+ next();
+ s = getDocString();
+ }
+ return *this;
+}
- if (search_token != "default") {
- while (str[i][0] && str[i] != search_token) {
- ++i;
- }
- if (!str[i][0]) {
- pimpl_->printError("Unknown argument `$$Token'");
- i = -1;
- }
+
+LyXLex & LyXLex::operator>>(double & s)
+{
+ if (isOK()) {
+ next();
+ s = getFloat();
}
+ return *this;
+}
+
- return i;
+LyXLex & LyXLex::operator>>(int & s)
+{
+ if (isOK()) {
+ next();
+ s = getInteger();
+ }
+ return *this;
}
+
+
+LyXLex & LyXLex::operator>>(unsigned int & s)
+{
+ if (isOK()) {
+ next();
+ s = getInteger();
+ }
+ return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(bool & s)
+{
+ if (isOK()) {
+ next();
+ s = getBool();
+ }
+ return *this;
+}
+
+
+/// quotes a string, e.g. for use in preferences files or as an argument of the "log" dialog
+string const LyXLex::quoteString(string const & arg)
+{
+ std::ostringstream os;
+ os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"';
+ return os.str();
+}
+
+
+} // namespace lyx