diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-08 21:09:57 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-10 07:15:25 +0800 |
| commit | 57c24511308f9cd1f981e92aacfb880825eb6ed9 (patch) | |
| tree | f027135713c992ad08d27c5fc0e759f4b8fc2af3 /libsolidity/analysis | |
| parent | 690ed37fd4b90119ac69def3e308035d46af0c60 (diff) | |
| download | dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.tar dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.tar.gz dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.tar.bz2 dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.tar.lz dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.tar.xz dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.tar.zst dexon-solidity-57c24511308f9cd1f981e92aacfb880825eb6ed9.zip | |
Introduce ExperimentalFeatures header
Diffstat (limited to 'libsolidity/analysis')
| -rw-r--r-- | libsolidity/analysis/SyntaxChecker.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp index 39f788c4..d2571cd3 100644 --- a/libsolidity/analysis/SyntaxChecker.cpp +++ b/libsolidity/analysis/SyntaxChecker.cpp @@ -18,6 +18,7 @@ #include <libsolidity/analysis/SyntaxChecker.h> #include <memory> #include <libsolidity/ast/AST.h> +#include <libsolidity/ast/ExperimentalFeatures.h> #include <libsolidity/analysis/SemVerHandler.h> #include <libsolidity/interface/ErrorReporter.h> #include <libsolidity/interface/Version.h> @@ -69,9 +70,6 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma) m_errorReporter.syntaxError(_pragma.location(), "Invalid pragma \"" + _pragma.literals()[0] + "\""); else if (_pragma.literals()[0] == "experimental") { - /// TODO: fill this out - static const set<string> validFeatures = set<string>{}; - solAssert(m_sourceUnit, ""); vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end()); if (literals.size() == 0) @@ -89,13 +87,13 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma) string const literal = literals[0]; if (literal.empty()) m_errorReporter.syntaxError(_pragma.location(), "Empty experimental feature name is invalid."); - else if (!validFeatures.count(literal)) + else if (!ExperimentalFeatureNames.count(literal)) m_errorReporter.syntaxError(_pragma.location(), "Unsupported experimental feature name."); - else if (m_sourceUnit->annotation().experimentalFeatures.count(literal)) + else if (m_sourceUnit->annotation().experimentalFeatures.count(ExperimentalFeatureNames.at(literal))) m_errorReporter.syntaxError(_pragma.location(), "Duplicate experimental feature name."); else { - m_sourceUnit->annotation().experimentalFeatures.insert(literal); + m_sourceUnit->annotation().experimentalFeatures.insert(ExperimentalFeatureNames.at(literal)); m_errorReporter.warning(_pragma.location(), "Experimental features are turned on. Do not use experimental features on live deployments."); } } |