aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-08-11 03:22:49 +0800
committerGitHub <noreply@github.com>2016-08-11 03:22:49 +0800
commit5a3740378f395f376bbdad69a2b735cf31f67615 (patch)
tree9ce7b12205a9f2e82486cf83109de62e5102f9c9
parentb7c26f4628b352a4a6ed668e3dd33e8394cc804c (diff)
parent279518a5363366651fa22e50fd5e94b096f34f5a (diff)
downloaddexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.tar
dexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.tar.gz
dexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.tar.bz2
dexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.tar.lz
dexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.tar.xz
dexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.tar.zst
dexon-solidity-5a3740378f395f376bbdad69a2b735cf31f67615.zip
Merge pull request #824 from Denton-L/fix-typo
Fix typo
-rw-r--r--docs/control-structures.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 9d7ebeac..2f131c55 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -339,7 +339,7 @@ these curly braces, the following can be used (see the later sections for more d
- literals, i.e. ``0x123``, ``42`` or ``"abc"`` (strings up to 32 characters)
- opcodes (in "instruction style"), e.g. ``mload sload dup1 sstore``, for a list see below
- - opcode in functional style, e.g. ``add(1, mlod(0))``
+ - opcodes in functional style, e.g. ``add(1, mlod(0))``
- labels, e.g. ``name:``
- variable declarations, e.g. ``let x := 7`` or ``let x := add(y, 3)``
- identifiers (externals, labels or assembly-local variables), e.g. ``jump(name)``, ``3 x add``
@@ -354,7 +354,7 @@ This document does not want to be a full description of the Ethereum virtual mac
following list can be used as a reference of its opcodes.
If an opcode takes arguments (always from the top of the stack), they are given in parentheses.
-Note that the order of arguments can be seed to be reversed in non-functional style (explained below).
+Note that the order of arguments can be seen as being reversed compared to the instructional style (explained below).
Opcodes marked with ``-`` do not push an item onto the stack, those marked with ``*`` are
special and all others push exactly one item onte the stack.