From f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 26 Apr 2017 15:41:08 +0200
Subject: Refactor to combined scope and stack height info.

---
 libsolidity/ast/ASTAnnotations.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libsolidity/ast/ASTAnnotations.h')

diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 0b6c8991..a7d89248 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -22,11 +22,12 @@
 
 #pragma once
 
+#include <libsolidity/ast/ASTForward.h>
+
 #include <map>
 #include <memory>
 #include <vector>
 #include <set>
-#include <libsolidity/ast/ASTForward.h>
 
 namespace dev
 {
@@ -112,9 +113,8 @@ struct StatementAnnotation: ASTAnnotation, DocumentedAnnotation
 
 namespace assembly
 {
-struct Identifier; // forward
-struct Block; // forward
-struct Scope; // forward
+	struct AsmAnalysisInfo;
+	struct Identifier;
 }
 
 struct InlineAssemblyAnnotation: StatementAnnotation
@@ -129,8 +129,8 @@ struct InlineAssemblyAnnotation: StatementAnnotation
 
 	/// Mapping containing resolved references to external identifiers and their value size
 	std::map<assembly::Identifier const*, ExternalIdentifierInfo> externalReferences;
-	/// Mapping containing the scopes (the result of the analysis phase).
-	std::map<assembly::Block const*, std::shared_ptr<assembly::Scope>> scopes;
+	/// Information generated during analysis phase.
+	std::shared_ptr<assembly::AsmAnalysisInfo> analysisInfo;
 };
 
 struct ReturnAnnotation: StatementAnnotation
-- 
cgit