teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

allow the use of keywords for strings without quotation marks

Browse source
This commit is contained in:
Marc Zinnschlag 2013-09-05 15:47:38 +02:00
parent 645b50ef36
commit 8f0ab29a9f
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/opencs/model/filter/parser.cpp
View file

@ -49,19 +49,31 @@ namespace CSMFilter
Token (Type type = Type_None); Token (Type type = Type_None);
Token (Type type, const std::string& string);
///< Non-string type that can also be interpreted as a string.
Token (const std::string& string); Token (const std::string& string);
Token (double number); Token (double number);
operator bool() const; operator bool() const;
bool isString() const;
}; };
Token::Token (Type type) : mType (type) {} Token::Token (Type type) : mType (type) {}
Token::Token (Type type, const std::string& string) : mType (type), mString (string) {}
Token::Token (const std::string& string) : mType (Type_String), mString (string) {} Token::Token (const std::string& string) : mType (Type_String), mString (string) {}
Token::Token (double number) : mType (Type_Number), mNumber (number) {} Token::Token (double number) : mType (Type_Number), mNumber (number) {}
bool Token::isString() const
{
return mType==Type_String || mType>=Type_Keyword_True;
}
Token::operator bool() const Token::operator bool() const
{ {
return mType!=Type_None; return mType!=Type_None;
@ -182,7 +194,7 @@ CSMFilter::Token CSMFilter::Parser::checkKeywords (const Token& token)
for (int i=0; sKeywords[i]; ++i) for (int i=0; sKeywords[i]; ++i)
if (sKeywords[i]==string || (string.size()==1 && sKeywords[i][0]==string[0])) if (sKeywords[i]==string || (string.size()==1 && sKeywords[i][0]==string[0]))
return Token (static_cast<Token::Type> (i+Token::Type_Keyword_True)); return Token (static_cast<Token::Type> (i+Token::Type_Keyword_True), token.mString);
return token; return token;
} }
@ -351,7 +363,7 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
if (static_cast<int> (token.mNumber)==token.mNumber) if (static_cast<int> (token.mNumber)==token.mNumber)
columnId = static_cast<int> (token.mNumber); columnId = static_cast<int> (token.mNumber);
} }
else if (token.mType==Token::Type_String) else if (token.isString())
{ {
columnId = CSMWorld::Columns::getId (token.mString); columnId = CSMWorld::Columns::getId (token.mString);
} }
@ -373,7 +385,7 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseText()
// parse text pattern // parse text pattern
token = getNextToken(); token = getNextToken();
if (token.mType!=Token::Type_String) if (!token.isString())
{ {
error(); error();
return boost::shared_ptr<Node>(); return boost::shared_ptr<Node>();
@ -415,7 +427,7 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
if (static_cast<int> (token.mNumber)==token.mNumber) if (static_cast<int> (token.mNumber)==token.mNumber)
columnId = static_cast<int> (token.mNumber); columnId = static_cast<int> (token.mNumber);
} }
else if (token.mType==Token::Type_String) else if (token.isString())
{ {
columnId = CSMWorld::Columns::getId (token.mString); columnId = CSMWorld::Columns::getId (token.mString);
} }
@ -561,6 +573,8 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
return true; return true;
} }
// We do not use isString() here, because there could be a pre-defined filter with an ID that is
// equal a filter keyword.
else if (token.mType==Token::Type_String && allowPredefined) else if (token.mType==Token::Type_String && allowPredefined)
{ {
if (getNextToken()!=Token (Token::Type_EOS)) if (getNextToken()!=Token (Token::Type_EOS))