cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into HEAD

Browse Source
This commit is contained in:
chriseth
2020-09-29 09:53:50 +02:00
parent c0954be254 d23aff4cbb
commit 4bdec8107c
509 changed files with 1813 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contracts/constant-state-variables.rst
+1 -1
View File
@@ -26,7 +26,7 @@ Not all types for constants and immutables are implemented at this time. The onl
::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract C {
uint constant X = 32**22 + 8;
docs/contracts/inheritance.rst
+7 -7
View File
@@ -39,7 +39,7 @@ Details are given in the following example.
::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract Owned {
@@ -127,7 +127,7 @@ destruction request. The way this is done is problematic, as
seen in the following example::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract owned {
constructor() { owner = msg.sender; }
@@ -157,7 +157,7 @@ explicitly in the final override, but this function will bypass
``Base1.destroy``. The way around this is to use ``super``::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract owned {
constructor() { owner = msg.sender; }
@@ -214,7 +214,7 @@ The following example demonstrates changing mutability and visibility:
::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract Base
{
@@ -405,7 +405,7 @@ equivalent to ``constructor() {}``. For example:
::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
abstract contract A {
uint public a;
@@ -442,7 +442,7 @@ linearization rules explained below. If the base constructors have arguments,
derived contracts need to specify all of them. This can be done in two ways::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract Base {
uint x;
@@ -523,7 +523,7 @@ One area where inheritance linearization is especially important and perhaps not
::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract Base1 {
constructor() {}