aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/ast
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-04-26 21:41:08 +0800
committerchriseth <chris@ethereum.org>2017-04-26 23:12:04 +0800
commitf3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb (patch)
treebe9367a377cd81badbac4bbf6bdf5377586823b3 /libsolidity/ast
parent68218387cf29b3ce7de72aa0348e68dbdae29751 (diff)
downloaddexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.tar
dexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.tar.gz
dexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.tar.bz2
dexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.tar.lz
dexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.tar.xz
dexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.tar.zst
dexon-solidity-f3ec2ba39e7f4b85d148a7b696ef5af499fbb6fb.zip
Refactor to combined scope and stack height info.
Diffstat (limited to 'libsolidity/ast')
-rw-r--r--libsolidity/ast/ASTAnnotations.h12
1 files changed, 6 insertions, 6 deletions
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