mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove redundant string_view

Browse Source
depth-refraction
Evil Eye 2 years ago
parent 724c6ec425
commit c6a545766c
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File

37
components/compiler/scanner.cpp
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save