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 pull request #4734 from ethereum/astUpdate

Browse Source 
JSON AST: replace ``isConstructor`` by ``kind`` which also supports fallbacks
This commit is contained in:
chriseth
2018-10-08 21:47:27 +02:00
committed by GitHub
parent 7d2dc14304 a434896458
commit 7ff9a27979
31 changed files with 575 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/ASTJSON/constructor.json
+70
View File
@@ -0,0 +1,70 @@
{
"absolutePath" : "a",
"exportedSymbols" :
{
"C" :
[
5
]
},
"id" : 6,
"nodeType" : "SourceUnit",
"nodes" :
[
{
"baseContracts" : [],
"contractDependencies" : [],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 5,
"linearizedBaseContracts" :
[
5
],
"name" : "C",
"nodeType" : "ContractDefinition",
"nodes" :
[
{
"body" :
{
"id" : 3,
"nodeType" : "Block",
"src" : "35:4:1",
"statements" : []
},
"documentation" : null,
"id" : 4,
"implemented" : true,
"kind" : "constructor",
"modifiers" : [],
"name" : "",
"nodeType" : "FunctionDefinition",
"parameters" :
{
"id" : 1,
"nodeType" : "ParameterList",
"parameters" : [],
"src" : "25:2:1"
},
"returnParameters" :
{
"id" : 2,
"nodeType" : "ParameterList",
"parameters" : [],
"src" : "35:0:1"
},
"scope" : 5,
"src" : "14:25:1",
"stateMutability" : "nonpayable",
"superFunction" : null,
"visibility" : "public"
}
],
"scope" : 6,
"src" : "0:41:1"
}
],
"src" : "0:42:1"
}
test/libsolidity/ASTJSON/constructor.sol
+4
View File
@@ -0,0 +1,4 @@
contract C {
constructor() public {
}
}
test/libsolidity/ASTJSON/constructor_legacy.json
+110
View File
@@ -0,0 +1,110 @@
{
"attributes" :
{
"absolutePath" : "a",
"exportedSymbols" :
{
"C" :
[
5
]
}
},
"children" :
[
{
"attributes" :
{
"baseContracts" :
[
null
],
"contractDependencies" :
[
null
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
5
],
"name" : "C",
"scope" : 6
},
"children" :
[
{
"attributes" :
{
"documentation" : null,
"implemented" : true,
"isConstructor" : true,
"kind" : "constructor",
"modifiers" :
[
null
],
"name" : "",
"scope" : 5,
"stateMutability" : "nonpayable",
"superFunction" : null,
"visibility" : "public"
},
"children" :
[
{
"attributes" :
{
"parameters" :
[
null
]
},
"children" : [],
"id" : 1,
"name" : "ParameterList",
"src" : "25:2:1"
},
{
"attributes" :
{
"parameters" :
[
null
]
},
"children" : [],
"id" : 2,
"name" : "ParameterList",
"src" : "35:0:1"
},
{
"attributes" :
{
"statements" :
[
null
]
},
"children" : [],
"id" : 3,
"name" : "Block",
"src" : "35:4:1"
}
],
"id" : 4,
"name" : "FunctionDefinition",
"src" : "14:25:1"
}
],
"id" : 5,
"name" : "ContractDefinition",
"src" : "0:41:1"
}
],
"id" : 6,
"name" : "SourceUnit",
"src" : "0:42:1"
}
test/libsolidity/ASTJSON/documentation.json
+1 -1
View File
@@ -147,7 +147,7 @@
"documentation" : "Some comment on fn.",
"id" : 14,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "fn",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/documentation_legacy.json
+1
View File
@@ -108,6 +108,7 @@
"documentation" : "Some comment on fn.",
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/fallback.json
+70
View File
@@ -0,0 +1,70 @@
{
"absolutePath" : "a",
"exportedSymbols" :
{
"C" :
[
5
]
},
"id" : 6,
"nodeType" : "SourceUnit",
"nodes" :
[
{
"baseContracts" : [],
"contractDependencies" : [],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 5,
"linearizedBaseContracts" :
[
5
],
"name" : "C",
"nodeType" : "ContractDefinition",
"nodes" :
[
{
"body" :
{
"id" : 3,
"nodeType" : "Block",
"src" : "43:5:1",
"statements" : []
},
"documentation" : null,
"id" : 4,
"implemented" : true,
"kind" : "fallback",
"modifiers" : [],
"name" : "",
"nodeType" : "FunctionDefinition",
"parameters" :
{
"id" : 1,
"nodeType" : "ParameterList",
"parameters" : [],
"src" : "23:2:1"
},
"returnParameters" :
{
"id" : 2,
"nodeType" : "ParameterList",
"parameters" : [],
"src" : "43:0:1"
},
"scope" : 5,
"src" : "15:33:1",
"stateMutability" : "payable",
"superFunction" : null,
"visibility" : "external"
}
],
"scope" : 6,
"src" : "0:50:1"
}
],
"src" : "0:51:1"
}
test/libsolidity/ASTJSON/fallback.sol
+4
View File
@@ -0,0 +1,4 @@
contract C {
function() external payable {
}
}
test/libsolidity/ASTJSON/fallback_legacy.json
+110
View File
@@ -0,0 +1,110 @@
{
"attributes" :
{
"absolutePath" : "a",
"exportedSymbols" :
{
"C" :
[
5
]
}
},
"children" :
[
{
"attributes" :
{
"baseContracts" :
[
null
],
"contractDependencies" :
[
null
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
5
],
"name" : "C",
"scope" : 6
},
"children" :
[
{
"attributes" :
{
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "fallback",
"modifiers" :
[
null
],
"name" : "",
"scope" : 5,
"stateMutability" : "payable",
"superFunction" : null,
"visibility" : "external"
},
"children" :
[
{
"attributes" :
{
"parameters" :
[
null
]
},
"children" : [],
"id" : 1,
"name" : "ParameterList",
"src" : "23:2:1"
},
{
"attributes" :
{
"parameters" :
[
null
]
},
"children" : [],
"id" : 2,
"name" : "ParameterList",
"src" : "43:0:1"
},
{
"attributes" :
{
"statements" :
[
null
]
},
"children" : [],
"id" : 3,
"name" : "Block",
"src" : "43:5:1"
}
],
"id" : 4,
"name" : "FunctionDefinition",
"src" : "15:33:1"
}
],
"id" : 5,
"name" : "ContractDefinition",
"src" : "0:50:1"
}
],
"id" : 6,
"name" : "SourceUnit",
"src" : "0:51:1"
}
test/libsolidity/ASTJSON/fallback_payable.json
+70
View File
@@ -0,0 +1,70 @@
{
"absolutePath" : "a",
"exportedSymbols" :
{
"C" :
[
5
]
},
"id" : 6,
"nodeType" : "SourceUnit",
"nodes" :
[
{
"baseContracts" : [],
"contractDependencies" : [],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 5,
"linearizedBaseContracts" :
[
5
],
"name" : "C",
"nodeType" : "ContractDefinition",
"nodes" :
[
{
"body" :
{
"id" : 3,
"nodeType" : "Block",
"src" : "34:2:1",
"statements" : []
},
"documentation" : null,
"id" : 4,
"implemented" : true,
"kind" : "fallback",
"modifiers" : [],
"name" : "",
"nodeType" : "FunctionDefinition",
"parameters" :
{
"id" : 1,
"nodeType" : "ParameterList",
"parameters" : [],
"src" : "22:2:1"
},
"returnParameters" :
{
"id" : 2,
"nodeType" : "ParameterList",
"parameters" : [],
"src" : "34:0:1"
},
"scope" : 5,
"src" : "14:22:1",
"stateMutability" : "nonpayable",
"superFunction" : null,
"visibility" : "external"
}
],
"scope" : 6,
"src" : "0:38:1"
}
],
"src" : "0:39:1"
}
test/libsolidity/ASTJSON/fallback_payable.sol
+3
View File
@@ -0,0 +1,3 @@
contract C {
function() external {}
}
test/libsolidity/ASTJSON/fallback_payable_legacy.json
+110
View File
@@ -0,0 +1,110 @@
{
"attributes" :
{
"absolutePath" : "a",
"exportedSymbols" :
{
"C" :
[
5
]
}
},
"children" :
[
{
"attributes" :
{
"baseContracts" :
[
null
],
"contractDependencies" :
[
null
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
5
],
"name" : "C",
"scope" : 6
},
"children" :
[
{
"attributes" :
{
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "fallback",
"modifiers" :
[
null
],
"name" : "",
"scope" : 5,
"stateMutability" : "nonpayable",
"superFunction" : null,
"visibility" : "external"
},
"children" :
[
{
"attributes" :
{
"parameters" :
[
null
]
},
"children" : [],
"id" : 1,
"name" : "ParameterList",
"src" : "22:2:1"
},
{
"attributes" :
{
"parameters" :
[
null
]
},
"children" : [],
"id" : 2,
"name" : "ParameterList",
"src" : "34:0:1"
},
{
"attributes" :
{
"statements" :
[
null
]
},
"children" : [],
"id" : 3,
"name" : "Block",
"src" : "34:2:1"
}
],
"id" : 4,
"name" : "FunctionDefinition",
"src" : "14:22:1"
}
],
"id" : 5,
"name" : "ContractDefinition",
"src" : "0:38:1"
}
],
"id" : 6,
"name" : "SourceUnit",
"src" : "0:39:1"
}
test/libsolidity/ASTJSON/function_type.json
+1 -1
View File
@@ -37,7 +37,7 @@
"documentation" : null,
"id" : 16,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/function_type_legacy.json
+1
View File
@@ -41,6 +41,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/long_type_name_binary_operation.json
+1 -1
View File
@@ -142,7 +142,7 @@
"documentation" : null,
"id" : 10,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/long_type_name_binary_operation_legacy.json
+1
View File
@@ -41,6 +41,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/long_type_name_identifier.json
+1 -1
View File
@@ -148,7 +148,7 @@
"documentation" : null,
"id" : 13,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/long_type_name_identifier_legacy.json
+1
View File
@@ -83,6 +83,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/modifier_definition.json
+1 -1
View File
@@ -97,7 +97,7 @@
"documentation" : null,
"id" : 13,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
{
test/libsolidity/ASTJSON/modifier_definition_legacy.json
+1
View File
@@ -105,6 +105,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"name" : "F",
"scope" : 14,
"stateMutability" : "nonpayable",
test/libsolidity/ASTJSON/modifier_invocation.json
+1 -1
View File
@@ -97,7 +97,7 @@
"documentation" : null,
"id" : 13,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
{
test/libsolidity/ASTJSON/modifier_invocation_legacy.json
+1
View File
@@ -105,6 +105,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"name" : "F",
"scope" : 14,
"stateMutability" : "nonpayable",
test/libsolidity/ASTJSON/non_utf8.json
+1 -1
View File
@@ -89,7 +89,7 @@
"documentation" : null,
"id" : 7,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/non_utf8_legacy.json
+1
View File
@@ -41,6 +41,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/short_type_name.json
+1 -1
View File
@@ -93,7 +93,7 @@
"documentation" : null,
"id" : 9,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/short_type_name_legacy.json
+1
View File
@@ -41,6 +41,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/short_type_name_ref.json
+1 -1
View File
@@ -105,7 +105,7 @@
"documentation" : null,
"id" : 10,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/short_type_name_ref_legacy.json
+1
View File
@@ -41,6 +41,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null
test/libsolidity/ASTJSON/source_location.json
+1 -1
View File
@@ -127,7 +127,7 @@
"documentation" : null,
"id" : 10,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" : [],
"name" : "f",
"nodeType" : "FunctionDefinition",
test/libsolidity/ASTJSON/source_location_legacy.json
+1
View File
@@ -41,6 +41,7 @@
"documentation" : null,
"implemented" : true,
"isConstructor" : false,
"kind" : "function",
"modifiers" :
[
null