diff options
author | chriseth <chris@ethereum.org> | 2018-12-03 22:49:23 +0800 |
---|---|---|
committer | chriseth <chris@ethereum.org> | 2018-12-04 19:06:33 +0800 |
commit | 99db4e3ff45c2a8d5d9c645774f099b82b7618ec (patch) | |
tree | 9f61e6b6192141bf9233f49a4a2c36e5c26ca8df /libsolidity/interface/AssemblyStack.cpp | |
parent | e49f37be7f64d0306c2e63cea81eb98aa1bc85f1 (diff) | |
download | dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.tar dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.tar.gz dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.tar.bz2 dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.tar.lz dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.tar.xz dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.tar.zst dexon-solidity-99db4e3ff45c2a8d5d9c645774f099b82b7618ec.zip |
Introduce the concept of builtin functions.
Diffstat (limited to 'libsolidity/interface/AssemblyStack.cpp')
-rw-r--r-- | libsolidity/interface/AssemblyStack.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp index f5eb7e41..ff345089 100644 --- a/libsolidity/interface/AssemblyStack.cpp +++ b/libsolidity/interface/AssemblyStack.cpp @@ -43,19 +43,19 @@ using namespace dev::solidity; namespace { -yul::AsmFlavour languageToAsmFlavour(AssemblyStack::Language _language) +yul::Dialect languageToDialect(AssemblyStack::Language _language) { switch (_language) { case AssemblyStack::Language::Assembly: - return yul::AsmFlavour::Loose; + return yul::Dialect::looseAssemblyForEVM(); case AssemblyStack::Language::StrictAssembly: - return yul::AsmFlavour::Strict; + return yul::Dialect::strictAssemblyForEVM(); case AssemblyStack::Language::Yul: - return yul::AsmFlavour::Yul; + return yul::Dialect::yul(); } solAssert(false, ""); - return yul::AsmFlavour::Yul; + return yul::Dialect::yul(); } } @@ -72,7 +72,7 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string m_errors.clear(); m_analysisSuccessful = false; m_scanner = make_shared<Scanner>(CharStream(_source, _sourceName)); - m_parserResult = yul::ObjectParser(m_errorReporter, languageToAsmFlavour(m_language)).parse(m_scanner, false); + m_parserResult = yul::ObjectParser(m_errorReporter, languageToDialect(m_language)).parse(m_scanner, false); if (!m_errorReporter.errors().empty()) return false; solAssert(m_parserResult, ""); @@ -93,7 +93,7 @@ bool AssemblyStack::analyzeParsed() solAssert(m_parserResult, ""); solAssert(m_parserResult->code, ""); m_parserResult->analysisInfo = make_shared<yul::AsmAnalysisInfo>(); - yul::AsmAnalyzer analyzer(*m_parserResult->analysisInfo, m_errorReporter, m_evmVersion, boost::none, languageToAsmFlavour(m_language)); + yul::AsmAnalyzer analyzer(*m_parserResult->analysisInfo, m_errorReporter, m_evmVersion, boost::none, languageToDialect(m_language)); m_analysisSuccessful = analyzer.analyze(*m_parserResult->code); return m_analysisSuccessful; } |