AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-10-03 10:03:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

added support for half-sided intervals to filter parser

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-09-05 15:38:28 +02:00
parent f3ce9c22a1
commit 645b50ef36
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/opencs/model/filter/parser.cpp
View File

@ -461,12 +461,8 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
token = getNextToken(); token = getNextToken();
if (token.mType!=Token::Type_Number) if (token.mType==Token::Type_Number)
{ {
error();
return boost::shared_ptr<Node>();
}
lower = token.mNumber; lower = token.mNumber;
token = getNextToken(); token = getNextToken();
@ -476,21 +472,33 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseValue()
error(); error();
return boost::shared_ptr<Node>(); return boost::shared_ptr<Node>();
} }
}
token = getNextToken(); else if (token.mType==Token::Type_Comma)
{
if (token.mType!=Token::Type_Number) lowerType = ValueNode::Type_Infinite;
}
else
{ {
error(); error();
return boost::shared_ptr<Node>(); return boost::shared_ptr<Node>();
} }
token = getNextToken();
if (token.mType==Token::Type_Number)
{
upper = token.mNumber; upper = token.mNumber;
token = getNextToken(); token = getNextToken();
}
else
upperType = ValueNode::Type_Infinite;
if (token.mType==Token::Type_CloseSquare) if (token.mType==Token::Type_CloseSquare)
{
if (upperType!=ValueNode::Type_Infinite)
upperType = ValueNode::Type_Closed; upperType = ValueNode::Type_Closed;
}
else if (token.mType!=Token::Type_OpenSquare && token.mType!=Token::Type_Close) else if (token.mType!=Token::Type_OpenSquare && token.mType!=Token::Type_Close)
{ {
error(); error();