diff options
| author | chriseth <chris@ethereum.org> | 2017-07-03 19:17:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 19:17:52 +0800 |
| commit | aa262d5c8febadd067539c1e05232b1b8c91b4f5 (patch) | |
| tree | 1cfd7045aecb5ed75b04ecadc3cf499f73783e5b /libsolidity | |
| parent | 0c7530a8529c5cb45e1b349dc700923b2e685dfc (diff) | |
| parent | 7798a2711213823de409577226f2f1c7f7f2e861 (diff) | |
| download | dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.tar dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.tar.gz dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.tar.bz2 dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.tar.lz dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.tar.xz dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.tar.zst dexon-solidity-aa262d5c8febadd067539c1e05232b1b8c91b4f5.zip | |
Merge pull request #2503 from ethereum/julia-analyzer
Add Julia-mode to AsmAnalyzer/CodeGen
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/inlineasm/AsmCodeGen.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/interface/AssemblyStack.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp index 2bbd1b70..74743737 100644 --- a/libsolidity/inlineasm/AsmCodeGen.cpp +++ b/libsolidity/inlineasm/AsmCodeGen.cpp @@ -137,7 +137,6 @@ private: eth::Assembly& m_assembly; }; - void assembly::CodeGenerator::assemble( Block const& _parsedData, AsmAnalysisInfo& _analysisInfo, @@ -146,5 +145,5 @@ void assembly::CodeGenerator::assemble( ) { EthAssemblyAdapter assemblyAdapter(_assembly); - julia::CodeTransform(assemblyAdapter, _analysisInfo, false, _identifierAccess)(_parsedData); + julia::CodeTransform(assemblyAdapter, _analysisInfo, false, false, _identifierAccess)(_parsedData); } diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp index 2d85895e..23524bb3 100644 --- a/libsolidity/interface/AssemblyStack.cpp +++ b/libsolidity/interface/AssemblyStack.cpp @@ -72,7 +72,7 @@ bool AssemblyStack::analyze(assembly::Block const& _block, Scanner const* _scann bool AssemblyStack::analyzeParsed() { m_analysisInfo = make_shared<assembly::AsmAnalysisInfo>(); - assembly::AsmAnalyzer analyzer(*m_analysisInfo, m_errorReporter); + assembly::AsmAnalyzer analyzer(*m_analysisInfo, m_errorReporter, m_language == Language::JULIA); m_analysisSuccessful = analyzer.analyze(*m_parserResult); return m_analysisSuccessful; } @@ -100,7 +100,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const { MachineAssemblyObject object; julia::EVMAssembly assembly(true); - julia::CodeTransform(assembly, *m_analysisInfo, true)(*m_parserResult); + julia::CodeTransform(assembly, *m_analysisInfo, m_language == Language::JULIA, true)(*m_parserResult); object.bytecode = make_shared<eth::LinkerObject>(assembly.finalize()); /// TOOD: fill out text representation return object; |