From aa310f9fec9bba90da2f1f57d77270dab673c6f4 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 2 Jun 2017 21:52:48 +0100
Subject: Refactor AssemblyStack

---
 libsolidity/interface/AssemblyStack.cpp | 10 ++++++----
 libsolidity/interface/AssemblyStack.h   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'libsolidity/interface')

diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index a571a008..347de350 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -51,10 +51,7 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string
 		return false;
 	solAssert(m_parserResult, "");
 
-	m_analysisInfo = make_shared<assembly::AsmAnalysisInfo>();
-	assembly::AsmAnalyzer analyzer(*m_analysisInfo, m_errorReporter);
-	m_analysisSuccessful = analyzer.analyze(*m_parserResult);
-	return m_analysisSuccessful;
+	return analyzeParsed();
 }
 
 bool AssemblyStack::analyze(assembly::Block const& _block, Scanner const* _scanner)
@@ -65,6 +62,11 @@ bool AssemblyStack::analyze(assembly::Block const& _block, Scanner const* _scann
 		m_scanner = make_shared<Scanner>(*_scanner);
 	m_parserResult = make_shared<assembly::Block>(_block);
 
+	return analyzeParsed();
+}
+
+bool AssemblyStack::analyzeParsed()
+{
 	m_analysisInfo = make_shared<assembly::AsmAnalysisInfo>();
 	assembly::AsmAnalyzer analyzer(*m_analysisInfo, m_errorReporter);
 	m_analysisSuccessful = analyzer.analyze(*m_parserResult);
diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h
index f13a25ca..abecaae2 100644
--- a/libsolidity/interface/AssemblyStack.h
+++ b/libsolidity/interface/AssemblyStack.h
@@ -74,6 +74,7 @@ public:
 	std::string print();
 
 private:
+	bool analyzeParsed();
 
 	Language m_language = Language::Assembly;
 
-- 
cgit v1.2.3