diff options
| author | chriseth <chris@ethereum.org> | 2017-05-24 01:21:14 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-05-26 21:08:27 +0800 |
| commit | 261731f7eea48902983c55163d377e26bbca07da (patch) | |
| tree | 42b1c3c91e36fad0b5a35232ffca0fa0687c9090 /solc/CommandLineInterface.cpp | |
| parent | 71b923cc36d33bf3e173f2210b33895df49fcbba (diff) | |
| download | dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.gz dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.bz2 dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.lz dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.xz dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.zst dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.zip | |
Adapt EVM codegen to new namespace.
Diffstat (limited to 'solc/CommandLineInterface.cpp')
| -rw-r--r-- | solc/CommandLineInterface.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 701cf163..c14a46e8 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -35,7 +35,7 @@ #include <libsolidity/interface/StandardCompiler.h> #include <libsolidity/interface/SourceReferenceFormatter.h> #include <libsolidity/interface/GasEstimator.h> -#include <libsolidity/interface/MultiBackendAssemblyStack.h> +#include <libsolidity/interface/AssemblyStack.h> #include <libsolidity/formal/Why3Translator.h> #include <libevmasm/Instruction.h> @@ -717,9 +717,9 @@ bool CommandLineInterface::processInput() { // switch to assembly mode m_onlyAssemble = true; - using Input = MultiBackendAssemblyStack::Input; - using Machine = MultiBackendAssemblyStack::Machine; - Input input = m_args.count(g_argJulia) ? Input::JULIA : Input::Assembly; + using Input = AssemblyStack::Language; + using Machine = AssemblyStack::Machine; + Input inputLanguage = m_args.count(g_argJulia) ? Input::JULIA : Input::Assembly; Machine targetMachine = Machine::EVM; if (m_args.count(g_argMachine)) { @@ -736,7 +736,7 @@ bool CommandLineInterface::processInput() return false; } } - return assemble(input, targetMachine); + return assemble(inputLanguage, targetMachine); } if (m_args.count(g_argLink)) { @@ -1023,15 +1023,15 @@ void CommandLineInterface::writeLinkedFiles() } bool CommandLineInterface::assemble( - MultiBackendAssemblyStack::Input _input, - MultiBackendAssemblyStack::Machine _targetMachine + AssemblyStack::Language _language, + AssemblyStack::Machine _targetMachine ) { bool successful = true; - map<string, MultiBackendAssemblyStack> assemblyStacks; + map<string, AssemblyStack> assemblyStacks; for (auto const& src: m_sourceCodes) { - auto& stack = assemblyStacks[src.first] = MultiBackendAssemblyStack(_input, _targetMachine); + auto& stack = assemblyStacks[src.first] = AssemblyStack(_language); try { if (!stack.parseAndAnalyze(src.first, src.second)) |