aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-02-11 05:41:40 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-02-11 05:41:40 +0800
commitfd7ffedead51f77135250dca29326c890f3632a2 (patch)
tree26c0b04328493181521d7a5d7025b19e81a99b40
parent8a3d4a0500e98dbca83c0217d141fcb4860986e3 (diff)
downloaddexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.tar
dexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.tar.gz
dexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.tar.bz2
dexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.tar.lz
dexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.tar.xz
dexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.tar.zst
dexon-solidity-fd7ffedead51f77135250dca29326c890f3632a2.zip
Use different wording for assert
-rw-r--r--Changelog.md2
-rw-r--r--docs/miscellaneous.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md
index e8656ac8..d383ba42 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,7 @@
### 0.4.10 (unreleased)
Features:
- * Add ``assert(condition)`` to abort execution.
+ * Add ``assert(condition)``, which throws if condition is false.
* Type system: Support explicit conversion of external function to address.
Bugfixes:
diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst
index 27289daf..a64ceeb2 100644
--- a/docs/miscellaneous.rst
+++ b/docs/miscellaneous.rst
@@ -460,7 +460,7 @@ 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 not met
+- ``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