aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-01-25 04:43:48 +0800
committerchriseth <c@ethdev.com>2016-01-25 04:43:48 +0800
commit194679f77ada30b04f483e96197e890e41a0c22c (patch)
tree82ed4cec81cb9dd81cbdc3b8134b80fb7e3de780 /docs
parent67c855c583042ddee6261a9921239a3afd086c14 (diff)
parent51caa04238ce78420e6efc2ce15842effddf3856 (diff)
downloaddexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.tar
dexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.tar.gz
dexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.tar.bz2
dexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.tar.lz
dexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.tar.xz
dexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.tar.zst
dexon-solidity-194679f77ada30b04f483e96197e890e41a0c22c.zip
Merge pull request #326 from guanqun/cond-expr
support conditional expression _ ? _ : _
Diffstat (limited to 'docs')
-rw-r--r--docs/control-structures.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index c833fbfc..4becfcf1 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -9,7 +9,7 @@ Control Structures
Most of the control structures from C/JavaScript are available in Solidity
except for `switch` and `goto`. So
-there is: `if`, `else`, `while`, `for`, `break`, `continue`, `return`, with
+there is: `if`, `else`, `while`, `for`, `break`, `continue`, `return`, `? :`, with
the usual semantics known from C / JavaScript.
Parentheses can *not* be omitted for conditionals, but curly brances can be omitted