/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
*
* Copyright 1996-2001 The LyX Team.
{}
-LyXLex::~LyXLex()
+LyXLex::~LyXLex()
{
delete pimpl_;
}
}
-std::istream & LyXLex::getStream()
+istream & LyXLex::getStream()
{
return pimpl_->is;
}
int LyXLex::getInteger() const
{
- if (isStrInt(pimpl_->getString()))
+ if (isStrInt(pimpl_->getString())) {
return strToInt(pimpl_->getString());
- else {
+ } else {
pimpl_->printError("Bad integer `$$Token'");
return -1;
}
{
// replace comma with dot in case the file was written with
// the wrong locale (should be rare, but is easy enough to
- // avoid).
+ // avoid).
string str = subst(pimpl_->getString(), ",", ".");
if (isStrDbl(str))
return strToDbl(str);
// I would prefer to give a tag number instead of an explicit token
// here, but it is not possible because Buffer::readLyXformat2 uses
-// explicit tokens (JMarc)
+// explicit tokens (JMarc)
string const LyXLex::getLongString(string const & endtoken)
{
string str, prefix;
if (!eatLine())
// blank line in the file being read
continue;
-
+
string const token = frontStrip(strip(getString()), " \t");
-
+
lyxerr[Debug::PARSER] << "LongString: `"
<< getString() << '\'' << endl;
// We do a case independent comparison, like search_kw
// does.
- if (compare_no_case(token, endtoken) != 0) {
+ if (compare_no_case(token, endtoken) != 0) {
string tmpstr = getString();
if (firstline) {
unsigned int i = 0;
- while(i < tmpstr.length()
+ while (i < tmpstr.length()
&& tmpstr[i] == ' ') {
++i;
prefix += ' ';
firstline = false;
lyxerr[Debug::PARSER] << "Prefix = `" << prefix
<< '\'' << endl;
- }
+ }
- if (!prefix.empty()
+ if (!prefix.empty()
&& prefixIs(tmpstr, prefix)) {
tmpstr.erase(0, prefix.length() - 1);
}
str += frontStrip(tmpstr, "\t") + '\n';
- }
+ }
else // token == endtoken
break;
}
- if (!isOK())
+ if (!isOK()) {
printError("Long string not ended by `" + endtoken + '\'');
+ }
return str;
}
bool LyXLex::getBool() const
{
- if (compare(pimpl_->buff, "true") == 0)
+ if (compare(pimpl_->buff, "true") == 0) {
return true;
- else if (compare(pimpl_->buff, "false") != 0)
+ } else if (compare(pimpl_->buff, "false") != 0) {
pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
+ }
return false;
}
int LyXLex::findToken(char const * str[])
-{
- int i = -1;
-
- if (next()) {
- if (compare(pimpl_->buff, "default")) {
- for (i = 0; str[i][0] && compare(str[i], pimpl_->buff); ++i);
- if (!str[i][0]) {
- pimpl_->printError("Unknown argument `$$Token'");
- i = -1;
- }
- }
- } else
- pimpl_->printError("file ended while scanning string token");
- return i;
-}
-
+{
+ int i = 0;
-int LyXLex::checkToken(char const * str[], int print_error)
-{
- int i = -1;
-
- if (compare(pimpl_->buff, "default")) {
- for (i = 0; str[i][0] && compare(str[i], pimpl_->buff); ++i);
- if (!str[i][0]) {
- if (print_error)
- pimpl_->printError("Unknown argument `$$Token'");
- i = -1;
- }
- }
- return i;
+ if (next()) {
+ if (compare(pimpl_->buff, "default")) {
+ while (str[i][0] && compare(str[i], pimpl_->buff)) {
+ ++i;
+ }
+ if (!str[i][0]) {
+ pimpl_->printError("Unknown argument `$$Token'");
+ i = -1;
+ }
+ }
+ } else {
+ pimpl_->printError("file ended while scanning string token");
+ i = -1;
+ }
+ return i;
}