anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apply lyx.diff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3158 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-12-05 23:04:07 +00:00
parent c7c0d033b2
commit 985aec9f0f
3 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-12-05 John Levon <moz@compsoc.man.ac.uk>
* lyxlex.h:
* lyxlex.C: little cleanup
2001-12-05 John Levon <moz@compsoc.man.ac.uk>
* BufferView_pimpl.C: fix insertAscii for insets

58
src/lyxlex.C
View File

@ -118,9 +118,9 @@ int LyXLex::lex()
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;
}
@ -191,8 +191,9 @@ string const LyXLex::getLongString(string const & endtoken)
else // token == endtoken
break;
}
if (!isOK())
if (!isOK()) {
printError("Long string not ended by `" + endtoken + '\'');
}
return str;
}
@ -200,10 +201,11 @@ string const LyXLex::getLongString(string const & endtoken)
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;
}
@ -233,34 +235,22 @@ void LyXLex::pushToken(string const & pt)
int LyXLex::findToken(char const * str[])
{
int i = -1;
{
int i = 0;
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;
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;
}

2
src/lyxlex.h
View File

@ -102,8 +102,6 @@ public:
bool eatLine();
///
int findToken(char const * str[]);
///
int checkToken(char const * str[], int print_error);
///
string const text() const;