aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmAnalysis.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-06-14 18:04:08 +0800
committerGitHub <noreply@github.com>2018-06-14 18:04:08 +0800
commitdc5cd3e1e7db933493fe1b0dc12e5ecdf2a50ed7 (patch)
treed32c20e0d651d13d034cc5eaa601eccebcdf1ee8 /libsolidity/inlineasm/AsmAnalysis.cpp
parentbaeabe1c2d1c5c447eeb943f3b750459a6bc924d (diff)
parentd24f6fd34b3a984b87ac6054d33922116fb12977 (diff)
downloaddexon-solidity-dc5cd3e1e7db933493fe1b0dc12e5ecdf2a50ed7.tar.gz
dexon-solidity-dc5cd3e1e7db933493fe1b0dc12e5ecdf2a50ed7.tar.zst
dexon-solidity-dc5cd3e1e7db933493fe1b0dc12e5ecdf2a50ed7.zip
Merge pull request #4296 from ethereum/yul-internal
[WIP] Rename some internal constructs from Julia/Iulia to Yul
Diffstat (limited to 'libsolidity/inlineasm/AsmAnalysis.cpp')
-rw-r--r--libsolidity/inlineasm/AsmAnalysis.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/inlineasm/AsmAnalysis.cpp b/libsolidity/inlineasm/AsmAnalysis.cpp
index 9f505889..d5580dd2 100644
--- a/libsolidity/inlineasm/AsmAnalysis.cpp
+++ b/libsolidity/inlineasm/AsmAnalysis.cpp
@@ -99,7 +99,7 @@ bool AsmAnalyzer::operator()(assembly::Literal const& _literal)
}
else if (_literal.kind == assembly::LiteralKind::Boolean)
{
- solAssert(m_flavour == AsmFlavour::IULIA, "");
+ solAssert(m_flavour == AsmFlavour::Yul, "");
solAssert(_literal.value == "true" || _literal.value == "false", "");
}
m_info.stackHeightInfo[&_literal] = m_stackHeight;
@@ -162,7 +162,7 @@ bool AsmAnalyzer::operator()(assembly::Identifier const& _identifier)
bool AsmAnalyzer::operator()(FunctionalInstruction const& _instr)
{
- solAssert(m_flavour != AsmFlavour::IULIA, "");
+ solAssert(m_flavour != AsmFlavour::Yul, "");
bool success = true;
for (auto const& arg: _instr.arguments | boost::adaptors::reversed)
if (!expectExpression(arg))
@@ -550,7 +550,7 @@ Scope& AsmAnalyzer::scope(Block const* _block)
}
void AsmAnalyzer::expectValidType(string const& type, SourceLocation const& _location)
{
- if (m_flavour != AsmFlavour::IULIA)
+ if (m_flavour != AsmFlavour::Yul)
return;
if (!builtinTypes.count(type))