aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/codegen/ContractCompiler.cpp
diff options
context:
space:
mode:
authorChristian Parpart <christian@parpart.family>2018-10-15 18:30:00 +0800
committerGitHub <noreply@github.com>2018-10-15 18:30:00 +0800
commitb2b845d6def4d28215c5d591589555bd8f4ea6ab (patch)
treea8501e929c94a7d36e69a6350e98c68556fe9038 /libsolidity/codegen/ContractCompiler.cpp
parentb965fd6e17f77e94afeb070a27182251b85b8ab3 (diff)
parent1304361b9c48438d5c55903492b5f11c3dac73e5 (diff)
downloaddexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.tar
dexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.tar.gz
dexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.tar.bz2
dexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.tar.lz
dexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.tar.xz
dexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.tar.zst
dexon-solidity-b2b845d6def4d28215c5d591589555bd8f4ea6ab.zip
Merge pull request #5220 from ethereum/libjulia-to-libyul
Renames `libjulia` directory to `libyul` & namespace `dev::julia` to `dev::yul`
Diffstat (limited to 'libsolidity/codegen/ContractCompiler.cpp')
-rw-r--r--libsolidity/codegen/ContractCompiler.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 3a0fccfb..c845da8f 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -494,21 +494,21 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
{
unsigned startStackHeight = m_context.stackHeight();
- julia::ExternalIdentifierAccess identifierAccess;
- identifierAccess.resolve = [&](assembly::Identifier const& _identifier, julia::IdentifierContext, bool)
+ yul::ExternalIdentifierAccess identifierAccess;
+ identifierAccess.resolve = [&](assembly::Identifier const& _identifier, yul::IdentifierContext, bool)
{
auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
if (ref == _inlineAssembly.annotation().externalReferences.end())
return size_t(-1);
return ref->second.valueSize;
};
- identifierAccess.generateCode = [&](assembly::Identifier const& _identifier, julia::IdentifierContext _context, julia::AbstractAssembly& _assembly)
+ identifierAccess.generateCode = [&](assembly::Identifier const& _identifier, yul::IdentifierContext _context, yul::AbstractAssembly& _assembly)
{
auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
solAssert(ref != _inlineAssembly.annotation().externalReferences.end(), "");
Declaration const* decl = ref->second.declaration;
solAssert(!!decl, "");
- if (_context == julia::IdentifierContext::RValue)
+ if (_context == yul::IdentifierContext::RValue)
{
int const depositBefore = _assembly.stackHeight();
solAssert(!!decl->type(), "Type of declaration required but not yet determined.");