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

Reject wildcard and multiple experimental pragmas

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-08-04 23:28:28 +01:00
parent de9e758ef7
commit 690ed37fd4
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsolidity/analysis/SyntaxChecker.cpp
View File

@ -77,12 +77,16 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
if (literals.size() == 0) if (literals.size() == 0)
m_errorReporter.syntaxError( m_errorReporter.syntaxError(
_pragma.location(), _pragma.location(),
"At least one experimental feature or the wildcard symbol \"*\" is required." "Experimental feature name is missing."
);
else if (literals.size() > 1)
m_errorReporter.syntaxError(
_pragma.location(),
"Stray arguments."
); );
else else
{ {
for (string const literal: literals) string const literal = literals[0];
{
if (literal.empty()) if (literal.empty())
m_errorReporter.syntaxError(_pragma.location(), "Empty experimental feature name is invalid."); m_errorReporter.syntaxError(_pragma.location(), "Empty experimental feature name is invalid.");
else if (!validFeatures.count(literal)) else if (!validFeatures.count(literal))
@ -96,7 +100,6 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
} }
} }
} }
}
else if (_pragma.literals()[0] == "solidity") else if (_pragma.literals()[0] == "solidity")
{ {
vector<Token::Value> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end()); vector<Token::Value> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());