diff options
| author | Denton Liu <liu.denton+github@gmail.com> | 2016-05-19 03:53:14 +0800 |
|---|---|---|
| committer | Denton Liu <liu.denton+github@gmail.com> | 2016-05-19 03:53:14 +0800 |
| commit | d1529235488685846a92ba82f78c37c31ad1463d (patch) | |
| tree | b96cd0d8e3dc265faa8bbfd5686a050ab0d2dacd | |
| parent | 7c22a387f34d5cbc92b6b6ed78c281a480ba7739 (diff) | |
| download | dexon-solidity-d1529235488685846a92ba82f78c37c31ad1463d.tar.gz dexon-solidity-d1529235488685846a92ba82f78c37c31ad1463d.tar.zst dexon-solidity-d1529235488685846a92ba82f78c37c31ad1463d.zip | |
Fixed a badly resolved merge conflict
| -rw-r--r-- | docs/control-structures.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst index 8d1788d3..c26300a3 100644 --- a/docs/control-structures.rst +++ b/docs/control-structures.rst @@ -271,7 +271,7 @@ idea is that assembly libraries will be used to enhance the language in such way // by using o_code = new bytes(size) o_code := mload(0x40) // new "memory end" including padding - mstore(0x40, add(o_code, and(add(add(size, 0x20), 0x1f), bnot(0x1f)))) + mstore(0x40, add(o_code, and(add(add(size, 0x20), 0x1f), not(0x1f)))) // store length in memory mstore(o_code, size) // actually retrieve the code, this needs assembly @@ -359,7 +359,7 @@ The opcodes `pushi` and `jumpdest` cannot be used directly. +-------------------------+------+-----------------------------------------------------------------+ | exp(x, y) | | x to the power of y | +-------------------------+------+-----------------------------------------------------------------+ -| bnot(x) | | ~x, every bit of x is negated | +| not(x) | | ~x, every bit of x is negated | +-------------------------+------+-----------------------------------------------------------------+ | lt(x, y) | | 1 if x < y, 0 otherwise | +-------------------------+------+-----------------------------------------------------------------+ @@ -371,7 +371,7 @@ The opcodes `pushi` and `jumpdest` cannot be used directly. +-------------------------+------+-----------------------------------------------------------------+ | eq(x, y) | | 1 if x == y, 0 otherwise | +-------------------------+------+-----------------------------------------------------------------+ -| not(x) | | 1 if x == 0, 0 otherwise | +| iszero(x) | | 1 if x == 0, 0 otherwise | +-------------------------+------+-----------------------------------------------------------------+ | and(x, y) | | bitwise and of x and y | +-------------------------+------+-----------------------------------------------------------------+ |