Use kind in json AST for free function.

libsolidity/ast/ASTJsonConverter.cpp

@@ -360,8 +360,7 @@ bool ASTJsonConverter::visit(FunctionDefinition const& _node)
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
 		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("kind", TokenTraits::toString(_node.kind())),
+		make_pair("kind", _node.isFree() ? "freeFunction" : TokenTraits::toString(_node.kind())),
-		make_pair("freeFunction", _node.isFree()),
 		make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
 		make_pair("visibility", Declaration::visibilityToString(visibility)),
 		make_pair("virtual", _node.markedVirtual()),

libsolidity/ast/ASTJsonImporter.cpp

@@ -381,6 +381,7 @@ ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::V
 	astAssert(_node["kind"].isString(), "Expected 'kind' to be a string!");
 
 	Token kind;
+	bool freeFunction = false;
 	string kindStr = member(_node, "kind").asString();
 
 	if (kindStr == "constructor")
@@ -391,6 +392,11 @@ ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::V
 		kind = Token::Fallback;
 	else if (kindStr == "receive")
 		kind = Token::Receive;
+	else if (kindStr == "freeFunction")
+	{
+		kind = Token::Function;
+		freeFunction = true;
+	}
 	else
 		astAssert(false, "Expected 'kind' to be one of [constructor, function, fallback, receive]");
 
@@ -399,16 +405,7 @@ ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::V
 		modifiers.push_back(createModifierInvocation(mod));
 
 	Visibility vis = Visibility::Default;
