mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly)

Browse source
This commit is contained in:
Marc Zinnschlag 2014-05-27 21:08:29 +02:00
parent 27c795483b
commit 12fc0aaecb
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/compiler/exprparser.cpp
View file

@ -730,7 +730,7 @@ namespace Compiler
}
int ExprParser::parseArguments (const std::string& arguments, Scanner& scanner,
std::vector<Interpreter::Type_Code>& code, bool invert)
std::vector<Interpreter::Type_Code>& code)
{
bool optional = false;
int optionalCount = 0;
@ -762,15 +762,10 @@ namespace Compiler
if (*iter!='x')
{
if (invert)
{
std::vector<Interpreter::Type_Code> tmp;
stringParser.append (tmp);
std::vector<Interpreter::Type_Code> tmp;
stringParser.append (tmp);
stack.push (tmp);
}
else
stringParser.append (code);
stack.push (tmp);
if (optional)
++optionalCount;
@ -795,10 +790,7 @@ namespace Compiler
if (type!=*iter)
Generator::convert (tmp, type, *iter);
if (invert)
stack.push (tmp);
else
std::copy (tmp.begin(), tmp.end(), std::back_inserter (code));
stack.push (tmp);
if (optional)
++optionalCount;

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, bool invert = false);
std::vector<Interpreter::Type_Code>& code);
///< Parse sequence of arguments specified by \a arguments.
/// \param arguments Uses ScriptArgs typedef
/// \see Compiler::ScriptArgs

8
components/compiler/lineparser.cpp
View file

@ -166,7 +166,7 @@ namespace Compiler
if (!arguments.empty())
{
mExprParser.reset();
mExprParser.parseArguments (arguments, scanner, mCode, true);
mExprParser.parseArguments (arguments, scanner, mCode);
}
mName = name;
@ -278,7 +278,7 @@ namespace Compiler
mExplicit.clear();
}
int optionals = mExprParser.parseArguments (argumentType, scanner, mCode, true);
int optionals = mExprParser.parseArguments (argumentType, scanner, mCode);
extensions->generateInstructionCode (keyword, mCode, mLiterals, mExplicit, optionals);
mState = EndState;
@ -363,14 +363,14 @@ namespace Compiler
case Scanner::K_startscript:
mExprParser.parseArguments ("c", scanner, mCode, true);
mExprParser.parseArguments ("c", scanner, mCode);
Generator::startScript (mCode);
mState = EndState;
return true;
case Scanner::K_stopscript:
mExprParser.parseArguments ("c", scanner, mCode, true);
mExprParser.parseArguments ("c", scanner, mCode);
Generator::stopScript (mCode);
mState = EndState;
return true;