mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant string_view

Browse Source
This commit is contained in:
Evil Eye 2023-03-05 21:45:03 +01:00
parent 724c6ec425
commit c6a545766c
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/compiler/scanner.cpp
View File

@ -471,46 +471,39 @@ namespace Compiler
size_t end = op.size();
while (end > 0 && (op[end - 1] == '\t' || op[end - 1] == ' '))
--end;
std::string_view trimmedOperator = std::string_view{ op }.substr(0, end);
switch (trimmedOperator[0])
switch (op[0])
{
case '=':
special = S_cmpEQ;
if (trimmedOperator.size() != 2 || trimmedOperator[1] != '=')
mErrorHandler.warning(
"invalid operator " + std::string(trimmedOperator) + ", treating it as ==", loc);
if (end != 2 || op[1] != '=')
mErrorHandler.warning("invalid operator " + op.substr(0, end) + ", treating it as ==", loc);
break;
case '<':
special = S_cmpLT;
if (trimmedOperator[1] == '=')
if (op[1] == '=')
{
special = S_cmpLE;
if (trimmedOperator.size() != 2)
mErrorHandler.warning(
"invalid operator " + std::string(trimmedOperator) + ", treating it as <=", loc);
if (end != 2)
mErrorHandler.warning("invalid operator " + op.substr(0, end) + ", treating it as <=", loc);
}
else if (trimmedOperator.size() != 1)
mErrorHandler.warning(
"invalid operator " + std::string(trimmedOperator) + ", treating it as <", loc);
else if (end != 1)
mErrorHandler.warning("invalid operator " + op.substr(0, end) + ", treating it as <", loc);
break;
case '>':
special = S_cmpGT;
if (trimmedOperator[1] == '=')
if (op[1] == '=')
{
special = S_cmpGE;
if (trimmedOperator.size() != 2)
mErrorHandler.warning(
"invalid operator " + std::string(trimmedOperator) + ", treating it as >=", loc);
if (end != 2)
mErrorHandler.warning("invalid operator " + op.substr(0, end) + ", treating it as >=", loc);
}
else if (trimmedOperator.size() != 1)
mErrorHandler.warning(
"invalid operator " + std::string(trimmedOperator) + ", treating it as >", loc);
else if (end != 1)
mErrorHandler.warning("invalid operator " + op.substr(0, end) + ", treating it as >", loc);
break;
case '!':
special = S_cmpNE;
if (trimmedOperator.size() != 2 || trimmedOperator[1] != '=')
mErrorHandler.warning(
"invalid operator " + std::string(trimmedOperator) + ", treating it as !=", loc);
if (end != 2 || op[1] != '=')
mErrorHandler.warning("invalid operator " + op.substr(0, end) + ", treating it as !=", loc);
break;
default:
return false;