}
-bool LyXLex::IsOK() const
+bool LyXLex::isOK() const
{
return pimpl_->is.good();
}
}
-int LyXLex::GetLineNo() const
+int LyXLex::getLineNo() const
{
return pimpl_->lineno;
}
}
-int LyXLex::GetInteger() const
+int LyXLex::getInteger() const
{
- if (isStrInt(pimpl_->GetString()))
- return strToInt(pimpl_->GetString());
- else {
+ if (isStrInt(pimpl_->getString())) {
+ return strToInt(pimpl_->getString());
+ } else {
pimpl_->printError("Bad integer `$$Token'");
return -1;
}
}
-float LyXLex::GetFloat() const
+float 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 str = subst(pimpl_->getString(), ",", ".");
if (isStrDbl(str))
return strToDbl(str);
else {
}
-string const LyXLex::GetString() const
+string const LyXLex::getString() const
{
- return pimpl_->GetString();
+ return pimpl_->getString();
}
string str, prefix;
bool firstline = true;
- while (IsOK()) {
- if (!EatLine())
+ while (isOK()) {
+ if (!eatLine())
// blank line in the file being read
continue;
- string const token = frontStrip(strip(GetString()), " \t");
+ string const token = frontStrip(strip(getString()), " \t");
lyxerr[Debug::PARSER] << "LongString: `"
- << GetString() << '\'' << endl;
+ << getString() << '\'' << endl;
// We do a case independent comparison, like search_kw
// does.
if (compare_no_case(token, endtoken) != 0) {
- string tmpstr = GetString();
+ string tmpstr = getString();
if (firstline) {
unsigned int i = 0;
- while(i < tmpstr.length()
+ while (i < tmpstr.length()
&& tmpstr[i] == ' ') {
++i;
prefix += ' ';
else // token == endtoken
break;
}
- if (!IsOK())
+ if (!isOK()) {
printError("Long string not ended by `" + endtoken + '\'');
+ }
return str;
}
-bool LyXLex::GetBool() const
+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;
}
-bool LyXLex::EatLine()
+bool LyXLex::eatLine()
{
- return pimpl_->EatLine();
+ return pimpl_->eatLine();
}
}
-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 LyXLex::CheckToken(char const * str[], int print_error)
-{
- int i = -1;
+int LyXLex::findToken(char const * str[])
+{
+ int i = 0;
- 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;
}