X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flyxlex.C;h=c590c74c534c5a568fda0d2a23785e945ccd4bd3;hb=e25012ddfad9b27467bb1af49f3e6bfcd863b408;hp=4b93787423c7685d12ba833372bd9cd52e37b25c;hpb=1a3ed565d95e3d500b26f0e929f4df3d56813421;p=lyx.git diff --git a/src/lyxlex.C b/src/lyxlex.C index 4b93787423..c590c74c53 100644 --- a/src/lyxlex.C +++ b/src/lyxlex.C @@ -1,24 +1,20 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor +/** + * \file lyxlex.C + * Copyright 1996-2002 the LyX Team + * Read the file COPYING * - * Copyright 1996-2000 The LyX Team. + * Generalized simple lexical analyzer. + * It can be used for simple syntax parsers, like lyxrc, + * texclass and others to come. * - * Generalized simple lexical analizer. - * It can be used for simple syntax parsers, like lyxrc, - * texclass and others to come. [asierra30/03/96] - * - * ====================================================== */ + * \author Alejandro Aguilar Sierra + */ #include -#ifdef __GNUG__ -#pragma implementation "lyxlex.h" -#endif - #include "lyxlex.h" #include "lyxlex_pimpl.h" +#include "debug.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -32,13 +28,13 @@ LyXLex::LyXLex(keyword_item * tab, int num) {} -LyXLex::~LyXLex() +LyXLex::~LyXLex() { delete pimpl_; } -bool LyXLex::IsOK() const +bool LyXLex::isOK() const { return pimpl_->is.good(); } @@ -50,19 +46,13 @@ void LyXLex::setLineNo(int l) } -int LyXLex::GetLineNo() const +int LyXLex::getLineNo() const { return pimpl_->lineno; } -string const LyXLex::text() const -{ - return &pimpl_->buff[0]; -} - - -std::istream & LyXLex::getStream() +istream & LyXLex::getStream() { return pimpl_->is; } @@ -115,101 +105,98 @@ int LyXLex::lex() } -int LyXLex::GetInteger() const +int LyXLex::getInteger() const { - if (isStrInt(pimpl_->GetString())) - return strToInt(pimpl_->GetString()); - else { - pimpl_->printError("Bad integer `$$Token'"); - return -1; - } + if (isStrInt(pimpl_->getString())) + return strToInt(pimpl_->getString()); + 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(), ",", "."); + // avoid). + 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; } -string const LyXLex::GetString() const +string const LyXLex::getString() const { - return pimpl_->GetString(); + return pimpl_->getString(); } // 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) +// here, but it is not possible because Buffer::readBody uses +// explicit tokens (JMarc) string const LyXLex::getLongString(string const & endtoken) { 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 = trim(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(); - if (firstline) { - unsigned int i = 0; - while(i < tmpstr.length() - && tmpstr[i] == ' ') { - ++i; - prefix += ' '; - } - firstline = false; - lyxerr[Debug::PARSER] << "Prefix = `" << prefix - << '\'' << endl; - } - - if (!prefix.empty() - && prefixIs(tmpstr, prefix)) { - tmpstr.erase(0, prefix.length() - 1); - } - str += frontStrip(tmpstr, "\t") + '\n'; - } - else // token == endtoken + if (compare_ascii_no_case(token, endtoken) == 0) break; + + string tmpstr = getString(); + if (firstline) { + string::size_type i(tmpstr.find_first_not_of(' ')); + if (i != string::npos) + prefix = tmpstr.substr(0, i); + firstline = false; + lyxerr[Debug::PARSER] + << "Prefix = `" << prefix << "\'" << endl; + } + + // further lines in long strings may have the same + // whitespace prefix as the first line. Remove it. + if (prefix.length() && prefixIs(tmpstr, prefix)) { + tmpstr.erase(0, prefix.length() - 1); + } + + str += ltrim(tmpstr, "\t") + '\n'; } - 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 (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; } -bool LyXLex::EatLine() +bool LyXLex::eatLine() { - return pimpl_->EatLine(); + return pimpl_->eatLine(); } @@ -231,35 +218,26 @@ void LyXLex::pushToken(string const & pt) } -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::findToken(char const * str[]) +{ + if (!next()) { + pimpl_->printError("file ended while scanning string token"); + return -1; + } + + int i = 0; + string const search_token = pimpl_->getString(); + + if (search_token != "default") { + while (str[i][0] && str[i] != search_token) { + ++i; + } + if (!str[i][0]) { + pimpl_->printError("Unknown argument `$$Token'"); + i = -1; + } + } -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; + return i; }