aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-06-09 21:38:23 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-07-03 17:13:36 +0800
commit7798a2711213823de409577226f2f1c7f7f2e861 (patch)
tree97ea20940e78e30278c4462f6b8b9b56bae3cf39 /libsolidity
parenta33a5e3c0846e7db8d87fdd5de890a63d359581d (diff)
downloaddexon-solidity-7798a2711213823de409577226f2f1c7f7f2e861.tar.gz
dexon-solidity-7798a2711213823de409577226f2f1c7f7f2e861.tar.zst
dexon-solidity-7798a2711213823de409577226f2f1c7f7f2e861.zip
Add Julia mode as an option to EVMCodeTransform
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/inlineasm/AsmCodeGen.cpp3
-rw-r--r--libsolidity/interface/AssemblyStack.cpp2
2 files changed, 2 insertions, 3 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 7cda096e..23524bb3 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -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;