diff options
| author | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
| commit | 7a467bbf07a3b7dd8a05c4205b636273d0ece341 (patch) | |
| tree | 4ad992ea5b3608f960897ceefb644bff3815c2a7 /CompilerContext.h | |
| parent | 2d69b269e9da0a8cab7ee4741e8442afa52feecb (diff) | |
| parent | e4808305a17f43392e03e29546494d464c5f0895 (diff) | |
| download | dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.gz dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.zst dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
Diffstat (limited to 'CompilerContext.h')
| -rw-r--r-- | CompilerContext.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CompilerContext.h b/CompilerContext.h index 53d0a89a..34a3f97c 100644 --- a/CompilerContext.h +++ b/CompilerContext.h @@ -122,7 +122,11 @@ public: eth::Assembly const& getAssembly() const { return m_asm; } /// @arg _sourceCodes is the map of input files to source code strings - void streamAssembly(std::ostream& _stream, StringMap const& _sourceCodes = StringMap()) const { m_asm.stream(_stream, "", _sourceCodes); } + /// @arg _inJsonFormat shows whether the out should be in Json format + void streamAssembly(std::ostream& _stream, StringMap const& _sourceCodes = StringMap(), bool _inJsonFormat = false) const + { + m_asm.stream(_stream, "", _sourceCodes, _inJsonFormat); + } bytes getAssembledBytecode(bool _optimize = false) { return m_asm.optimise(_optimize).assemble(); } |