diff options
| author | chriseth <chris@ethereum.org> | 2018-11-14 02:33:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 02:33:35 +0800 |
| commit | 1d4f565a64988a3400847d2655ca24f73f234bc6 (patch) | |
| tree | caaa6c26e307513505349b50ca4f2a8a9506752b /liblll/Compiler.cpp | |
| parent | 59dbf8f1085b8b92e8b7eb0ce380cbeb642e97eb (diff) | |
| parent | 91b6b8a88e76016e0324036cb7a7f9300a1e2439 (diff) | |
| download | dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.gz dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.bz2 dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.lz dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.xz dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.zst dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.zip | |
Merge pull request #5416 from ethereum/develop
Merge develop into release for 0.5.0
Diffstat (limited to 'liblll/Compiler.cpp')
| -rw-r--r-- | liblll/Compiler.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/liblll/Compiler.cpp b/liblll/Compiler.cpp index f2c1b0be..f944adbd 100644 --- a/liblll/Compiler.cpp +++ b/liblll/Compiler.cpp @@ -26,9 +26,9 @@ using namespace std; using namespace dev; -using namespace dev::eth; +using namespace dev::lll; -bytes dev::eth::compileLLL(string const& _src, dev::solidity::EVMVersion _evmVersion, bool _opt, std::vector<std::string>* _errors, dev::eth::ReadCallback const& _readFile) +bytes dev::lll::compileLLL(string const& _src, dev::solidity::EVMVersion _evmVersion, bool _opt, std::vector<std::string>* _errors, ReadCallback const& _readFile) { try { @@ -66,7 +66,7 @@ bytes dev::eth::compileLLL(string const& _src, dev::solidity::EVMVersion _evmVer return bytes(); } -std::string dev::eth::compileLLLToAsm(std::string const& _src, EVMVersion _evmVersion, bool _opt, std::vector<std::string>* _errors, ReadCallback const& _readFile) +std::string dev::lll::compileLLLToAsm(std::string const& _src, EVMVersion _evmVersion, bool _opt, std::vector<std::string>* _errors, ReadCallback const& _readFile) { try { @@ -90,7 +90,8 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, EVMVersion _evmVe } catch (std::exception const& _e) { - if (_errors) { + if (_errors) + { _errors->push_back("Parse exception."); _errors->push_back(boost::diagnostic_information(_e)); } @@ -103,7 +104,7 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, EVMVersion _evmVe return string(); } -string dev::eth::parseLLL(string const& _src) +string dev::lll::parseLLL(string const& _src) { sp::utree o; |