Skip to content

Commit f2a572b

Browse files
committed
rename ast.block to ast.root
1 parent f6f468f commit f2a572b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+170
-169
lines changed

libsolidity/analysis/ControlFlowBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ bool ControlFlowBuilder::visit(InlineAssembly const& _inlineAssembly)
451451
solAssert(!!m_currentNode && !m_inlineAssembly, "");
452452

453453
m_inlineAssembly = &_inlineAssembly;
454-
(*this)(_inlineAssembly.operations().block());
454+
(*this)(_inlineAssembly.operations().root());
455455
m_inlineAssembly = nullptr;
456456

457457
return false;

libsolidity/analysis/PostTypeChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ class LValueChecker: public ASTConstVisitor
506506
return;
507507

508508
YulLValueChecker yulChecker{m_declaration->name()};
509-
yulChecker(_inlineAssembly.operations().block());
509+
yulChecker(_inlineAssembly.operations().root());
510510
m_willBeWrittenTo = yulChecker.willBeWrittenTo();
511511
}
512512
private:

libsolidity/analysis/ReferencesResolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ bool ReferencesResolver::visit(UsingForDirective const& _usingFor)
236236
bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
237237
{
238238
m_yulAnnotation = &_inlineAssembly.annotation();
239-
(*this)(_inlineAssembly.operations().block());
239+
(*this)(_inlineAssembly.operations().root());
240240
m_yulAnnotation = nullptr;
241241

242242
return false;

libsolidity/analysis/SyntaxChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ bool SyntaxChecker::visit(InlineAssembly const& _inlineAssembly)
354354
if (!m_useYulOptimizer)
355355
return false;
356356

357-
if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations().block()))
357+
if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations().root()))
358358
m_errorReporter.syntaxError(
359359
6553_error,
360360
_inlineAssembly.location(),

libsolidity/analysis/TypeChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
947947
_inlineAssembly.dialect(),
948948
identifierAccess
949949
);
950-
if (!analyzer.analyze(_inlineAssembly.operations().block()))
950+
if (!analyzer.analyze(_inlineAssembly.operations().root()))
951951
solAssert(m_errorReporter.hasErrors());
952952
_inlineAssembly.annotation().hasMemoryEffects =
953953
lvalueAccessToMemoryVariable ||

libsolidity/analysis/ViewPureChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ void ViewPureChecker::endVisit(InlineAssembly const& _inlineAssembly)
226226
AssemblyViewPureChecker{
227227
_inlineAssembly.dialect(),
228228
[&](StateMutability _mutability, SourceLocation const& _location) { reportMutability(_mutability, _location); }
229-
}(_inlineAssembly.operations().block());
229+
}(_inlineAssembly.operations().root());
230230
}
231231

232232
void ViewPureChecker::reportMutability(

libsolidity/ast/ASTJsonExporter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
665665
externalReferencesJson.emplace_back(std::move(it));
666666

667667
std::vector<std::pair<std::string, Json>> attributes = {
668-
std::make_pair("AST", Json(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations().block()))),
668+
std::make_pair("AST", Json(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations().root()))),
669669
std::make_pair("externalReferences", std::move(externalReferencesJson)),
670670
std::make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
671671
};

libsolidity/codegen/CompilerContext.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ void CompilerContext::appendInlineAssembly(
472472
errorReporter,
473473
dialect,
474474
identifierAccess.resolve
475-
).analyze(parserResult->block());
475+
).analyze(parserResult->root());
476476
if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
477477
reportError("Invalid assembly generated by code generator.");
478478

@@ -491,8 +491,8 @@ void CompilerContext::appendInlineAssembly(
491491
{
492492
// Store as generated sources, but first re-parse to update the source references.
493493
solAssert(m_generatedYulUtilityCode.empty(), "");
494-
m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(obj.code->block());
495-
std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(obj.code->block());
494+
m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(obj.code->root());
495+
std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(obj.code->root());
496496
langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
497497
obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
498498
*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
@@ -518,7 +518,7 @@ void CompilerContext::appendInlineAssembly(
518518

519519
solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
520520
yul::CodeGenerator::assemble(
521-
parserResult->block(),
521+
parserResult->root(),
522522
analysisInfo,
523523
*m_asm,
524524
m_evmVersion,

libsolidity/codegen/ContractCompiler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
944944
solAssert(dialect, "");
945945

946946
// Create a modifiable copy of the code and analysis
947-
object.code = std::make_shared<yul::AST>(yul::ASTCopier().translate(code->block()));
947+
object.code = std::make_shared<yul::AST>(yul::ASTCopier().translate(code->root()));
948948
object.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(*dialect, object));
949949

950950
m_context.optimizeYul(object, *dialect, m_optimiserSettings);
@@ -954,7 +954,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
954954
}
955955

956956
yul::CodeGenerator::assemble(
957-
code->block(),
957+
code->root(),
958958
*analysisInfo,
959959
*m_context.assemblyPtr(),
960960
m_context.evmVersion(),

libsolidity/codegen/ir/IRGeneratorForStatements.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2252,7 +2252,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
22522252
m_context.setMemoryUnsafeInlineAssemblySeen();
22532253
CopyTranslate bodyCopier{_inlineAsm.dialect(), m_context, _inlineAsm.annotation().externalReferences};
22542254

2255-
yul::Statement modified = bodyCopier(_inlineAsm.operations().block());
2255+
yul::Statement modified = bodyCopier(_inlineAsm.operations().root());
22562256

22572257
solAssert(std::holds_alternative<yul::Block>(modified));
22582258

0 commit comments

Comments
 (0)