diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-01-26 21:15:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 21:15:09 +0800 |
| commit | 2122d2d7281504aae91063f48790803549e4972d (patch) | |
| tree | 2bf3c39a5478da864aed34cc7d120facc562681e /libsolidity/inlineasm/AsmParser.h | |
| parent | ba9a04500217e301bec63cab4e0c0f1d9322646d (diff) | |
| parent | 873f2dddd635cb246af4368b9950123fb36d9b28 (diff) | |
| download | dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.tar dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.tar.gz dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.tar.bz2 dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.tar.lz dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.tar.xz dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.tar.zst dexon-solidity-2122d2d7281504aae91063f48790803549e4972d.zip | |
Merge pull request #1606 from ethereum/inlineasm-instr-shadowing
Avoid shadowing of inline assembly instructions with variables
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.h')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libsolidity/inlineasm/AsmParser.h b/libsolidity/inlineasm/AsmParser.h index 8b56ab90..643548dd 100644 --- a/libsolidity/inlineasm/AsmParser.h +++ b/libsolidity/inlineasm/AsmParser.h @@ -64,6 +64,7 @@ protected: Statement parseStatement(); /// Parses a functional expression that has to push exactly one stack element Statement parseExpression(); + std::map<std::string, dev::solidity::Instruction> const& instructions(); Statement parseElementaryOperation(bool _onlySinglePusher = false); VariableDeclaration parseVariableDeclaration(); FunctionalInstruction parseFunctionalInstruction(Statement&& _instruction); |