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/style-guide.rst
+6 -12
View File
@@ -300,8 +300,7 @@ Within a grouping, place the ``view`` and ``pure`` functions last.
Yes::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract A {
constructor() {
// ...
@@ -337,8 +336,7 @@ Yes::
No::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
contract A {
// External functions
@@ -758,8 +756,7 @@ manner as modifiers if the function declaration is long or hard to read.
Yes::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
// Base contracts just to make this compile
contract B {
constructor(uint) {
@@ -790,8 +787,7 @@ Yes::
No::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
// Base contracts just to make this compile
contract B {
@@ -1012,8 +1008,7 @@ As shown in the example below, if the contract name is ``Congress`` and the libr
Yes::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
// Owned.sol
contract Owned {
@@ -1048,8 +1043,7 @@ and in ``Congress.sol``::
No::
// SPDX-License-Identifier: GPL-3.0
pragma solidity >0.6.99 <0.9.0;
pragma solidity >=0.7.0 <0.9.0;
// owned.sol
contract owned {