diff options
| author | chriseth <chris@ethereum.org> | 2018-12-20 01:06:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 01:06:13 +0800 |
| commit | 1df8f40cd2fd7b47698d847907b8ca7b47eb488d (patch) | |
| tree | 5ed5816fe2d1a8a207e750d39884aca7957c8289 /libyul/ObjectParser.h | |
| parent | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (diff) | |
| parent | ddf54b21d1d002903624f61173ab4af197f50053 (diff) | |
| download | dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.gz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.bz2 dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.lz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.xz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.zst dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.zip | |
Merge pull request #5697 from ethereum/develop
Merge develop into release for 0.5.2
Diffstat (limited to 'libyul/ObjectParser.h')
| -rw-r--r-- | libyul/ObjectParser.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libyul/ObjectParser.h b/libyul/ObjectParser.h index 1d88a119..e39f24cd 100644 --- a/libyul/ObjectParser.h +++ b/libyul/ObjectParser.h @@ -22,6 +22,7 @@ #include <libyul/YulString.h> #include <libyul/Object.h> +#include <libyul/Dialect.h> #include <liblangutil/ErrorReporter.h> #include <liblangutil/ParserBase.h> @@ -46,9 +47,9 @@ class ObjectParser: public langutil::ParserBase public: explicit ObjectParser( langutil::ErrorReporter& _errorReporter, - yul::AsmFlavour _flavour = yul::AsmFlavour::Loose + std::shared_ptr<Dialect> _dialect ): - ParserBase(_errorReporter), m_flavour(_flavour) {} + ParserBase(_errorReporter), m_dialect(std::move(_dialect)) {} /// Parses a Yul object. /// Falls back to code-only parsing if the source starts with `{`. @@ -66,7 +67,7 @@ private: YulString parseUniqueName(Object const* _containingObject); void addNamedSubObject(Object& _container, YulString _name, std::shared_ptr<ObjectNode> _subObject); - yul::AsmFlavour m_flavour; + std::shared_ptr<Dialect> m_dialect; }; } |