From 2456c6d5038aab1c815d0b0875ef6588e336ad87 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 10 Dec 2019 17:22:20 +0000 Subject: [PATCH] Update documentation about (reserved) keywords --- Changelog.md | 2 +- docs/060-breaking-changes.rst | 2 +- docs/miscellaneous.rst | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3fda67fca..e65221425 100644 --- a/Changelog.md +++ b/Changelog.md @@ -11,7 +11,7 @@ Breaking changes: * Commandline Interface: Add option to disable or choose hash method between IPFS and Swarm for the bytecode metadata. * General: Disallow explicit conversions from external function types to ``address`` and add a member called ``address`` to them as replacement. * General: Enable Yul optimizer as part of standard optimization. - * General: New reserved keyword: ``virtual``. + * General: New reserved keywords: ``override``, ``receive``, and ``virtual``. * General: ``private`` cannot be used together with ``virtual``. * General: Split unnamed fallback functions into two cases defined using ``fallback()`` and ``receive()``. * Inheritance: State variable shadowing is now disallowed. diff --git a/docs/060-breaking-changes.rst b/docs/060-breaking-changes.rst index 5f906cd19..1d327b824 100644 --- a/docs/060-breaking-changes.rst +++ b/docs/060-breaking-changes.rst @@ -30,7 +30,7 @@ This section lists purely syntactic changes that do not affect the behavior of e longer possible to resize storage arrays assigning a new value to their length. Use ``push()``, ``push(value)`` or ``pop()`` instead, or assign a full array, which will of course overwrite existing content. -* New reserved keywords: ``virtual``. +* New reserved keywords: ``override``, ``receive``, and ``virtual``. * The names of variables declared in inline assembly may no longer end in ``_slot`` or ``_offset``. diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst index 24ae5557c..58836cba5 100644 --- a/docs/miscellaneous.rst +++ b/docs/miscellaneous.rst @@ -719,9 +719,9 @@ These keywords are reserved in Solidity. They might become part of the syntax in ``abstract``, ``after``, ``alias``, ``apply``, ``auto``, ``case``, ``catch``, ``copyof``, ``default``, ``define``, ``final``, ``immutable``, ``implements``, ``in``, ``inline``, ``let``, ``macro``, ``match``, -``mutable``, ``null``, ``of``, ``override``, ``partial``, ``promise``, ``reference``, ``relocatable``, +``mutable``, ``null``, ``of``, ``partial``, ``promise``, ``reference``, ``relocatable``, ``sealed``, ``sizeof``, ``static``, ``supports``, ``switch``, ``try``, ``typedef``, ``typeof``, -``unchecked``, ``virtual``. +``unchecked``. Language Grammar ================