aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chriswhward@gmail.com>2018-08-01 20:22:09 +0800
committerChris Ward <chriswhward@gmail.com>2018-08-01 20:22:09 +0800
commit3c919766e8f5b9091503adc91f59e905cce01831 (patch)
treeb854112ba502990e53184dd25d1c86924066705e
parenta6cb6777c9ff61097428ee0433390336e379e27a (diff)
downloaddexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.tar
dexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.tar.gz
dexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.tar.bz2
dexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.tar.lz
dexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.tar.xz
dexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.tar.zst
dexon-solidity-3c919766e8f5b9091503adc91f59e905cce01831.zip
Changes after rebasing
-rw-r--r--docs/types.rst30
1 files changed, 18 insertions, 12 deletions
diff --git a/docs/types.rst b/docs/types.rst
index cab2ec5c..c324535e 100644
--- a/docs/types.rst
+++ b/docs/types.rst
@@ -199,25 +199,31 @@ The ``.gas()`` option is available on all three methods, while the ``.value()``
Contract Types
--------------
-Every :ref:`contract<contracts>` defines its own type. Contracts can be implicitly converted
-to contracts they inherit from. They can be explicitly converted from and to ``address`` types.
+Every :ref:`contract<contracts>` defines its own type, defined by its smart
+contract that you can call from another contract. For example (where ``Token``
+is a contract) ::
-Contracts can also be instantiated (which here means they are newly created). You can find more details in
-the :ref:`'Contracts via new'<creating-contracts>` section.
+ Token token = new Token();
-The data representation of a contract is identical to that of the ``address`` type and
-this type is also used in the :ref:`ABI<ABI>`.
-
-Contracts do not support any operators.
-
-The members of contract types are the external functions of the contract including
-public state variables.
+Contracts can be implicitly converted to contracts they inherit from, and can be explicitly converted from and to the ``address`` type.
.. note::
Starting with version 0.5.0 contracts do not derive from the address type, but can still be explicitly converted to address.
-.. index:: byte array, bytes32
+Contracts can also be instantiated (which means they are newly created). You
+can find more details in the :ref:`'Contracts via new'<creating-contracts>`
+section.
+
+The data representation of a contract is identical to that of the ``address``
+type and this type is also used in the :ref:`ABI<ABI>`.
+
+Contracts do not support any operators.
+
+The members of contract types are the external functions of the contract
+including public state variables.
+
+.. index:: byte array, bytes32
Fixed-size byte arrays
----------------------