diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-26 22:37:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 22:37:16 +0800 |
| commit | 43002b7bb8973e02919f23dcea099cb9877e9579 (patch) | |
| tree | 6270037929123b5a95038a6bd7f3b6a305d516ac /libsolidity/interface/StandardCompiler.cpp | |
| parent | 887823dca6e244d4dae84ca545fe3f0e8170b3d0 (diff) | |
| parent | 30012db396793efad5dba9a2bbb64d34994709ce (diff) | |
| download | dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.gz dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.bz2 dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.lz dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.xz dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.zst dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.zip | |
Merge pull request #2599 from ethereum/compilerstack-cleanup
Cleanup compilerstack (remove old methods and clean compile)
Diffstat (limited to 'libsolidity/interface/StandardCompiler.cpp')
| -rw-r--r-- | libsolidity/interface/StandardCompiler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp index 82eeac3d..23687340 100644 --- a/libsolidity/interface/StandardCompiler.cpp +++ b/libsolidity/interface/StandardCompiler.cpp @@ -249,6 +249,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input) Json::Value optimizerSettings = settings.get("optimizer", Json::Value()); bool const optimize = optimizerSettings.get("enabled", Json::Value(false)).asBool(); unsigned const optimizeRuns = optimizerSettings.get("runs", Json::Value(200u)).asUInt(); + m_compilerStack.setOptimiserSettings(optimize, optimizeRuns); map<string, h160> libraries; Json::Value jsonLibraries = settings.get("libraries", Json::Value()); @@ -259,6 +260,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input) // @TODO use libraries only for the given source libraries[library] = h160(jsonSourceName[library].asString()); } + m_compilerStack.setLibraries(libraries); Json::Value metadataSettings = settings.get("metadata", Json::Value()); m_compilerStack.useMetadataLiteralSources(metadataSettings.get("useLiteralContent", Json::Value(false)).asBool()); @@ -267,7 +269,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input) try { - m_compilerStack.compile(optimize, optimizeRuns, libraries); + m_compilerStack.compile(); for (auto const& error: m_compilerStack.errors()) { |