diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2017-03-04 01:25:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-04 01:25:50 +0800 |
| commit | cfbbd89dafca57e450f6b4433eb258e6a7f52310 (patch) | |
| tree | 52a31928bfbe1c32ada53ec1008438a931cb2c98 /docs/miscellaneous.rst | |
| parent | 6bfd894f46d12f78e2ea49a58f96763a077bcf49 (diff) | |
| parent | 4b1e8111cc2469808d08e1718d3edd64b2cc4484 (diff) | |
| download | dexon-solidity-cfbbd89dafca57e450f6b4433eb258e6a7f52310.tar.gz dexon-solidity-cfbbd89dafca57e450f6b4433eb258e6a7f52310.tar.zst dexon-solidity-cfbbd89dafca57e450f6b4433eb258e6a7f52310.zip | |
Merge pull request #1702 from ethereum/assertError
Change effect of assert to invalid opcode.
Diffstat (limited to 'docs/miscellaneous.rst')
| -rw-r--r-- | docs/miscellaneous.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst index 7b0305d5..e3ec0efb 100644 --- a/docs/miscellaneous.rst +++ b/docs/miscellaneous.rst @@ -435,7 +435,7 @@ The following is the order of precedence for operators, listed in order of evalu | *16* | Comma operator | ``,`` | +------------+-------------------------------------+--------------------------------------------+ -.. index:: block, coinbase, difficulty, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, now, gas price, origin, assert, revert, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, send +.. index:: block, coinbase, difficulty, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, now, gas price, origin, revert, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, send Global Variables ================ @@ -461,7 +461,6 @@ Global Variables - ``ecrecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) returns (address)``: recover address associated with the public key from elliptic curve signature, return zero on error - ``addmod(uint x, uint y, uint k) returns (uint)``: compute ``(x + y) % k`` where the addition is performed with arbitrary precision and does not wrap around at ``2**256`` - ``mulmod(uint x, uint y, uint k) returns (uint)``: compute ``(x * y) % k`` where the multiplication is performed with arbitrary precision and does not wrap around at ``2**256`` -- ``assert(bool condition)``: throws if the condition is false - ``this`` (current contract's type): the current contract, explicitly convertible to ``address`` - ``super``: the contract one level higher in the inheritance hierarchy - ``selfdestruct(address recipient)``: destroy the current contract, sending its funds to the given address |