mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 07:15:34 +00:00
Code Issues Releases Wiki Activity

Parse integer format arguments as variable names

Browse source
This commit is contained in:
Evil Eye 2021-10-24 17:23:15 +02:00
parent 31aa19574b
commit fef902617a
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -58,6 +58,7 @@
Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
Bug #6363: Some scripts in Morrowland fail to work
Feature #890: OpenMW-CS: Column filtering
Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
Feature #2780: A way to see current OpenMW version in the console

4
components/compiler/exprparser.cpp
View file

@ -632,7 +632,7 @@ namespace Compiler
}
int ExprParser::parseArguments (const std::string& arguments, Scanner& scanner,
std::vector<Interpreter::Type_Code>& code, int ignoreKeyword)
std::vector<Interpreter::Type_Code>& code, int ignoreKeyword, bool expectNames)
{
bool optional = false;
int optionalCount = 0;
@ -717,6 +717,8 @@ namespace Compiler
if (optional)
parser.setOptional (true);
if(expectNames)
scanner.enableExpectName();
scanner.scan (parser);

2
components/compiler/exprparser.hpp
View file

@ -96,7 +96,7 @@ namespace Compiler
/// \return Type ('l': integer, 'f': float)
int parseArguments (const std::string& arguments, Scanner& scanner,
std::vector<Interpreter::Type_Code>& code, int ignoreKeyword = -1);
std::vector<Interpreter::Type_Code>& code, int ignoreKeyword = -1, bool expectNames = false);
///< Parse sequence of arguments specified by \a arguments.
/// \param arguments Uses ScriptArgs typedef
/// \see Compiler::ScriptArgs

2
components/compiler/lineparser.cpp
View file

@ -145,7 +145,7 @@ namespace Compiler
if (!arguments.empty())
{
mExprParser.reset();
mExprParser.parseArguments (arguments, scanner, mCode);
mExprParser.parseArguments (arguments, scanner, mCode, -1, true);
}
mName = name;

10
components/compiler/scanner.cpp
View file

@ -130,7 +130,8 @@ namespace Compiler
{
bool cont = false;
if (scanInt (c, parser, cont))
bool scanned = mExpectName ? scanName(c, parser, cont) : scanInt(c, parser, cont);
if (scanned)
{
mLoc.mLiteral.clear();
return cont;
@ -387,6 +388,8 @@ namespace Compiler
bool Scanner::scanSpecial (MultiChar& c, Parser& parser, bool& cont)
{
bool expectName = mExpectName;
mExpectName = false;
int special = -1;
if (c=='\n')
@ -541,15 +544,16 @@ namespace Compiler
if (special==S_newline)
mLoc.mLiteral = "<newline>";
else if (mExpectName && (special == S_member || special == S_minus))
else if (expectName && (special == S_member || special == S_minus))
{
mExpectName = false;
bool tolerant = mTolerantNames;
mTolerantNames = true;
bool out = scanName(c, parser, cont);
mTolerantNames = tolerant;
return out;
}
else if (expectName && special == S_comma)
mExpectName = true;
TokenLoc loc (mLoc);
mLoc.mLiteral.clear();