Merge pull request #2510 from ethereum/develop

Version 0.4.12

1 files changed, 5 insertions, 7 deletions

diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index f52a03c7..b482c20b 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/inlineasm/AsmStack.h>
+#include <libsolidity/interface/AssemblyStack.h>
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem/path.hpp>
@@ -54,9 +54,7 @@ private:
 	bool link();
 	void writeLinkedFiles();
 
-	/// Parse assembly input.
-	bool assemble();
-	void outputAssembly();
+	bool assemble(AssemblyStack::Language _language, AssemblyStack::Machine _targetMachine);
 
 	void outputCompilationResults();
 
@@ -67,7 +65,8 @@ private:
 	void handleBytecode(std::string const& _contract);
 	void handleSignatureHashes(std::string const& _contract);
 	void handleOnChainMetadata(std::string const& _contract);
-	void handleMeta(DocumentationType _type, std::string const& _contract);
+	void handleABI(std::string const& _contract);
+	void handleNatspec(DocumentationType _type, std::string const& _contract);
 	void handleGasEstimation(std::string const& _contract);
 	void handleFormal();
 
@@ -85,6 +84,7 @@ private:
 	bool m_error = false; ///< If true, some error occurred.
 
 	bool m_onlyAssemble = false;
+
 	bool m_onlyLink = false;
 
 	/// Compiler arguments variable map
@@ -97,8 +97,6 @@ private:
 	std::map<std::string, h160> m_libraries;
 	/// Solidity compiler stack
 	std::unique_ptr<dev::solidity::CompilerStack> m_compiler;
-	/// Assembly stacks for assembly-only mode
-	std::map<std::string, assembly::InlineAssemblyStack> m_assemblyStacks;
 };
 
 }