-	bool const freeFunction = _node.isMember("freeFunction") ? _node["freeFunction"].asBool() : false;
+	if (!freeFunction)
-	if (kind == Token::Constructor)
-	{
-	}
-	else if (freeFunction)
-		astAssert(
-			vis == Visibility::Internal || vis == Visibility::Default,
-			"Expected internal or default visibility for free function."
-		);
-	else
 		vis = visibility(_node);
 	return createASTNode<FunctionDefinition>(
 		_node,

test/cmdlineTests/recovery_ast_constructor/output

@@ -58,7 +58,6 @@ JSON AST:
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": true,
             "kind": "constructor",
@@ -121,7 +120,6 @@ JSON AST:
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "af11c34c",
             "implemented": true,
             "isConstructor": false,

test/cmdlineTests/standard_only_ast_requested/output.json

@@ -1 +1 @@
-{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"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","documentation":null,"fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"97:2:0","statements":[]},"documentation":null,"freeFunction":false,"functionSelector":"26121ff0","id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nodeType":"FunctionDefinition","overrides":null,"parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"82:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"97:0:0"},"scope":6,"src":"72:27:0","stateMutability":"pure","virtual":false,"visibility":"public"}],"scope":7,"src":"59:42:0"}],"src":"36:65:0"},"id":0}}}
+{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"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","documentation":null,"fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"97:2:0","statements":[]},"documentation":null,"functionSelector":"26121ff0","id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nodeType":"FunctionDefinition","overrides":null,"parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"82:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"97:0:0"},"scope":6,"src":"72:27:0","stateMutability":"pure","virtual":false,"visibility":"public"}],"scope":7,"src":"59:42:0"}],"src":"36:65:0"},"id":0}}}

test/libsolidity/ASTJSON/abstract_contract.json

@@ -34,7 +34,6 @@
             "src": "37:4:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 4,
           "implemented": true,
           "kind": "constructor",

test/libsolidity/ASTJSON/abstract_contract_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": true,
             "kind": "constructor",

test/libsolidity/ASTJSON/address_payable.json

@@ -462,7 +462,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "fc68521a",
           "id": 38,
           "implemented": true,

test/libsolidity/ASTJSON/address_payable_legacy.json

@@ -91,7 +91,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "fc68521a",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/call.json

@@ -131,7 +131,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "b582ec5f",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/call_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "b582ec5f",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/empty_block.json

@@ -56,7 +56,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "e2179b8e",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/empty_block_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "e2179b8e",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/function.json

@@ -118,7 +118,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "b8c9d365",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/function_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "b8c9d365",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/leave.json

@@ -68,7 +68,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "ece866b9",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/leave_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "ece866b9",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/loop.json

@@ -131,7 +131,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "e2179b8e",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/loop_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "e2179b8e",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/nested_functions.json

@@ -95,7 +95,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 7,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/nested_functions_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/slot_offset.json

@@ -196,7 +196,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "ffae15ba",
           "id": 10,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/slot_offset_legacy.json

@@ -112,7 +112,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "ffae15ba",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/stringlit.json

@@ -72,7 +72,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "5a2ee019",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/stringlit_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "5a2ee019",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/switch.json

@@ -180,7 +180,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/switch_default.json

@@ -95,7 +95,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "e2179b8e",
           "id": 5,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/switch_default_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "e2179b8e",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/switch_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/assembly/var_access.json

@@ -121,7 +121,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 8,
           "implemented": true,

test/libsolidity/ASTJSON/assembly/var_access_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/constructor.json

@@ -34,7 +34,6 @@
             "src": "28:4:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 4,
           "implemented": true,
           "kind": "constructor",

test/libsolidity/ASTJSON/constructor_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": true,
             "kind": "constructor",

test/libsolidity/ASTJSON/documentation.json

@@ -216,7 +216,6 @@
             "src": "162:25:3",
             "text": "Some comment on fn."
           },
-          "freeFunction": false,
           "functionSelector": "a4a2c40b",
           "id": 22,
           "implemented": true,

test/libsolidity/ASTJSON/documentation_legacy.json

@@ -161,7 +161,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "a4a2c40b",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/fallback.json

@@ -34,7 +34,6 @@
             "src": "43:5:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 4,
           "implemented": true,
           "kind": "fallback",

test/libsolidity/ASTJSON/fallback_and_reveice_ether.json

@@ -34,7 +34,6 @@
             "src": "42:5:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 4,
           "implemented": true,
           "kind": "receive",
@@ -69,7 +68,6 @@
             "src": "78:5:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 8,
           "implemented": true,
           "kind": "fallback",

test/libsolidity/ASTJSON/fallback_and_reveice_ether_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": false,
             "kind": "receive",
@@ -101,7 +100,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": false,
             "kind": "fallback",

test/libsolidity/ASTJSON/fallback_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": false,
             "kind": "fallback",

test/libsolidity/ASTJSON/fallback_payable.json

@@ -34,7 +34,6 @@
             "src": "34:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 4,
           "implemented": true,
           "kind": "fallback",

test/libsolidity/ASTJSON/fallback_payable_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": false,
             "kind": "fallback",

test/libsolidity/ASTJSON/function_type.json

@@ -34,7 +34,6 @@
             "src": "120:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "d6cd4974",
           "id": 16,
           "implemented": true,

test/libsolidity/ASTJSON/function_type_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "d6cd4974",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/long_type_name_binary_operation.json

@@ -134,7 +134,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 10,
           "implemented": true,

test/libsolidity/ASTJSON/long_type_name_binary_operation_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/long_type_name_identifier.json

@@ -142,7 +142,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 14,
           "implemented": true,

test/libsolidity/ASTJSON/long_type_name_identifier_legacy.json

@@ -79,7 +79,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/modifier_definition.json

@@ -94,7 +94,6 @@
             "src": "64:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "28811f59",
           "id": 13,
           "implemented": true,

test/libsolidity/ASTJSON/modifier_definition_legacy.json

@@ -102,7 +102,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "28811f59",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/modifier_invocation.json

@@ -94,7 +94,6 @@
             "src": "64:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "28811f59",
           "id": 13,
           "implemented": true,

test/libsolidity/ASTJSON/modifier_invocation_legacy.json

@@ -102,7 +102,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "28811f59",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/non_utf8.json

@@ -94,7 +94,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 8,
           "implemented": true,

test/libsolidity/ASTJSON/non_utf8_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/override.json

@@ -42,7 +42,6 @@
             "src": "36:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "a399b6a2",
           "id": 4,
           "implemented": true,
@@ -114,7 +113,6 @@
       "nodes":
       [
         {
-          "freeFunction": false,
           "functionSelector": "c2985578",
           "id": 10,
           "implemented": false,
@@ -154,7 +152,6 @@
             "src": "115:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "a399b6a2",
           "id": 15,
           "implemented": true,
@@ -246,7 +243,6 @@
             "src": "170:3:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "c2985578",
           "id": 23,
           "implemented": true,
@@ -293,7 +289,6 @@
             "src": "212:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "a399b6a2",
           "id": 30,
           "implemented": true,

test/libsolidity/ASTJSON/override_legacy.json

@@ -46,7 +46,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "a399b6a2",
             "implemented": true,
             "isConstructor": false,
@@ -155,7 +154,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "c2985578",
             "implemented": false,
             "isConstructor": false,
@@ -210,7 +208,6 @@
             [
               4
             ],
-            "freeFunction": false,
             "functionSelector": "a399b6a2",
             "implemented": true,
             "isConstructor": false,
@@ -337,7 +334,6 @@
             [
               10
             ],
-            "freeFunction": false,
             "functionSelector": "c2985578",
             "implemented": true,
             "isConstructor": false,
@@ -417,7 +413,6 @@
             [
               15
             ],
-            "freeFunction": false,
             "functionSelector": "a399b6a2",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/receive_ether.json

@@ -34,7 +34,6 @@
             "src": "42:5:1",
             "statements": []
           },
-          "freeFunction": false,
           "id": 4,
           "implemented": true,
           "kind": "receive",

test/libsolidity/ASTJSON/receive_ether_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "implemented": true,
             "isConstructor": false,
             "kind": "receive",

test/libsolidity/ASTJSON/short_type_name.json

@@ -88,7 +88,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 10,
           "implemented": true,

test/libsolidity/ASTJSON/short_type_name_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/short_type_name_ref.json

@@ -99,7 +99,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 11,
           "implemented": true,

test/libsolidity/ASTJSON/short_type_name_ref_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/source_location.json

@@ -131,7 +131,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 11,
           "implemented": true,

test/libsolidity/ASTJSON/source_location_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/string.json

@@ -95,7 +95,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 8,
           "implemented": true,

test/libsolidity/ASTJSON/string_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/two_base_functions.json

@@ -42,7 +42,6 @@
             "src": "45:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 4,
           "implemented": true,
@@ -97,7 +96,6 @@
             "src": "95:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 9,
           "implemented": true,
@@ -201,7 +199,6 @@
             "src": "160:2:1",
             "statements": []
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 21,
           "implemented": true,

test/libsolidity/ASTJSON/two_base_functions_legacy.json

@@ -46,7 +46,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,
@@ -138,7 +137,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,
@@ -274,7 +272,6 @@
               4,
               9
             ],
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,

test/libsolidity/ASTJSON/unicode.json

@@ -95,7 +95,6 @@
               }
             ]
           },
-          "freeFunction": false,
           "functionSelector": "26121ff0",
           "id": 8,
           "implemented": true,

test/libsolidity/ASTJSON/unicode_legacy.json

@@ -38,7 +38,6 @@
         {
           "attributes":
           {
-            "freeFunction": false,
             "functionSelector": "26121ff0",
             "implemented": true,
             "isConstructor": false,