mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

improved handling of extra arguments in StringParser

Browse Source
This commit is contained in:
Marc Zinnschlag 2016-01-07 15:54:22 +01:00
parent 210c77968a
commit f9607a47b3
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/compiler/exprparser.cpp
View File

@ -789,6 +789,7 @@ namespace Compiler
stringParser.setOptional (true);
if (*iter=='c') stringParser.smashCase();
if (*iter=='x') stringParser.discard();
scanner.scan (stringParser);
if ((optional || *iter=='x') && stringParser.isEmpty())
@ -805,7 +806,8 @@ namespace Compiler
++optionalCount;
}
else
getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
getErrorHandler().warning ("Ignoring extra argument",
stringParser.getTokenLoc());
}
else if (*iter=='X')
{

27
components/compiler/stringparser.cpp
View File

@ -13,7 +13,7 @@
namespace Compiler
{
StringParser::StringParser (ErrorHandler& errorHandler, const Context& context, Literals& literals)
: Parser (errorHandler, context), mLiterals (literals), mState (StartState), mSmashCase (false)
: Parser (errorHandler, context), mLiterals (literals), mState (StartState), mSmashCase (false), mDiscard (false)
{
}
@ -24,10 +24,15 @@ namespace Compiler
if (mState==StartState || mState==CommaState)
{
start();
if (mSmashCase)
Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
else
Generator::pushString (mCode, mLiterals, name);
mTokenLoc = loc;
if (!mDiscard)
{
if (mSmashCase)
Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
else
Generator::pushString (mCode, mLiterals, name);
}
return false;
}
@ -75,6 +80,8 @@ namespace Compiler
mState = StartState;
mCode.clear();
mSmashCase = false;
mTokenLoc = TokenLoc();
mDiscard = false;
Parser::reset();
}
@ -82,4 +89,14 @@ namespace Compiler
{
mSmashCase = true;
}
const TokenLoc& StringParser::getTokenLoc() const
{
return mTokenLoc;
}
void StringParser::discard()
{
mDiscard = true;
}
}

11
components/compiler/stringparser.hpp
View File

@ -6,6 +6,7 @@
#include <components/interpreter/types.hpp>
#include "parser.hpp"
#include "tokenloc.hpp"
namespace Compiler
{
@ -22,6 +23,8 @@ namespace Compiler
State mState;
std::vector<Interpreter::Type_Code> mCode;
bool mSmashCase;
TokenLoc mTokenLoc;
bool mDiscard;
public:
@ -48,6 +51,14 @@ namespace Compiler
void reset();
///< Reset parser to clean state (this includes the smashCase function).
/// Returns TokenLoc object for string. If no string has been parsed, the TokenLoc
/// object will be default initialised.
const TokenLoc& getTokenLoc() const;
/// If parsing a string, do not add it to the literal table and do not create code
/// for it.
void discard();
};
}