ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant has_next() check in Tokenizer

Browse Source
This commit is contained in:
Richard Berger
2021-03-19 14:12:09 -04:00
parent 5d4614b626
commit a33a04a392
1 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/tokenizer.cpp
View File

@ -197,70 +197,60 @@ bool ValueTokenizer::contains(const std::string &value) const {
*
* \return string with next token */
std::string ValueTokenizer::next_string() {
if (has_next()) {
std::string value = tokens.next();
return value;
} throw TokenizerException("Not enough tokens","");
std::string value = tokens.next();
return value;
}
/*! Retrieve next token and convert to int
*
* \return value of next token */
int ValueTokenizer::next_int() {
if (has_next()) {
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_integer(current)) {
throw InvalidIntegerException(current);
}
int value = atoi(current.c_str());
return value;
} throw TokenizerException("Not enough tokens","");
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_integer(current)) {
throw InvalidIntegerException(current);
}
int value = atoi(current.c_str());
return value;
}
/*! Retrieve next token and convert to bigint
*
* \return value of next token */
bigint ValueTokenizer::next_bigint() {
if (has_next()) {
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_integer(current)) {
throw InvalidIntegerException(current);
}
bigint value = ATOBIGINT(current.c_str());
return value;
} throw TokenizerException("Not enough tokens","");
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_integer(current)) {
throw InvalidIntegerException(current);
}
bigint value = ATOBIGINT(current.c_str());
return value;
}
/*! Retrieve next token and convert to tagint
*
* \return value of next token */
tagint ValueTokenizer::next_tagint() {
if (has_next()) {
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_integer(current)) {
throw InvalidIntegerException(current);
}
tagint value = ATOTAGINT(current.c_str());
return value;
} throw TokenizerException("Not enough tokens","");
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_integer(current)) {
throw InvalidIntegerException(current);
}
tagint value = ATOTAGINT(current.c_str());
return value;
}
/*! Retrieve next token and convert to double
*
* \return value of next token */
double ValueTokenizer::next_double() {
if (has_next()) {
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_double(current)) {
throw InvalidFloatException(current);
}
double value = atof(current.c_str());
return value;
} throw TokenizerException("Not enough tokens","");
std::string current = tokens.next();
if (utils::has_utf8(current)) current = utils::utf8_subst(current);
if (!utils::is_double(current)) {
throw InvalidFloatException(current);
}
double value = atof(current.c_str());
return value;
}
/*! Skip over a given number of tokens