cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Prefixing Version with Range

Browse Source
This commit is contained in:
Eduard 2023-02-16 17:11:27 +01:00
parent 23eb9c59bb
commit 82e27dcad9
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
liblangutil/SemVerHandler.cpp
View File

@ -208,6 +208,13 @@ void SemVerMatchExpressionParser::parseMatchExpression()
range.components.push_back(parseMatchComponent());
if (currentToken() == Token::Sub)
{
if(containPrefixingToken()) {
solThrow(
SemVerError,
"You cannot use operators (<, <=, >=, >, ^) with verison ranges (-)."
);
}
range.components[0].prefix = Token::GreaterThanOrEqual;
nextToken();
range.components.push_back(parseMatchComponent());
@ -324,3 +331,11 @@ void SemVerMatchExpressionParser::nextToken()
++m_pos;
m_posInside = 0;
}
bool SemVerMatchExpressionParser::containPrefixingToken() const
{
if (std::find_if(m_tokens.begin(), m_tokens.end(), TokenTraits::isPragmaOp) != m_tokens.end())
return true;
else
return false;
}

1
liblangutil/SemVerHandler.h
View File

@ -102,6 +102,7 @@ private:
char nextChar();
Token currentToken() const;
void nextToken();
bool containPrefixingToken() const;
std::vector<Token> m_tokens;
std::vector<std::string> m_literals;

1
liblangutil/Token.h
View File

@ -297,6 +297,7 @@ namespace TokenTraits
op == Token::Add || op == Token::Mul || op == Token::Equal || op == Token::NotEqual; }
constexpr bool isArithmeticOp(Token op) { return Token::Add <= op && op <= Token::Exp; }
constexpr bool isCompareOp(Token op) { return Token::Equal <= op && op <= Token::GreaterThanOrEqual; }
constexpr bool isPragmaOp(Token op) { return (Token::LessThan <= op && op <= Token::GreaterThanOrEqual) || op == Token::BitXor; }
constexpr bool isBitOp(Token op) { return (Token::BitOr <= op && op <= Token::BitAnd) || op == Token::BitNot; }
constexpr bool isBooleanOp(Token op) { return (Token::Or <= op && op <= Token::And) || op == Token::Not; }