diff options
Diffstat (limited to 'solc')
| -rw-r--r-- | solc/CommandLineInterface.cpp | 18 | ||||
| -rw-r--r-- | solc/CommandLineInterface.h | 4 |
2 files changed, 11 insertions, 11 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)) diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index 8c79e32d..b482c20b 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -22,7 +22,7 @@ #pragma once #include <libsolidity/interface/CompilerStack.h> -#include <libsolidity/interface/MultiBackendAssemblyStack.h> +#include <libsolidity/interface/AssemblyStack.h> #include <boost/program_options.hpp> #include <boost/filesystem/path.hpp> @@ -54,7 +54,7 @@ private: bool link(); void writeLinkedFiles(); - bool assemble(MultiBackendAssemblyStack::Input _input, MultiBackendAssemblyStack::Machine _targetMachine); + bool assemble(AssemblyStack::Language _language, AssemblyStack::Machine _targetMachine); void outputCompilationResults(); |