aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmAnalysis.h
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-01-10 22:25:53 +0800
committerGitHub <noreply@github.com>2018-01-10 22:25:53 +0800
commita75d5333d8ae614316b9c707e2022c2d144eaf33 (patch)
tree24ae6722975b86c4702d12feb825f3e3aa8663c5 /libsolidity/inlineasm/AsmAnalysis.h
parent2548228b365d56612e2f039f735be0fdf6ce0807 (diff)
parent8b20a7cd53b04a4b3b3e26df4ddd9ad81d28bb1b (diff)
downloaddexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar
dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.gz
dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.bz2
dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.lz
dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.xz
dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.zst
dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.zip
Merge pull request #3317 from ethereum/looseStrictAsm
Split inline assembly into loose and strict flavour.
Diffstat (limited to 'libsolidity/inlineasm/AsmAnalysis.h')
-rw-r--r--libsolidity/inlineasm/AsmAnalysis.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/inlineasm/AsmAnalysis.h b/libsolidity/inlineasm/AsmAnalysis.h
index 00a33db3..7a81dbf8 100644
--- a/libsolidity/inlineasm/AsmAnalysis.h
+++ b/libsolidity/inlineasm/AsmAnalysis.h
@@ -54,9 +54,9 @@ public:
explicit AsmAnalyzer(
AsmAnalysisInfo& _analysisInfo,
ErrorReporter& _errorReporter,
- bool _julia = false,
+ AsmFlavour _flavour = AsmFlavour::Loose,
julia::ExternalIdentifierAccess::Resolver const& _resolver = julia::ExternalIdentifierAccess::Resolver()
- ): m_resolver(_resolver), m_info(_analysisInfo), m_errorReporter(_errorReporter), m_julia(_julia) {}
+ ): m_resolver(_resolver), m_info(_analysisInfo), m_errorReporter(_errorReporter), m_flavour(_flavour) {}
bool analyze(assembly::Block const& _block);
@@ -97,7 +97,7 @@ private:
std::set<Scope::Variable const*> m_activeVariables;
AsmAnalysisInfo& m_info;
ErrorReporter& m_errorReporter;
- bool m_julia = false;
+ AsmFlavour m_flavour = AsmFlavour::Loose;
};
}