cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch namespaces.

Browse Source
This commit is contained in:
chriseth 2018-12-04 15:36:03 +01:00
parent 0b1125281a
commit 7ee1ddc172
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsolidity/codegen/AsmCodeGen.h
View File

@ -24,25 +24,28 @@
#include <functional> #include <functional>
namespace yul
{
struct Block;
}
namespace dev namespace dev
{ {
namespace eth namespace eth
{ {
class Assembly; class Assembly;
} }
}
namespace yul namespace solidity
{ {
struct Block;
class CodeGenerator class CodeGenerator
{ {
public: public:
/// Performs code generation and appends generated to _assembly. /// Performs code generation and appends generated to _assembly.
static void assemble( static void assemble(
Block const& _parsedData, yul::Block const& _parsedData,
AsmAnalysisInfo& _analysisInfo, yul::AsmAnalysisInfo& _analysisInfo,
dev::eth::Assembly& _assembly, dev::eth::Assembly& _assembly,
yul::ExternalIdentifierAccess const& _identifierAccess = yul::ExternalIdentifierAccess(), yul::ExternalIdentifierAccess const& _identifierAccess = yul::ExternalIdentifierAccess(),
bool _useNamedLabelsForFunctions = false bool _useNamedLabelsForFunctions = false
@ -50,3 +53,4 @@ public:
}; };
} }
}

2
libsolidity/codegen/CompilerContext.cpp
View File

@ -395,7 +395,7 @@ void CompilerContext::appendInlineAssembly(
} }
solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block."); solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
yul::CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess, _system); CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess, _system);
// Reset the source location to the one of the node (instead of the CODEGEN source location) // Reset the source location to the one of the node (instead of the CODEGEN source location)
updateSourceLocation(); updateSourceLocation();

2
libsolidity/codegen/ContractCompiler.cpp
View File

@ -618,7 +618,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
} }
}; };
solAssert(_inlineAssembly.annotation().analysisInfo, ""); solAssert(_inlineAssembly.annotation().analysisInfo, "");
yul::CodeGenerator::assemble( CodeGenerator::assemble(
_inlineAssembly.operations(), _inlineAssembly.operations(),
*_inlineAssembly.annotation().analysisInfo, *_inlineAssembly.annotation().analysisInfo,
m_context.nonConstAssembly(), m_context.nonConstAssembly(),

2
libsolidity/interface/AssemblyStack.cpp
View File

@ -112,7 +112,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
{ {
MachineAssemblyObject object; MachineAssemblyObject object;
eth::Assembly assembly; eth::Assembly assembly;
yul::CodeGenerator::assemble(*m_parserResult->code, *m_parserResult->analysisInfo, assembly); CodeGenerator::assemble(*m_parserResult->code, *m_parserResult->analysisInfo, assembly);
object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble()); object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble());
object.assembly = assembly.assemblyString(); object.assembly = assembly.assemblyString();
return object; return object;