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

Allow path syntax for super constructor calls

Browse Source
This commit is contained in:
Mathias Baumann
2020-10-13 14:32:11 +02:00
parent 0b7b174945
commit 006e5f2e1f
57 changed files with 579 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
+4 -4
View File
@@ -34,17 +34,17 @@ Optimized IR:
* !USE AT YOUR OWN RISK! *
*******************************************************/
object "D_10" {
object "D_9" {
code {
{
mstore(64, memoryguard(0x80))
if callvalue() { revert(0, 0) }
let _1 := datasize("D_10_deployed")
codecopy(0, dataoffset("D_10_deployed"), _1)
let _1 := datasize("D_9_deployed")
codecopy(0, dataoffset("D_9_deployed"), _1)
return(0, _1)
}
}
object "D_10_deployed" {
object "D_9_deployed" {
code {
{
mstore(64, memoryguard(0x80))
test/cmdlineTests/name_simplifier/output
+10 -10
View File
@@ -6,17 +6,17 @@ Optimized IR:
* !USE AT YOUR OWN RISK! *
*******************************************************/
object "C_56" {
object "C_59" {
code {
{
mstore(64, memoryguard(0x80))
if callvalue() { revert(0, 0) }
let _1 := datasize("C_56_deployed")
codecopy(0, dataoffset("C_56_deployed"), _1)
let _1 := datasize("C_59_deployed")
codecopy(0, dataoffset("C_59_deployed"), _1)
return(0, _1)
}
}
object "C_56_deployed" {
object "C_59_deployed" {
code {
{
mstore(64, memoryguard(0x80))
@@ -48,7 +48,7 @@ object "C_56" {
dst := add(dst, _2)
src := add(src, _2)
}
let ret, ret_1 := fun_sumArray_55(dst_1)
let ret, ret_1 := fun_sumArray_58(dst_1)
let memPos := allocateMemory(_1)
return(memPos, sub(abi_encode_uint256_t_string(memPos, ret, ret_1), memPos))
}
@@ -107,15 +107,15 @@ object "C_56" {
{
value := shr(mul(offset, 8), slot_value)
}
function fun_sumArray_55(vloc__s_19_mpos) -> vloc, vloc__24_mpos
function fun_sumArray_58(vloc__s_22_mpos) -> vloc, vloc__27_mpos
{
let _1 := mload(vloc__s_19_mpos)
let _1 := mload(vloc__s_22_mpos)
if iszero(lt(vloc, _1)) { invalid() }
let _2 := mload(mload(add(add(vloc__s_19_mpos, mul(vloc, 32)), 32)))
let _2 := mload(mload(add(add(vloc__s_22_mpos, mul(vloc, 32)), 32)))
let _3, _4 := storage_array_index_access$_t_struct$_S_storage(vloc, vloc)
sstore(_3, _2)
if iszero(lt(0x01, _1)) { invalid() }
let _5 := mload(mload(add(vloc__s_19_mpos, 64)))
let _5 := mload(mload(add(vloc__s_22_mpos, 64)))
if iszero(lt(vloc, 0x02)) { invalid() }
let slot := add(0x02, vloc)
let _6 := sload(slot)
@@ -124,7 +124,7 @@ object "C_56" {
sstore(slot, or(and(_6, not(mask)), and(shl(shiftBits, _5), mask)))
let _7, _8 := storage_array_index_access$_t_struct$_S_storage(0x02, vloc)
vloc := extract_from_storage_value_dynamict_uint256(sload(_7), _8)
vloc__24_mpos := convert_t_stringliteral_6490_to_t_string()
vloc__27_mpos := convert_t_stringliteral_6490_to_t_string()
}
function storage_array_index_access$_t_struct$_S_storage(array, index) -> slot, offset
{
test/cmdlineTests/recovery_standard_json/output.json
+1 -1
View File
@@ -4,4 +4,4 @@ pragma solidity >=0.0; contract Errort6 { using foo for ; /* missing type name
","message":"Expected type name","severity":"error","sourceLocation":{"end":94,"file":"A","start":93},"type":"ParserError"},{"component":"general","errorCode":"3796","formattedMessage":"A:2:84: Warning: Recovered in ContractDefinition at '}'.
pragma solidity >=0.0; contract Errort6 { using foo for ; /* missing type name */ }
^
","message":"Recovered in ContractDefinition at '}'.","severity":"warning","sourceLocation":{"end":120,"file":"A","start":119},"type":"Warning"}],"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"Errort6":[4]},"id":5,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":4,"linearizedBaseContracts":[4],"name":"Errort6","nodeType":"ContractDefinition","nodes":[],"scope":5,"src":"59:35:0"}],"src":"36:84:0"},"id":0}}}
","message":"Recovered in ContractDefinition at '}'.","severity":"warning","sourceLocation":{"end":120,"file":"A","start":119},"type":"Warning"}],"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"Errort6":[3]},"id":4,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":3,"linearizedBaseContracts":[3],"name":"Errort6","nodeType":"ContractDefinition","nodes":[],"scope":4,"src":"59:35:0"}],"src":"36:84:0"},"id":0}}}
test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
+16 -10
View File
@@ -1,6 +1,6 @@
{
"absolutePath": "a",
"id": 12,
"id": 13,
"nodeType": "SourceUnit",
"nodes":
[
@@ -9,7 +9,7 @@
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"id": 11,
"id": 12,
"name": "C",
"nodeType": "ContractDefinition",
"nodes":
@@ -46,7 +46,7 @@
},
{
"constant": false,
"id": 5,
"id": 6,
"mutability": "mutable",
"name": "s",
"nodeType": "VariableDeclaration",
@@ -56,9 +56,15 @@
"typeDescriptions": {},
"typeName":
{
"id": 4,
"name": "S",
"id": 5,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 4,
"name": "S",
"nodeType": "IdentifierPath",
"src": "42:1:1"
},
"src": "42:1:1",
"typeDescriptions": {}
},
@@ -67,7 +73,7 @@
{
"body":
{
"id": 9,
"id": 10,
"nodeType": "Block",
"src": "76:70:1",
"statements":
@@ -141,13 +147,13 @@
},
"evmVersion": %EVMVERSION%,
"externalReferences": [],
"id": 8,
"id": 9,
"nodeType": "InlineAssembly",
"src": "86:54:1"
}
]
},
"id": 10,
"id": 11,
"implemented": true,
"kind": "function",
"modifiers": [],
@@ -155,14 +161,14 @@
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 6,
"id": 7,
"nodeType": "ParameterList",
"parameters": [],
"src": "61:2:1"
},
"returnParameters":
{
"id": 7,
"id": 8,
"nodeType": "ParameterList",
"parameters": [],
"src": "76:0:1"
test/libsolidity/ASTJSON/contract_dep_order.json
+52 -100
View File
@@ -8,22 +8,22 @@
],
"B":
[
5
4
],
"C":
[
9
7
],
"D":
[
13
10
],
"E":
[
17
13
]
},
"id": 18,
"id": 14,
"nodeType": "SourceUnit",
"nodes":
[
@@ -41,7 +41,7 @@
"name": "A",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 18,
"scope": 14,
"src": "0:14:1"
},
{
@@ -51,25 +51,13 @@
{
"baseName":
{
"id": 3,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 2,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 1,
"src": "29:1:1"
},
"id": 2,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 1,
"src": "29:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$1",
"typeString": "contract A"
}
"src": "29:1:1"
},
"id": 4,
"id": 3,
"nodeType": "InheritanceSpecifier",
"src": "29:1:1"
}
@@ -80,16 +68,16 @@
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 5,
"id": 4,
"linearizedBaseContracts":
[
5,
4,
1
],
"name": "B",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 18,
"scope": 14,
"src": "15:19:1"
},
{
@@ -99,25 +87,13 @@
{
"baseName":
{
"id": 7,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 6,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "49:1:1"
},
"referencedDeclaration": 5,
"src": "49:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$5",
"typeString": "contract B"
}
"id": 5,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 4,
"src": "49:1:1"
},
"id": 8,
"id": 6,
"nodeType": "InheritanceSpecifier",
"src": "49:1:1"
}
@@ -125,21 +101,21 @@
"contractDependencies":
[
1,
5
4
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 9,
"id": 7,
"linearizedBaseContracts":
[
9,
5,
7,
4,
1
],
"name": "C",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 18,
"scope": 14,
"src": "35:19:1"
},
{
@@ -149,25 +125,13 @@
{
"baseName":
{
"id": 11,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 10,
"name": "C",
"nodeType": "IdentifierPath",
"referencedDeclaration": 9,
"src": "69:1:1"
},
"referencedDeclaration": 9,
"src": "69:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$9",
"typeString": "contract C"
}
"id": 8,
"name": "C",
"nodeType": "IdentifierPath",
"referencedDeclaration": 7,
"src": "69:1:1"
},
"id": 12,
"id": 9,
"nodeType": "InheritanceSpecifier",
"src": "69:1:1"
}
@@ -175,23 +139,23 @@
"contractDependencies":
[
1,
5,
9
4,
7
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 13,
"id": 10,
"linearizedBaseContracts":
[
13,
9,
5,
10,
7,
4,
1
],
"name": "D",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 18,
"scope": 14,
"src": "55:19:1"
},
{
@@ -201,25 +165,13 @@
{
"baseName":
{
"id": 15,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 14,
"name": "D",
"nodeType": "IdentifierPath",
"referencedDeclaration": 13,
"src": "89:1:1"
},
"referencedDeclaration": 13,
"src": "89:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_D_$13",
"typeString": "contract D"
}
"id": 11,
"name": "D",
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "89:1:1"
},
"id": 16,
"id": 12,
"nodeType": "InheritanceSpecifier",
"src": "89:1:1"
}
@@ -227,25 +179,25 @@
"contractDependencies":
[
1,
5,
9,
13
4,
7,
10
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 17,
"id": 13,
"linearizedBaseContracts":
[
17,
13,
9,
5,
10,
7,
4,
1
],
"name": "E",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 18,
"scope": 14,
"src": "75:19:1"
}
],
test/libsolidity/ASTJSON/contract_dep_order_legacy.json
+49 -101
View File
@@ -10,19 +10,19 @@
],
"B":
[
5
4
],
"C":
[
9
7
],
"D":
[
13
10
],
"E":
[
17
13
]
}
},
@@ -51,7 +51,7 @@
[
null
],
"scope": 18
"scope": 14
},
"id": 1,
"name": "ContractDefinition",
@@ -69,7 +69,7 @@
"fullyImplemented": true,
"linearizedBaseContracts":
[
5,
4,
1
],
"name": "B",
@@ -77,7 +77,7 @@
[
null
],
"scope": 18
"scope": 14
},
"children":
[
@@ -88,33 +88,20 @@
{
"attributes":
{
"referencedDeclaration": 1,
"type": "contract A"
"name": "A",
"referencedDeclaration": 1
},
"children":
[
{
"attributes":
{
"name": "A",
"referencedDeclaration": 1
},
"id": 2,
"name": "IdentifierPath",
"src": "29:1:1"
}
],
"id": 3,
"name": "UserDefinedTypeName",
"id": 2,
"name": "IdentifierPath",
"src": "29:1:1"
}
],
"id": 4,
"id": 3,
"name": "InheritanceSpecifier",
"src": "29:1:1"
}
],
"id": 5,
"id": 4,
"name": "ContractDefinition",
"src": "15:19:1"
},
@@ -125,14 +112,14 @@
"contractDependencies":
[
1,
5
4
],
"contractKind": "contract",
"fullyImplemented": true,
"linearizedBaseContracts":
[
9,
5,
7,
4,
1
],
"name": "C",
@@ -140,7 +127,7 @@
[
null
],
"scope": 18
"scope": 14
},
"children":
[
@@ -151,33 +138,20 @@
{
"attributes":
{
"referencedDeclaration": 5,
"type": "contract B"
"name": "B",
"referencedDeclaration": 4
},
"children":
[
{
"attributes":
{
"name": "B",
"referencedDeclaration": 5
},
"id": 6,
"name": "IdentifierPath",
"src": "49:1:1"
}
],
"id": 7,
"name": "UserDefinedTypeName",
"id": 5,
"name": "IdentifierPath",
"src": "49:1:1"
}
],
"id": 8,
"id": 6,
"name": "InheritanceSpecifier",
"src": "49:1:1"
}
],
"id": 9,
"id": 7,
"name": "ContractDefinition",
"src": "35:19:1"
},
@@ -188,16 +162,16 @@
"contractDependencies":
[
1,
5,
9
4,
7
],
"contractKind": "contract",
"fullyImplemented": true,
"linearizedBaseContracts":
[
13,
9,
5,
10,
7,
4,
1
],
"name": "D",
@@ -205,7 +179,7 @@
[
null
],
"scope": 18
"scope": 14
},
"children":
[
@@ -216,33 +190,20 @@
{
"attributes":
{
"referencedDeclaration": 9,
"type": "contract C"
"name": "C",
"referencedDeclaration": 7
},
"children":
[
{
"attributes":
{
"name": "C",
"referencedDeclaration": 9
},
"id": 10,
"name": "IdentifierPath",
"src": "69:1:1"
}
],
"id": 11,
"name": "UserDefinedTypeName",
"id": 8,
"name": "IdentifierPath",
"src": "69:1:1"
}
],
"id": 12,
"id": 9,
"name": "InheritanceSpecifier",
"src": "69:1:1"
}
],
"id": 13,
"id": 10,
"name": "ContractDefinition",
"src": "55:19:1"
},
@@ -253,18 +214,18 @@
"contractDependencies":
[
1,
5,
9,
13
4,
7,
10
],
"contractKind": "contract",
"fullyImplemented": true,
"linearizedBaseContracts":
[
17,
13,
9,
5,
10,
7,
4,
1
],
"name": "E",
@@ -272,7 +233,7 @@
[
null
],
"scope": 18
"scope": 14
},
"children":
[
@@ -283,38 +244,25 @@
{
"attributes":
{
"referencedDeclaration": 13,
"type": "contract D"
"name": "D",
"referencedDeclaration": 10
},
"children":
[
{
"attributes":
{
"name": "D",
"referencedDeclaration": 13
},
"id": 14,
"name": "IdentifierPath",
"src": "89:1:1"
}
],
"id": 15,
"name": "UserDefinedTypeName",
"id": 11,
"name": "IdentifierPath",
"src": "89:1:1"
}
],
"id": 16,
"id": 12,
"name": "InheritanceSpecifier",
"src": "89:1:1"
}
],
"id": 17,
"id": 13,
"name": "ContractDefinition",
"src": "75:19:1"
}
],
"id": 18,
"id": 14,
"name": "SourceUnit",
"src": "0:95:1"
}
test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
+8 -12
View File
@@ -24,9 +24,8 @@
{
"id": 2,
"name": "A",
"nodeType": "UserDefinedTypeName",
"src": "29:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "29:1:1"
},
"id": 3,
"nodeType": "InheritanceSpecifier",
@@ -50,9 +49,8 @@
{
"id": 5,
"name": "B",
"nodeType": "UserDefinedTypeName",
"src": "49:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "49:1:1"
},
"id": 6,
"nodeType": "InheritanceSpecifier",
@@ -76,9 +74,8 @@
{
"id": 8,
"name": "C",
"nodeType": "UserDefinedTypeName",
"src": "69:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "69:1:1"
},
"id": 9,
"nodeType": "InheritanceSpecifier",
@@ -102,9 +99,8 @@
{
"id": 11,
"name": "D",
"nodeType": "UserDefinedTypeName",
"src": "89:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "89:1:1"
},
"id": 12,
"nodeType": "InheritanceSpecifier",
test/libsolidity/ASTJSON/inheritance_specifier.json
+11 -23
View File
@@ -8,10 +8,10 @@
],
"C2":
[
5
4
]
},
"id": 6,
"id": 5,
"nodeType": "SourceUnit",
"nodes":
[
@@ -29,7 +29,7 @@
"name": "C1",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 6,
"scope": 5,
"src": "0:14:1"
},
{
@@ -39,25 +39,13 @@
{
"baseName":
{
"id": 3,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 2,
"name": "C1",
"nodeType": "IdentifierPath",
"referencedDeclaration": 1,
"src": "30:2:1"
},
"id": 2,
"name": "C1",
"nodeType": "IdentifierPath",
"referencedDeclaration": 1,
"src": "30:2:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C1_$1",
"typeString": "contract C1"
}
"src": "30:2:1"
},
"id": 4,
"id": 3,
"nodeType": "InheritanceSpecifier",
"src": "30:2:1"
}
@@ -68,16 +56,16 @@
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 5,
"id": 4,
"linearizedBaseContracts":
[
5,
4,
1
],
"name": "C2",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 6,
"scope": 5,
"src": "15:20:1"
}
],
test/libsolidity/ASTJSON/inheritance_specifier_legacy.json
+11 -24
View File
@@ -10,7 +10,7 @@
],
"C2":
[
5
4
]
}
},
@@ -39,7 +39,7 @@
[
null
],
"scope": 6
"scope": 5
},
"id": 1,
"name": "ContractDefinition",
@@ -57,7 +57,7 @@
"fullyImplemented": true,
"linearizedBaseContracts":
[
5,
4,
1
],
"name": "C2",
@@ -65,7 +65,7 @@
[
null
],
"scope": 6
"scope": 5
},
"children":
[
@@ -76,38 +76,25 @@
{
"attributes":
{
"referencedDeclaration": 1,
"type": "contract C1"
"name": "C1",
"referencedDeclaration": 1
},
"children":
[
{
"attributes":
{
"name": "C1",
"referencedDeclaration": 1
},
"id": 2,
"name": "IdentifierPath",
"src": "30:2:1"
}
],
"id": 3,
"name": "UserDefinedTypeName",
"id": 2,
"name": "IdentifierPath",
"src": "30:2:1"
}
],
"id": 4,
"id": 3,
"name": "InheritanceSpecifier",
"src": "30:2:1"
}
],
"id": 5,
"id": 4,
"name": "ContractDefinition",
"src": "15:20:1"
}
],
"id": 6,
"id": 5,
"name": "SourceUnit",
"src": "0:36:1"
}
test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
+2 -3
View File
@@ -24,9 +24,8 @@
{
"id": 2,
"name": "C1",
"nodeType": "UserDefinedTypeName",
"src": "30:2:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "30:2:1"
},
"id": 3,
"nodeType": "InheritanceSpecifier",
test/libsolidity/ASTJSON/mappings_parseOnly.json
+28 -16
View File
@@ -1,6 +1,6 @@
{
"absolutePath": "a",
"id": 18,
"id": 20,
"nodeType": "SourceUnit",
"nodes":
[
@@ -9,7 +9,7 @@
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"id": 17,
"id": 19,
"name": "C",
"nodeType": "ContractDefinition",
"nodes":
@@ -43,7 +43,7 @@
},
{
"constant": false,
"id": 8,
"id": 9,
"mutability": "mutable",
"name": "a",
"nodeType": "VariableDeclaration",
@@ -53,12 +53,18 @@
"typeDescriptions": {},
"typeName":
{
"id": 7,
"id": 8,
"keyType":
{
"id": 5,
"name": "C",
"id": 6,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 5,
"name": "C",
"nodeType": "IdentifierPath",
"src": "48:1:1"
},
"src": "48:1:1",
"typeDescriptions": {}
},
@@ -67,7 +73,7 @@
"typeDescriptions": {},
"valueType":
{
"id": 6,
"id": 7,
"name": "bool",
"nodeType": "ElementaryTypeName",
"src": "53:4:1",
@@ -78,7 +84,7 @@
},
{
"constant": false,
"id": 12,
"id": 13,
"mutability": "mutable",
"name": "b",
"nodeType": "VariableDeclaration",
@@ -88,10 +94,10 @@
"typeDescriptions": {},
"typeName":
{
"id": 11,
"id": 12,
"keyType":
{
"id": 9,
"id": 10,
"name": "address",
"nodeType": "ElementaryTypeName",
"src": "74:7:1",
@@ -102,7 +108,7 @@
"typeDescriptions": {},
"valueType":
{
"id": 10,
"id": 11,
"name": "bool",
"nodeType": "ElementaryTypeName",
"src": "85:4:1",
@@ -113,7 +119,7 @@
},
{
"constant": false,
"id": 16,
"id": 18,
"mutability": "mutable",
"name": "c",
"nodeType": "VariableDeclaration",
@@ -123,12 +129,18 @@
"typeDescriptions": {},
"typeName":
{
"id": 15,
"id": 17,
"keyType":
{
"id": 13,
"name": "E",
"id": 15,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 14,
"name": "E",
"nodeType": "IdentifierPath",
"src": "106:1:1"
},
"src": "106:1:1",
"typeDescriptions": {}
},
@@ -137,7 +149,7 @@
"typeDescriptions": {},
"valueType":
{
"id": 14,
"id": 16,
"name": "bool",
"nodeType": "ElementaryTypeName",
"src": "111:4:1",
test/libsolidity/ASTJSON/modifier_definition.json
+2 -8
View File
@@ -126,15 +126,9 @@
{
"id": 8,
"name": "M",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"nodeType": "IdentifierPath",
"referencedDeclaration": 6,
"src": "52:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_modifier$_t_uint256_$",
"typeString": "modifier (uint256)"
}
"src": "52:1:1"
},
"nodeType": "ModifierInvocation",
"src": "52:4:1"
test/libsolidity/ASTJSON/modifier_definition_legacy.json
+3 -8
View File
@@ -146,16 +146,11 @@
{
"attributes":
{
"overloadedDeclarations":
[
null
],
"referencedDeclaration": 6,
"type": "modifier (uint256)",
"value": "M"
"name": "M",
"referencedDeclaration": 6
},
"id": 8,
"name": "Identifier",
"name": "IdentifierPath",
"src": "52:1:1"
},
{
test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
+2 -4
View File
@@ -96,10 +96,8 @@
{
"id": 8,
"name": "M",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"src": "52:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "52:1:1"
},
"nodeType": "ModifierInvocation",
"src": "52:4:1"
test/libsolidity/ASTJSON/modifier_invocation.json
+2 -8
View File
@@ -126,15 +126,9 @@
{
"id": 8,
"name": "M",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"nodeType": "IdentifierPath",
"referencedDeclaration": 6,
"src": "52:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_modifier$_t_uint256_$",
"typeString": "modifier (uint256)"
}
"src": "52:1:1"
},
"nodeType": "ModifierInvocation",
"src": "52:4:1"
test/libsolidity/ASTJSON/modifier_invocation_legacy.json
+3 -8
View File
@@ -146,16 +146,11 @@
{
"attributes":
{
"overloadedDeclarations":
[
null
],
"referencedDeclaration": 6,
"type": "modifier (uint256)",
"value": "M"
"name": "M",
"referencedDeclaration": 6
},
"id": 8,
"name": "Identifier",
"name": "IdentifierPath",
"src": "52:1:1"
},
{
test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
+2 -4
View File
@@ -96,10 +96,8 @@
{
"id": 8,
"name": "M",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"src": "52:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "52:1:1"
},
"nodeType": "ModifierInvocation",
"src": "52:4:1"
test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
+17 -12
View File
@@ -1,6 +1,6 @@
{
"absolutePath": "a",
"id": 11,
"id": 12,
"nodeType": "SourceUnit",
"nodes":
[
@@ -21,9 +21,8 @@
{
"id": 2,
"name": "NotExisting.X",
"nodeType": "UserDefinedTypeName",
"src": "55:13:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "55:13:1"
},
"id": 3,
"nodeType": "InheritanceSpecifier",
@@ -32,14 +31,14 @@
],
"contractDependencies": [],
"contractKind": "contract",
"id": 10,
"id": 11,
"name": "C",
"nodeType": "ContractDefinition",
"nodes":
[
{
"constant": false,
"id": 5,
"id": 6,
"mutability": "mutable",
"name": "myStruct",
"nodeType": "VariableDeclaration",
@@ -49,9 +48,15 @@
"typeDescriptions": {},
"typeName":
{
"id": 4,
"name": "NotExisting.SomeStruct",
"id": 5,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 4,
"name": "NotExisting.SomeStruct",
"nodeType": "IdentifierPath",
"src": "72:22:1"
},
"src": "72:22:1",
"typeDescriptions": {}
},
@@ -60,12 +65,12 @@
{
"body":
{
"id": 8,
"id": 9,
"nodeType": "Block",
"src": "127:2:1",
"statements": []
},
"id": 9,
"id": 10,
"implemented": true,
"kind": "constructor",
"modifiers": [],
@@ -73,14 +78,14 @@
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 6,
"id": 7,
"nodeType": "ParameterList",
"parameters": [],
"src": "124:2:1"
},
"returnParameters":
{
"id": 7,
"id": 8,
"nodeType": "ParameterList",
"parameters": [],
"src": "127:0:1"
test/libsolidity/ASTJSON/override.json
+56 -104
View File
@@ -8,14 +8,14 @@
],
"B":
[
17
16
],
"C":
[
35
31
]
},
"id": 36,
"id": 32,
"nodeType": "SourceUnit",
"nodes":
[
@@ -70,7 +70,7 @@
"visibility": "public"
}
],
"scope": 36,
"scope": 32,
"src": "0:40:1"
},
{
@@ -80,25 +80,13 @@
{
"baseName":
{
"id": 7,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 6,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "55:1:1"
},
"id": 6,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "55:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$5",
"typeString": "contract A"
}
"src": "55:1:1"
},
"id": 8,
"id": 7,
"nodeType": "InheritanceSpecifier",
"src": "55:1:1"
}
@@ -109,10 +97,10 @@
],
"contractKind": "contract",
"fullyImplemented": false,
"id": 17,
"id": 16,
"linearizedBaseContracts":
[
17,
16,
5
],
"name": "B",
@@ -121,7 +109,7 @@
[
{
"functionSelector": "c2985578",
"id": 11,
"id": 10,
"implemented": false,
"kind": "function",
"modifiers": [],
@@ -129,19 +117,19 @@
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 9,
"id": 8,
"nodeType": "ParameterList",
"parameters": [],
"src": "72:2:1"
},
"returnParameters":
{
"id": 10,
"id": 9,
"nodeType": "ParameterList",
"parameters": [],
"src": "81:0:1"
},
"scope": 17,
"scope": 16,
"src": "60:22:1",
"stateMutability": "nonpayable",
"virtual": false,
@@ -154,13 +142,13 @@
],
"body":
{
"id": 15,
"id": 14,
"nodeType": "Block",
"src": "115:2:1",
"statements": []
},
"functionSelector": "a399b6a2",
"id": 16,
"id": 15,
"implemented": true,
"kind": "function",
"modifiers": [],
@@ -168,33 +156,33 @@
"nodeType": "FunctionDefinition",
"overrides":
{
"id": 13,
"id": 12,
"nodeType": "OverrideSpecifier",
"overrides": [],
"src": "106:8:1"
},
"parameters":
{
"id": 12,
"id": 11,
"nodeType": "ParameterList",
"parameters": [],
"src": "96:2:1"
},
"returnParameters":
{
"id": 14,
"id": 13,
"nodeType": "ParameterList",
"parameters": [],
"src": "115:0:1"
},
"scope": 17,
"scope": 16,
"src": "84:33:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 36,
"scope": 32,
"src": "41:78:1"
},
{
@@ -204,25 +192,13 @@
{
"baseName":
{
"id": 19,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 18,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 17,
"src": "134:1:1"
},
"referencedDeclaration": 17,
"src": "134:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$17",
"typeString": "contract B"
}
"id": 17,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 16,
"src": "134:1:1"
},
"id": 20,
"id": 18,
"nodeType": "InheritanceSpecifier",
"src": "134:1:1"
}
@@ -230,15 +206,15 @@
"contractDependencies":
[
5,
17
16
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 35,
"id": 31,
"linearizedBaseContracts":
[
35,
17,
31,
16,
5
],
"name": "C",
@@ -248,17 +224,17 @@
{
"baseFunctions":
[
11
10
],
"body":
{
"id": 24,
"id": 22,
"nodeType": "Block",
"src": "170:3:1",
"statements": []
},
"functionSelector": "c2985578",
"id": 25,
"id": 23,
"implemented": true,
"kind": "function",
"modifiers": [],
@@ -266,26 +242,26 @@
"nodeType": "FunctionDefinition",
"overrides":
{
"id": 22,
"id": 20,
"nodeType": "OverrideSpecifier",
"overrides": [],
"src": "161:8:1"
},
"parameters":
{
"id": 21,
"id": 19,
"nodeType": "ParameterList",
"parameters": [],
"src": "151:2:1"
},
"returnParameters":
{
"id": 23,
"id": 21,
"nodeType": "ParameterList",
"parameters": [],
"src": "170:0:1"
},
"scope": 35,
"scope": 31,
"src": "139:34:1",
"stateMutability": "nonpayable",
"virtual": false,
@@ -294,17 +270,17 @@
{
"baseFunctions":
[
16
15
],
"body":
{
"id": 33,
"id": 29,
"nodeType": "Block",
"src": "212:2:1",
"statements": []
},
"functionSelector": "a399b6a2",
"id": 34,
"id": 30,
"implemented": true,
"kind": "function",
"modifiers": [],
@@ -312,73 +288,49 @@
"nodeType": "FunctionDefinition",
"overrides":
{
"id": 31,
"id": 27,
"nodeType": "OverrideSpecifier",
"overrides":
[
{
"id": 28,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 27,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "206:1:1"
},
"id": 25,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "206:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$5",
"typeString": "contract A"
}
"src": "206:1:1"
},
{
"id": 30,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 29,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 17,
"src": "209:1:1"
},
"referencedDeclaration": 17,
"src": "209:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$17",
"typeString": "contract B"
}
"id": 26,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 16,
"src": "209:1:1"
}
],
"src": "197:14:1"
},
"parameters":
{
"id": 26,
"id": 24,
"nodeType": "ParameterList",
"parameters": [],
"src": "187:2:1"
},
"returnParameters":
{
"id": 32,
"id": 28,
"nodeType": "ParameterList",
"parameters": [],
"src": "212:0:1"
},
"scope": 35,
"scope": 31,
"src": "175:39:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 36,
"scope": 32,
"src": "120:96:1"
}
],
test/libsolidity/ASTJSON/override_legacy.json
+54 -106
View File
@@ -10,11 +10,11 @@
],
"B":
[
17
16
],
"C":
[
35
31
]
}
},
@@ -39,7 +39,7 @@
5
],
"name": "A",
"scope": 36
"scope": 32
},
"children":
[
@@ -123,11 +123,11 @@
"fullyImplemented": false,
"linearizedBaseContracts":
[
17,
16,
5
],
"name": "B",
"scope": 36
"scope": 32
},
"children":
[
@@ -138,28 +138,15 @@
{
"attributes":
{
"referencedDeclaration": 5,
"type": "contract A"
"name": "A",
"referencedDeclaration": 5
},
"children":
[
{
"attributes":
{
"name": "A",
"referencedDeclaration": 5
},
"id": 6,
"name": "IdentifierPath",
"src": "55:1:1"
}
],
"id": 7,
"name": "UserDefinedTypeName",
"id": 6,
"name": "IdentifierPath",
"src": "55:1:1"
}
],
"id": 8,
"id": 7,
"name": "InheritanceSpecifier",
"src": "55:1:1"
},
@@ -175,7 +162,7 @@
null
],
"name": "foo",
"scope": 17,
"scope": 16,
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
@@ -191,7 +178,7 @@
]
},
"children": [],
"id": 9,
"id": 8,
"name": "ParameterList",
"src": "72:2:1"
},
@@ -204,12 +191,12 @@
]
},
"children": [],
"id": 10,
"id": 9,
"name": "ParameterList",
"src": "81:0:1"
}
],
"id": 11,
"id": 10,
"name": "FunctionDefinition",
"src": "60:22:1"
},
@@ -229,7 +216,7 @@
null
],
"name": "faa",
"scope": 17,
"scope": 16,
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
@@ -244,7 +231,7 @@
null
]
},
"id": 13,
"id": 12,
"name": "OverrideSpecifier",
"src": "106:8:1"
},
@@ -257,7 +244,7 @@
]
},
"children": [],
"id": 12,
"id": 11,
"name": "ParameterList",
"src": "96:2:1"
},
@@ -270,7 +257,7 @@
]
},
"children": [],
"id": 14,
"id": 13,
"name": "ParameterList",
"src": "115:0:1"
},
@@ -283,17 +270,17 @@
]
},
"children": [],
"id": 15,
"id": 14,
"name": "Block",
"src": "115:2:1"
}
],
"id": 16,
"id": 15,
"name": "FunctionDefinition",
"src": "84:33:1"
}
],
"id": 17,
"id": 16,
"name": "ContractDefinition",
"src": "41:78:1"
},
@@ -304,18 +291,18 @@
"contractDependencies":
[
5,
17
16
],
"contractKind": "contract",
"fullyImplemented": true,
"linearizedBaseContracts":
[
35,
17,
31,
16,
5
],
"name": "C",
"scope": 36
"scope": 32
},
"children":
[
@@ -326,28 +313,15 @@
{
"attributes":
{
"referencedDeclaration": 17,
"type": "contract B"
"name": "B",
"referencedDeclaration": 16
},
"children":
[
{
"attributes":
{
"name": "B",
"referencedDeclaration": 17
},
"id": 18,
"name": "IdentifierPath",
"src": "134:1:1"
}
],
"id": 19,
"name": "UserDefinedTypeName",
"id": 17,
"name": "IdentifierPath",
"src": "134:1:1"
}
],
"id": 20,
"id": 18,
"name": "InheritanceSpecifier",
"src": "134:1:1"
},
@@ -356,7 +330,7 @@
{
"baseFunctions":
[
11
10
],
"functionSelector": "c2985578",
"implemented": true,
@@ -367,7 +341,7 @@
null
],
"name": "foo",
"scope": 35,
"scope": 31,
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
@@ -382,7 +356,7 @@
null
]
},
"id": 22,
"id": 20,
"name": "OverrideSpecifier",
"src": "161:8:1"
},
@@ -395,7 +369,7 @@
]
},
"children": [],
"id": 21,
"id": 19,
"name": "ParameterList",
"src": "151:2:1"
},
@@ -408,7 +382,7 @@
]
},
"children": [],
"id": 23,
"id": 21,
"name": "ParameterList",
"src": "170:0:1"
},
@@ -421,12 +395,12 @@
]
},
"children": [],
"id": 24,
"id": 22,
"name": "Block",
"src": "170:3:1"
}
],
"id": 25,
"id": 23,
"name": "FunctionDefinition",
"src": "139:34:1"
},
@@ -435,7 +409,7 @@
{
"baseFunctions":
[
16
15
],
"functionSelector": "a399b6a2",
"implemented": true,
@@ -446,7 +420,7 @@
null
],
"name": "faa",
"scope": 35,
"scope": 31,
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
@@ -459,51 +433,25 @@
{
"attributes":
{
"referencedDeclaration": 5,
"type": "contract A"
"name": "A",
"referencedDeclaration": 5
},
"children":
[
{
"attributes":
{
"name": "A",
"referencedDeclaration": 5
},
"id": 27,
"name": "IdentifierPath",
"src": "206:1:1"
}
],
"id": 28,
"name": "UserDefinedTypeName",
"id": 25,
"name": "IdentifierPath",
"src": "206:1:1"
},
{
"attributes":
{
"referencedDeclaration": 17,
"type": "contract B"
"name": "B",
"referencedDeclaration": 16
},
"children":
[
{
"attributes":
{
"name": "B",
"referencedDeclaration": 17
},
"id": 29,
"name": "IdentifierPath",
"src": "209:1:1"
}
],
"id": 30,
"name": "UserDefinedTypeName",
"id": 26,
"name": "IdentifierPath",
"src": "209:1:1"
}
],
"id": 31,
"id": 27,
"name": "OverrideSpecifier",
"src": "197:14:1"
},
@@ -516,7 +464,7 @@
]
},
"children": [],
"id": 26,
"id": 24,
"name": "ParameterList",
"src": "187:2:1"
},
@@ -529,7 +477,7 @@
]
},
"children": [],
"id": 32,
"id": 28,
"name": "ParameterList",
"src": "212:0:1"
},
@@ -542,22 +490,22 @@
]
},
"children": [],
"id": 33,
"id": 29,
"name": "Block",
"src": "212:2:1"
}
],
"id": 34,
"id": 30,
"name": "FunctionDefinition",
"src": "175:39:1"
}
],
"id": 35,
"id": 31,
"name": "ContractDefinition",
"src": "120:96:1"
}
],
"id": 36,
"id": 32,
"name": "SourceUnit",
"src": "0:217:1"
}
test/libsolidity/ASTJSON/override_parseOnly.json
+8 -12
View File
@@ -59,9 +59,8 @@
{
"id": 6,
"name": "A",
"nodeType": "UserDefinedTypeName",
"src": "55:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "55:1:1"
},
"id": 7,
"nodeType": "InheritanceSpecifier",
@@ -153,9 +152,8 @@
{
"id": 17,
"name": "B",
"nodeType": "UserDefinedTypeName",
"src": "134:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "134:1:1"
},
"id": 18,
"nodeType": "InheritanceSpecifier",
@@ -232,16 +230,14 @@
{
"id": 25,
"name": "A",
"nodeType": "UserDefinedTypeName",
"src": "206:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "206:1:1"
},
{
"id": 26,
"name": "B",
"nodeType": "UserDefinedTypeName",
"src": "209:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "209:1:1"
}
],
"src": "197:14:1"
test/libsolidity/ASTJSON/two_base_functions.json
+31 -79
View File
@@ -12,10 +12,10 @@
],
"C":
[
26
22
]
},
"id": 27,
"id": 23,
"nodeType": "SourceUnit",
"nodes":
[
@@ -70,7 +70,7 @@
"visibility": "public"
}
],
"scope": 27,
"scope": 23,
"src": "0:49:1"
},
{
@@ -124,7 +124,7 @@
"visibility": "public"
}
],
"scope": 27,
"scope": 23,
"src": "50:49:1"
},
{
@@ -134,50 +134,26 @@
{
"baseName":
{
"id": 12,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 11,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "114:1:1"
},
"id": 11,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "114:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$5",
"typeString": "contract A"
}
"src": "114:1:1"
},
"id": 13,
"id": 12,
"nodeType": "InheritanceSpecifier",
"src": "114:1:1"
},
{
"baseName":
{
"id": 15,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 14,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "117:1:1"
},
"id": 13,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "117:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$10",
"typeString": "contract B"
}
"src": "117:1:1"
},
"id": 16,
"id": 14,
"nodeType": "InheritanceSpecifier",
"src": "117:1:1"
}
@@ -189,10 +165,10 @@
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 26,
"id": 22,
"linearizedBaseContracts":
[
26,
22,
10,
5
],
@@ -208,13 +184,13 @@
],
"body":
{
"id": 24,
"id": 20,
"nodeType": "Block",
"src": "160:2:1",
"statements": []
},
"functionSelector": "26121ff0",
"id": 25,
"id": 21,
"implemented": true,
"kind": "function",
"modifiers": [],
@@ -222,73 +198,49 @@
"nodeType": "FunctionDefinition",
"overrides":
{
"id": 22,
"id": 18,
"nodeType": "OverrideSpecifier",
"overrides":
[
{
"id": 19,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 18,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "154:1:1"
},
"id": 16,
"name": "A",
"nodeType": "IdentifierPath",
"referencedDeclaration": 5,
"src": "154:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$5",
"typeString": "contract A"
}
"src": "154:1:1"
},
{
"id": 21,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 20,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "157:1:1"
},
"id": 17,
"name": "B",
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "157:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$10",
"typeString": "contract B"
}
"src": "157:1:1"
}
],
"src": "145:14:1"
},
"parameters":
{
"id": 17,
"id": 15,
"nodeType": "ParameterList",
"parameters": [],
"src": "135:2:1"
},
"returnParameters":
{
"id": 23,
"id": 19,
"nodeType": "ParameterList",
"parameters": [],
"src": "160:0:1"
},
"scope": 26,
"scope": 22,
"src": "125:37:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 27,
"scope": 23,
"src": "100:64:1"
}
],
test/libsolidity/ASTJSON/two_base_functions_legacy.json
+31 -83
View File
@@ -14,7 +14,7 @@
],
"C":
[
26
22
]
}
},
@@ -39,7 +39,7 @@
5
],
"name": "A",
"scope": 27
"scope": 23
},
"children":
[
@@ -130,7 +130,7 @@
10
],
"name": "B",
"scope": 27
"scope": 23
},
"children":
[
@@ -215,12 +215,12 @@
"fullyImplemented": true,
"linearizedBaseContracts":
[
26,
22,
10,
5
],
"name": "C",
"scope": 27
"scope": 23
},
"children":
[
@@ -231,28 +231,15 @@
{
"attributes":
{
"referencedDeclaration": 5,
"type": "contract A"
"name": "A",
"referencedDeclaration": 5
},
"children":
[
{
"attributes":
{
"name": "A",
"referencedDeclaration": 5
},
"id": 11,
"name": "IdentifierPath",
"src": "114:1:1"
}
],
"id": 12,
"name": "UserDefinedTypeName",
"id": 11,
"name": "IdentifierPath",
"src": "114:1:1"
}
],
"id": 13,
"id": 12,
"name": "InheritanceSpecifier",
"src": "114:1:1"
},
@@ -263,28 +250,15 @@
{
"attributes":
{
"referencedDeclaration": 10,
"type": "contract B"
"name": "B",
"referencedDeclaration": 10
},
"children":
[
{
"attributes":
{
"name": "B",
"referencedDeclaration": 10
},
"id": 14,
"name": "IdentifierPath",
"src": "117:1:1"
}
],
"id": 15,
"name": "UserDefinedTypeName",
"id": 13,
"name": "IdentifierPath",
"src": "117:1:1"
}
],
"id": 16,
"id": 14,
"name": "InheritanceSpecifier",
"src": "117:1:1"
},
@@ -305,7 +279,7 @@
null
],
"name": "f",
"scope": 26,
"scope": 22,
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
@@ -318,51 +292,25 @@
{
"attributes":
{
"referencedDeclaration": 5,
"type": "contract A"
"name": "A",
"referencedDeclaration": 5
},
"children":
[
{
"attributes":
{
"name": "A",
"referencedDeclaration": 5
},
"id": 18,
"name": "IdentifierPath",
"src": "154:1:1"
}
],
"id": 19,
"name": "UserDefinedTypeName",
"id": 16,
"name": "IdentifierPath",
"src": "154:1:1"
},
{
"attributes":
{
"referencedDeclaration": 10,
"type": "contract B"
"name": "B",
"referencedDeclaration": 10
},
"children":
[
{
"attributes":
{
"name": "B",
"referencedDeclaration": 10
},
"id": 20,
"name": "IdentifierPath",
"src": "157:1:1"
}
],
"id": 21,
"name": "UserDefinedTypeName",
"id": 17,
"name": "IdentifierPath",
"src": "157:1:1"
}
],
"id": 22,
"id": 18,
"name": "OverrideSpecifier",
"src": "145:14:1"
},
@@ -375,7 +323,7 @@
]
},
"children": [],
"id": 17,
"id": 15,
"name": "ParameterList",
"src": "135:2:1"
},
@@ -388,7 +336,7 @@
]
},
"children": [],
"id": 23,
"id": 19,
"name": "ParameterList",
"src": "160:0:1"
},
@@ -401,22 +349,22 @@
]
},
"children": [],
"id": 24,
"id": 20,
"name": "Block",
"src": "160:2:1"
}
],
"id": 25,
"id": 21,
"name": "FunctionDefinition",
"src": "125:37:1"
}
],
"id": 26,
"id": 22,
"name": "ContractDefinition",
"src": "100:64:1"
}
],
"id": 27,
"id": 23,
"name": "SourceUnit",
"src": "0:165:1"
}
test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
+8 -12
View File
@@ -105,9 +105,8 @@
{
"id": 11,
"name": "A",
"nodeType": "UserDefinedTypeName",
"src": "114:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "114:1:1"
},
"id": 12,
"nodeType": "InheritanceSpecifier",
@@ -118,9 +117,8 @@
{
"id": 13,
"name": "B",
"nodeType": "UserDefinedTypeName",
"src": "117:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "117:1:1"
},
"id": 14,
"nodeType": "InheritanceSpecifier",
@@ -157,16 +155,14 @@
{
"id": 16,
"name": "A",
"nodeType": "UserDefinedTypeName",
"src": "154:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "154:1:1"
},
{
"id": 17,
"name": "B",
"nodeType": "UserDefinedTypeName",
"src": "157:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "157:1:1"
}
],
"src": "145:14:1"
test/libsolidity/ASTJSON/using_for_directive.json
+12 -24
View File
@@ -4,14 +4,14 @@
{
"C":
[
6
5
],
"L":
[
1
]
},
"id": 7,
"id": 6,
"nodeType": "SourceUnit",
"nodes":
[
@@ -29,7 +29,7 @@
"name": "L",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 7,
"scope": 6,
"src": "0:12:1"
},
{
@@ -38,42 +38,30 @@
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 6,
"id": 5,
"linearizedBaseContracts":
[
6
5
],
"name": "C",
"nodeType": "ContractDefinition",
"nodes":
[
{
"id": 5,
"id": 4,
"libraryName":
{
"id": 3,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 2,
"name": "L",
"nodeType": "IdentifierPath",
"referencedDeclaration": 1,
"src": "32:1:1"
},
"id": 2,
"name": "L",
"nodeType": "IdentifierPath",
"referencedDeclaration": 1,
"src": "32:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_L_$1",
"typeString": "library L"
}
"src": "32:1:1"
},
"nodeType": "UsingForDirective",
"src": "26:17:1",
"typeName":
{
"id": 4,
"id": 3,
"name": "uint",
"nodeType": "ElementaryTypeName",
"src": "38:4:1",
@@ -85,7 +73,7 @@
}
}
],
"scope": 7,
"scope": 6,
"src": "13:32:1"
}
],
test/libsolidity/ASTJSON/using_for_directive_legacy.json
+12 -25
View File
@@ -6,7 +6,7 @@
{
"C":
[
6
5
],
"L":
[
@@ -39,7 +39,7 @@
[
null
],
"scope": 7
"scope": 6
},
"id": 1,
"name": "ContractDefinition",
@@ -61,10 +61,10 @@
"fullyImplemented": true,
"linearizedBaseContracts":
[
6
5
],
"name": "C",
"scope": 7
"scope": 6
},
"children":
[
@@ -74,24 +74,11 @@
{
"attributes":
{
"referencedDeclaration": 1,
"type": "library L"
"name": "L",
"referencedDeclaration": 1
},
"children":
[
{
"attributes":
{
"name": "L",
"referencedDeclaration": 1
},
"id": 2,
"name": "IdentifierPath",
"src": "32:1:1"
}
],
"id": 3,
"name": "UserDefinedTypeName",
"id": 2,
"name": "IdentifierPath",
"src": "32:1:1"
},
{
@@ -100,22 +87,22 @@
"name": "uint",
"type": "uint256"
},
"id": 4,
"id": 3,
"name": "ElementaryTypeName",
"src": "38:4:1"
}
],
"id": 5,
"id": 4,
"name": "UsingForDirective",
"src": "26:17:1"
}
],
"id": 6,
"id": 5,
"name": "ContractDefinition",
"src": "13:32:1"
}
],
"id": 7,
"id": 6,
"name": "SourceUnit",
"src": "0:46:1"
}
test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+2 -3
View File
@@ -31,9 +31,8 @@
{
"id": 2,
"name": "L",
"nodeType": "UserDefinedTypeName",
"src": "32:1:1",
"typeDescriptions": {}
"nodeType": "IdentifierPath",
"src": "32:1:1"
},
"nodeType": "UsingForDirective",
"src": "26:17:1",
test/libsolidity/semanticTests/intheritance/member_notation_ctor.sol
+25
View File
@@ -0,0 +1,25 @@
==== Source: A ====
contract C {
int private x;
constructor (int p) public { x = p; }
function getX() public returns (int) { return x; }
}
==== Source: B ====
import "A" as M;
contract D is M.C {
constructor (int p) M.C(p) public {}
}
contract A {
function g(int p) public returns (int) {
D d = new D(p);
return d.getX();
}
}
// ====
// compileViaYul: also
// ----
// g(int256): -1 -> -1
// g(int256): 10 -> 10
test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+1
View File
@@ -17,3 +17,4 @@ contract C
}
}
// ----
// Warning 4661: (297-321): BMC: Assertion violation happens here.
test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol
+1 -1
View File
@@ -1,4 +1,4 @@
function fun() someModifier {
}
// ----
// DeclarationError 7576: (15-27): Undeclared identifier.
// DeclarationError 7920: (15-27): Identifier not found or not unique.
test/libsolidity/syntaxTests/freeFunctions/free_function_qualified_modifier.sol
+1 -1
View File
@@ -6,4 +6,4 @@ function fun() C.someModifier {
}
// ----
// ParserError 2314: (65-66): Expected '{' but got '.'
// SyntaxError 5811: (49-83): Free functions cannot have modifiers.
test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol
+1 -1
View File
@@ -4,4 +4,4 @@ contract C {
}
// ----
// SyntaxError 2668: (83-99): Functions without implementation cannot have modifiers.
// DeclarationError 7576: (97-98): Undeclared identifier.
// DeclarationError 7920: (97-98): Identifier not found or not unique.