diff options
| author | Christian Parpart <christian@parpart.family> | 2018-10-15 18:30:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 18:30:00 +0800 |
| commit | b2b845d6def4d28215c5d591589555bd8f4ea6ab (patch) | |
| tree | a8501e929c94a7d36e69a6350e98c68556fe9038 /libsolidity/codegen/CompilerContext.cpp | |
| parent | b965fd6e17f77e94afeb070a27182251b85b8ab3 (diff) | |
| parent | 1304361b9c48438d5c55903492b5f11c3dac73e5 (diff) | |
| download | dexon-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/CompilerContext.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index 71b615b8..089386b5 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -318,10 +318,10 @@ void CompilerContext::appendInlineAssembly( { int startStackHeight = stackHeight(); - julia::ExternalIdentifierAccess identifierAccess; + yul::ExternalIdentifierAccess identifierAccess; identifierAccess.resolve = [&]( assembly::Identifier const& _identifier, - julia::IdentifierContext, + yul::IdentifierContext, bool ) { @@ -330,15 +330,15 @@ void CompilerContext::appendInlineAssembly( }; identifierAccess.generateCode = [&]( assembly::Identifier const& _identifier, - julia::IdentifierContext _context, - julia::AbstractAssembly& _assembly + yul::IdentifierContext _context, + yul::AbstractAssembly& _assembly ) { auto it = std::find(_localVariables.begin(), _localVariables.end(), _identifier.name); solAssert(it != _localVariables.end(), ""); int stackDepth = _localVariables.end() - it; int stackDiff = _assembly.stackHeight() - startStackHeight + stackDepth; - if (_context == julia::IdentifierContext::LValue) + if (_context == yul::IdentifierContext::LValue) stackDiff -= 1; if (stackDiff < 1 || stackDiff > 16) BOOST_THROW_EXCEPTION( @@ -346,7 +346,7 @@ void CompilerContext::appendInlineAssembly( errinfo_sourceLocation(_identifier.location) << errinfo_comment("Stack too deep (" + to_string(stackDiff) + "), try removing local variables.") ); - if (_context == julia::IdentifierContext::RValue) + if (_context == yul::IdentifierContext::RValue) _assembly.appendInstruction(dupInstruction(stackDiff)); else { |