diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-09 04:59:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 04:59:07 +0800 |
| commit | 478012a00058767ab82b17a8cb21bfa5f6e7ee44 (patch) | |
| tree | 5538a5522d23cf886f1f038f734aa34ad94a29c1 /libevmasm/Assembly.cpp | |
| parent | d634d20b5b0dac3e5caf1741073fa123fdd56ab9 (diff) | |
| parent | d3c3fd20796dd18b7213938bd0ce89e8aeb9d6f3 (diff) | |
| download | dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.tar dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.tar.gz dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.tar.bz2 dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.tar.lz dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.tar.xz dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.tar.zst dexon-solidity-478012a00058767ab82b17a8cb21bfa5f6e7ee44.zip | |
Merge pull request #4772 from ethereum/asm-json
Add tests for the assembler object (and avoid misusing string{} for u256)
Diffstat (limited to 'libevmasm/Assembly.cpp')
| -rw-r--r-- | libevmasm/Assembly.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index b71bc80c..28ae9577 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -264,7 +264,7 @@ Json::Value Assembly::assemblyJSON(StringMap const& _sourceCodes) const createJsonValue("PUSH [ErrorTag]", i.location().start, i.location().end, "")); else collection.append( - createJsonValue("PUSH [tag]", i.location().start, i.location().end, string(i.data()))); + createJsonValue("PUSH [tag]", i.location().start, i.location().end, dev::toString(i.data()))); break; case PushSub: collection.append( @@ -290,7 +290,7 @@ Json::Value Assembly::assemblyJSON(StringMap const& _sourceCodes) const break; case Tag: collection.append( - createJsonValue("tag", i.location().start, i.location().end, string(i.data()))); + createJsonValue("tag", i.location().start, i.location().end, dev::toString(i.data()))); collection.append( createJsonValue("JUMPDEST", i.location().start, i.location().end)); break; |