Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 12:58:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch 'keyword_soup' into 'master'

Browse source 
Strip quotes when treating keywords as strings

Closes #6066

See merge request OpenMW/openmw!921
This commit is contained in:
jvoisin 2021-06-24 19:51:58 +00:00
commit b4cfa4328e
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/compiler/stringparser.cpp
View file

@ -65,7 +65,11 @@ namespace Compiler
keyword==Scanner::K_messagebox || keyword==Scanner::K_set ||
keyword==Scanner::K_to || keyword==Scanner::K_getsquareroot)
{
return parseName (loc.mLiteral, loc, scanner);
// pretend this is not a keyword
std::string name = loc.mLiteral;
if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
name = name.substr (1, name.size()-2);
return parseName (name, loc, scanner);
}
return Parser::parseKeyword (keyword, loc, scanner);