From eaa13d42a09155200127418762940ca652b050c5 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 23 May 2017 18:57:06 +0200
Subject: Support multiple assembly front and backends.

---
 solc/CommandLineInterface.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'solc/CommandLineInterface.h')

diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index cf8652f4..8c79e32d 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/MultiBackendAssemblyStack.h>
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem/path.hpp>
@@ -53,9 +54,7 @@ private:
 	bool link();
 	void writeLinkedFiles();
 
-	/// Parse assembly input.
-	bool assemble();
-	void outputAssembly();
+	bool assemble(MultiBackendAssemblyStack::Input _input, MultiBackendAssemblyStack::Machine _targetMachine);
 
 	void outputCompilationResults();
 
@@ -85,11 +84,6 @@ private:
 	bool m_error = false; ///< If true, some error occurred.
 
 	bool m_onlyAssemble = false;
-	/// Settings to use in assembly / JULIA mode.
-	enum class AssemblyInput { JULIA, Assembly };
-	enum class AssemblyMachine { EVM, EVM15, eWasm };
-	AssemblyInput m_assemblyInput = AssemblyInput::Assembly;
-	AssemblyMachine m_assemblyMachine = AssemblyMachine::EVM;
 
 	bool m_onlyLink = false;
 
-- 
cgit