#include <config.h>
-#ifdef __GNUG__
-#pragma implementation "lyxlex.h"
-#endif
-
#include "lyxlex.h"
#include "lyxlex_pimpl.h"
#include "debug.h"
}
-string const LyXLex::text() const
-{
- return &pimpl_->buff[0];
-}
-
-
istream & LyXLex::getStream()
{
return pimpl_->is;
int LyXLex::getInteger() const
{
- if (isStrInt(pimpl_->getString())) {
+ if (isStrInt(pimpl_->getString()))
return strToInt(pimpl_->getString());
- } else {
- pimpl_->printError("Bad integer `$$Token'");
- return -1;
- }
+ pimpl_->printError("Bad integer `$$Token'");
+ return -1;
}
string str = subst(pimpl_->getString(), ",", ".");
if (isStrDbl(str))
return strToDbl(str);
- else {
- pimpl_->printError("Bad float `$$Token'");
- return -1;
- }
+ pimpl_->printError("Bad float `$$Token'");
+ return -1;
}
// I would prefer to give a tag number instead of an explicit token
-// here, but it is not possible because Buffer::readLyXformat2 uses
+// here, but it is not possible because Buffer::readBody uses
// explicit tokens (JMarc)
string const LyXLex::getLongString(string const & endtoken)
{
// We do a case independent comparison, like search_kw
// does.
- if (compare_ascii_no_case(token, endtoken) == 0)
+ if (compare_ascii_no_case(token, endtoken) == 0)
break;
string tmpstr = getString();
if (prefix.length() && prefixIs(tmpstr, prefix)) {
tmpstr.erase(0, prefix.length() - 1);
}
-
+
str += ltrim(tmpstr, "\t") + '\n';
}
-
+
if (!isOK()) {
printError("Long string not ended by `" + endtoken + '\'');
}
bool LyXLex::getBool() const
{
- if (compare(pimpl_->buff, "true") == 0) {
+ if (pimpl_->getString() == "true") {
return true;
- } else if (compare(pimpl_->buff, "false") != 0) {
+ } else if (pimpl_->getString() != "false") {
pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
}
return false;
int i = 0;
- if (compare(pimpl_->buff, "default")) {
- while (str[i][0] && compare(str[i], pimpl_->buff)) {
+ string const search_token = pimpl_->getString();
+
+ if (search_token != "default") {
+ while (str[i][0] && str[i] != search_token) {
++i;
}
if (!str[i][0]) {