@@ -47,7 +47,6 @@ namespace solidity::frontend
47
47
48
48
class Type ;
49
49
class ArrayType ;
50
- using namespace util ;
51
50
52
51
struct CallGraph ;
53
52
@@ -91,13 +90,13 @@ struct StructurallyDocumentedAnnotation
91
90
struct SourceUnitAnnotation : ASTAnnotation
92
91
{
93
92
// / The "absolute" (in the compiler sense) path of this source unit.
94
- SetOnce<std::string> path;
93
+ util:: SetOnce<std::string> path;
95
94
// / The exported symbols (all global symbols).
96
- SetOnce<std::map<ASTString, std::vector<Declaration const *>>> exportedSymbols;
95
+ util:: SetOnce<std::map<ASTString, std::vector<Declaration const *>>> exportedSymbols;
97
96
// / Experimental features.
98
97
std::set<ExperimentalFeature> experimentalFeatures;
99
98
// / Using the new ABI coder. Set to `false` if using ABI coder v1.
100
- SetOnce<bool > useABICoderV2;
99
+ util:: SetOnce<bool > useABICoderV2;
101
100
};
102
101
103
102
struct ScopableAnnotation
@@ -127,15 +126,15 @@ struct DeclarationAnnotation: ASTAnnotation, ScopableAnnotation
127
126
struct ImportAnnotation : DeclarationAnnotation
128
127
{
129
128
// / The absolute path of the source unit to import.
130
- SetOnce<std::string> absolutePath;
129
+ util:: SetOnce<std::string> absolutePath;
131
130
// / The actual source unit.
132
131
SourceUnit const * sourceUnit = nullptr ;
133
132
};
134
133
135
134
struct TypeDeclarationAnnotation : DeclarationAnnotation
136
135
{
137
136
// / The name of this type, prefixed by proper namespaces if globally accessible.
138
- SetOnce<std::string> canonicalName;
137
+ util:: SetOnce<std::string> canonicalName;
139
138
};
140
139
141
140
struct StructDeclarationAnnotation : TypeDeclarationAnnotation
@@ -162,9 +161,9 @@ struct ContractDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocu
162
161
// / These can either be inheritance specifiers or modifier invocations.
163
162
std::map<FunctionDefinition const *, ASTNode const *> baseConstructorArguments;
164
163
// / A graph with edges representing calls between functions that may happen during contract construction.
165
- SetOnce<std::shared_ptr<CallGraph const >> creationCallGraph;
164
+ util:: SetOnce<std::shared_ptr<CallGraph const >> creationCallGraph;
166
165
// / A graph with edges representing calls between functions that may happen in a deployed contract.
167
- SetOnce<std::shared_ptr<CallGraph const >> deployedCallGraph;
166
+ util:: SetOnce<std::shared_ptr<CallGraph const >> deployedCallGraph;
168
167
169
168
// / List of contracts whose bytecode is referenced by this contract, e.g. through "new".
170
169
// / The Value represents the ast node that referenced the contract.
@@ -252,19 +251,19 @@ struct IdentifierPathAnnotation: ASTAnnotation
252
251
// / Referenced declaration, set during reference resolution stage.
253
252
Declaration const * referencedDeclaration = nullptr ;
254
253
// / What kind of lookup needs to be done (static, virtual, super) find the declaration.
255
- SetOnce<VirtualLookup> requiredLookup;
254
+ util:: SetOnce<VirtualLookup> requiredLookup;
256
255
};
257
256
258
257
struct ExpressionAnnotation : ASTAnnotation
259
258
{
260
259
// / Inferred type of the expression.
261
260
Type const * type = nullptr ;
262
261
// / Whether the expression is a constant variable
263
- SetOnce<bool > isConstant;
262
+ util:: SetOnce<bool > isConstant;
264
263
// / Whether the expression is pure, i.e. compile-time constant.
265
- SetOnce<bool > isPure;
264
+ util:: SetOnce<bool > isPure;
266
265
// / Whether it is an LValue (i.e. something that can be assigned to).
267
- SetOnce<bool > isLValue;
266
+ util:: SetOnce<bool > isLValue;
268
267
// / Whether the expression is used in a context where the LValue is actually required.
269
268
bool willBeWrittenTo = false ;
270
269
// / Whether the expression is an lvalue that is only assigned.
@@ -291,7 +290,7 @@ struct IdentifierAnnotation: ExpressionAnnotation
291
290
// / Referenced declaration, set at latest during overload resolution stage.
292
291
Declaration const * referencedDeclaration = nullptr ;
293
292
// / What kind of lookup needs to be done (static, virtual, super) find the declaration.
294
- SetOnce<VirtualLookup> requiredLookup;
293
+ util:: SetOnce<VirtualLookup> requiredLookup;
295
294
// / List of possible declarations it could refer to (can contain duplicates).
296
295
std::vector<Declaration const *> candidateDeclarations;
297
296
// / List of possible declarations it could refer to.
@@ -303,7 +302,7 @@ struct MemberAccessAnnotation: ExpressionAnnotation
303
302
// / Referenced declaration, set at latest during overload resolution stage.
304
303
Declaration const * referencedDeclaration = nullptr ;
305
304
// / What kind of lookup needs to be done (static, virtual, super) find the declaration.
306
- SetOnce<VirtualLookup> requiredLookup;
305
+ util:: SetOnce<VirtualLookup> requiredLookup;
307
306
};
308
307
309
308
struct BinaryOperationAnnotation : ExpressionAnnotation
0 commit comments