This commit is contained in:
aozhiwei 2024-05-01 17:32:14 +08:00
parent 616c589a3d
commit 79c5f66cf9

View File

@ -150,7 +150,7 @@ namespace a8
if (params->size() > 0) { if (params->size() > 0) {
result = std::any_cast<Atom>(params->at(0)->value).val; result = std::any_cast<Atom>(params->at(0)->value).val;
if (params->size() > 1) { if (params->size() > 1) {
for (int i = 1; i < params->size(); ++i) { for (size_t i = 1; i < params->size(); ++i) {
auto& param = params->at(i); auto& param = params->at(i);
Atom&& atom = std::any_cast<Atom>(param->value); Atom&& atom = std::any_cast<Atom>(param->value);
result /= atom.val; result /= atom.val;
@ -229,13 +229,13 @@ namespace a8
*/ */
int Expr::GetToken(const std::string& script, int& pos, std::string& token) int Expr::GetToken(const std::string& script, int& pos, std::string& token)
{ {
if (pos >= script.size()) { if ((size_t)pos >= script.size()) {
return -1; return -1;
} }
while (pos < script.size() && isspace(script[pos])) { while ((size_t)pos < script.size() && isspace(script.at((size_t)pos))) {
++pos; ++pos;
} }
if (pos >= script.size()) { if ((size_t)pos >= script.size()) {
return -1; return -1;
} }
if (script[pos] == '(') { if (script[pos] == '(') {
@ -248,10 +248,10 @@ namespace a8
token = ")"; token = ")";
return 1; return 1;
} }
while (pos < script.size() && while ((size_t)pos < script.size() &&
!isspace(script[pos]) && !isspace(script[pos]) &&
script[pos] != ')' && script[(size_t)pos] != ')' &&
script[pos] != '(') { script[(size_t)pos] != '(') {
token += script[pos]; token += script[pos];
++pos; ++pos;
} }