diff --git a/test/libsolidity/natspecJSON/custom.sol b/test/libsolidity/natspecJSON/custom.sol index 8aa780e75..43fd7283e 100644 --- a/test/libsolidity/natspecJSON/custom.sol +++ b/test/libsolidity/natspecJSON/custom.sol @@ -17,6 +17,7 @@ contract A { // "custom:t": "onetwo", // "custom:x": "one two three", // "custom:y": "line break", +// "kind": "dev", // "methods": // { // "g(int256)": @@ -30,5 +31,6 @@ contract A { // { // "custom:note": "statevar" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/custom_inheritance.sol b/test/libsolidity/natspecJSON/custom_inheritance.sol index 815e4deeb..f4fb80b55 100644 --- a/test/libsolidity/natspecJSON/custom_inheritance.sol +++ b/test/libsolidity/natspecJSON/custom_inheritance.sol @@ -10,16 +10,20 @@ contract B is A { // ---- // :A devdoc // { +// "kind": "dev", // "methods": // { // "g(uint256)": // { // "custom:since": "2014" // } -// } +// }, +// "version": 1 // } // // :B devdoc // { -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol index 6b9d75ba7..422522354 100644 --- a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol +++ b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol @@ -8,22 +8,26 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256)": // { // "details": "Multiplies a number by 7" // } -// } +// }, +// "version": 1 // } // // :test userdoc // { +// "kind": "user", // "methods": // { // "mul(uint256)": // { // "notice": "Multiplies `a` by 7" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol index aaf9ec315..db7447914 100644 --- a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol +++ b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol @@ -11,10 +11,14 @@ contract test { // ---- // :test devdoc // { -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_constructor.sol b/test/libsolidity/natspecJSON/dev_constructor.sol index 01fa9cb41..ffdcfea94 100644 --- a/test/libsolidity/natspecJSON/dev_constructor.sol +++ b/test/libsolidity/natspecJSON/dev_constructor.sol @@ -8,6 +8,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "constructor": @@ -18,5 +19,6 @@ contract test { // "second": "the second parameter is not very useful, it just provides additional confusion" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol index ea954827a..e15f03f03 100644 --- a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol +++ b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol @@ -17,6 +17,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "constructor": @@ -40,5 +41,6 @@ contract test { // "d": "The result of the multiplication and cookies with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_contract_doc.sol b/test/libsolidity/natspecJSON/dev_contract_doc.sol index 22c45dfb8..5acc2d198 100644 --- a/test/libsolidity/natspecJSON/dev_contract_doc.sol +++ b/test/libsolidity/natspecJSON/dev_contract_doc.sol @@ -10,6 +10,7 @@ contract test { // :test devdoc // { // "author": "Lefteris", +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -17,5 +18,6 @@ contract test { // "details": "Mul function" // } // }, -// "title": "Just a test contract" +// "title": "Just a test contract", +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol index 6e7d587d1..aa8a86a0e 100644 --- a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol +++ b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol @@ -7,11 +7,13 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": // { // "details": "Mul function" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_default_inherit.sol b/test/libsolidity/natspecJSON/dev_default_inherit.sol index 6a106fbf0..d144b3840 100644 --- a/test/libsolidity/natspecJSON/dev_default_inherit.sol +++ b/test/libsolidity/natspecJSON/dev_default_inherit.sol @@ -25,6 +25,7 @@ contract Token is Middle { // ---- // :ERC20 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -36,11 +37,13 @@ contract Token is Middle { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Middle devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -52,11 +55,13 @@ contract Token is Middle { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Token devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -68,5 +73,6 @@ contract Token is Middle { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol index 7e75d30f8..1974bd651 100644 --- a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol +++ b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol @@ -14,17 +14,20 @@ contract D is C { // ---- // :C devdoc // { +// "kind": "dev", // "methods": // { // "x()": // { // "details": "test" // } -// } +// }, +// "version": 1 // } // // :D devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -32,5 +35,6 @@ contract D is C { // { // "details": "test" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol index 745ab190b..f7e892ae8 100644 --- a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol +++ b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol @@ -10,6 +10,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -21,5 +22,6 @@ contract test { // "second": "Documentation for the second parameter" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_different_return_name.sol b/test/libsolidity/natspecJSON/dev_different_return_name.sol index 3a1606dc5..2b7160be1 100644 --- a/test/libsolidity/natspecJSON/dev_different_return_name.sol +++ b/test/libsolidity/natspecJSON/dev_different_return_name.sol @@ -11,6 +11,7 @@ contract B is A { // ---- // :A devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -20,11 +21,13 @@ contract B is A { // "y": "value" // } // } -// } +// }, +// "version": 1 // } // // :B devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -34,5 +37,6 @@ contract B is A { // "z": "value" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol index 8dc76fb70..90e21462c 100644 --- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol +++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol @@ -12,6 +12,7 @@ contract B is A { // ---- // :A devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -22,11 +23,13 @@ contract B is A { // "b": "value B" // } // } -// } +// }, +// "version": 1 // } // // :B devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -37,5 +40,6 @@ contract B is A { // "z": "value A" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol index 1fa8eb9fb..1ddf47aee 100644 --- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol +++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol @@ -12,6 +12,7 @@ contract B is A { // ---- // :A devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -22,11 +23,13 @@ contract B is A { // "b": "value B" // } // } -// } +// }, +// "version": 1 // } // // :B devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -37,5 +40,6 @@ contract B is A { // "z": "value A" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol index c0ce38726..cc172a8c8 100644 --- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol +++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol @@ -12,6 +12,7 @@ contract B is A { // ---- // :A devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -22,11 +23,13 @@ contract B is A { // "_1": "value B" // } // } -// } +// }, +// "version": 1 // } // // :B devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -37,5 +40,6 @@ contract B is A { // "z": "value A" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol index f665035b9..5efae37f2 100644 --- a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol +++ b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol @@ -23,6 +23,7 @@ contract Token is ERC21, ERC20 { // ---- // :ERC20 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -34,11 +35,13 @@ contract Token is ERC21, ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Token devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -50,5 +53,6 @@ contract Token is ERC21, ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol index c251f678e..2f1f8f17f 100644 --- a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol +++ b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol @@ -23,6 +23,7 @@ contract Token is ERC20 { // ---- // :ERC20 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -34,11 +35,13 @@ contract Token is ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :ERC21 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -50,11 +53,13 @@ contract Token is ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Token devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -66,5 +71,6 @@ contract Token is ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol index 02a0f2cc7..c87f6c30f 100644 --- a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol +++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol @@ -30,6 +30,7 @@ contract Token is myInterfaces.ERC20, myInterfaces.ERC21 { // ---- // Testfile.sol:Token devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -41,5 +42,6 @@ contract Token is myInterfaces.ERC20, myInterfaces.ERC21 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol index bbe44ad7d..0dce69ccb 100644 --- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol +++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol @@ -25,6 +25,7 @@ contract Token is ERC21, ERC20 { // ---- // :ERC20 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -36,11 +37,13 @@ contract Token is ERC21, ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Token devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -52,5 +55,6 @@ contract Token is ERC21, ERC20 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol index 40a852a1e..e9590d9ce 100644 --- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol +++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol @@ -25,6 +25,7 @@ contract Token is ERC21 { // ---- // :ERC20 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -36,11 +37,13 @@ contract Token is ERC21 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Token devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -52,5 +55,6 @@ contract Token is ERC21 { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol index f868453d0..cf3b1aba3 100644 --- a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol +++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol @@ -21,17 +21,20 @@ contract D is C, B { // ---- // :C devdoc // { +// "kind": "dev", // "methods": // { // "x()": // { // "details": "test" // } -// } +// }, +// "version": 1 // } // // :D devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -39,5 +42,6 @@ contract D is C, B { // { // "details": "test" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol index a395fc051..579660f2f 100644 --- a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol +++ b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol @@ -22,6 +22,7 @@ contract Token is Middle { // ---- // :ERC20 devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -33,11 +34,13 @@ contract Token is Middle { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Middle devdoc // { +// "kind": "dev", // "methods": // { // "transfer(address,uint256)": @@ -49,10 +52,13 @@ contract Token is Middle { // "to": "address to transfer to" // } // } -// } +// }, +// "version": 1 // } // // :Token devdoc // { -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_multiline_comment.sol b/test/libsolidity/natspecJSON/dev_multiline_comment.sol index 9eb06e5c9..7757636c9 100644 --- a/test/libsolidity/natspecJSON/dev_multiline_comment.sol +++ b/test/libsolidity/natspecJSON/dev_multiline_comment.sol @@ -16,6 +16,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -31,5 +32,6 @@ contract test { // "d": "The result of the multiplication and cookies with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_multiline_return.sol b/test/libsolidity/natspecJSON/dev_multiline_return.sol index 88169fbf1..792cf11ce 100644 --- a/test/libsolidity/natspecJSON/dev_multiline_return.sol +++ b/test/libsolidity/natspecJSON/dev_multiline_return.sol @@ -14,6 +14,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -29,5 +30,6 @@ contract test { // "d": "The result of the multiplication and cookies with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_multiple_functions.sol b/test/libsolidity/natspecJSON/dev_multiple_functions.sol index 2be5dae5a..f3fb5876a 100644 --- a/test/libsolidity/natspecJSON/dev_multiple_functions.sol +++ b/test/libsolidity/natspecJSON/dev_multiple_functions.sol @@ -22,6 +22,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "divide(uint256,uint256)": @@ -50,5 +51,6 @@ contract test { // "input": "Documentation for the input parameter" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_multiple_params.sol b/test/libsolidity/natspecJSON/dev_multiple_params.sol index de3c57cf5..909452ee8 100644 --- a/test/libsolidity/natspecJSON/dev_multiple_params.sol +++ b/test/libsolidity/natspecJSON/dev_multiple_params.sol @@ -9,6 +9,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -20,5 +21,6 @@ contract test { // "second": "Documentation for the second parameter" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol index 50fb4d53b..f9dfa0b52 100644 --- a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol +++ b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol @@ -9,6 +9,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -20,5 +21,6 @@ contract test { // "second": "Documentation for the second parameter" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol index 0ed4d08cb..8c5092534 100644 --- a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol +++ b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol @@ -10,6 +10,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -21,5 +22,6 @@ contract test { // "second": "Documentation for the second parameter" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return.sol b/test/libsolidity/natspecJSON/dev_return.sol index ffe36c863..e17c6466c 100644 --- a/test/libsolidity/natspecJSON/dev_return.sol +++ b/test/libsolidity/natspecJSON/dev_return.sol @@ -11,6 +11,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -26,5 +27,6 @@ contract test { // "d": "The result of the multiplication" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol index 0ef904347..4c17105fc 100644 --- a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol +++ b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol @@ -14,6 +14,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -29,5 +30,6 @@ contract test { // "d": "The result of the multiplication" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol index b8d167d2c..d902983a0 100644 --- a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol +++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol @@ -15,6 +15,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -31,5 +32,6 @@ contract test { // "f": "And cookies with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol index fc48d1f66..877e14927 100644 --- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol +++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol @@ -15,6 +15,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -31,5 +32,6 @@ contract test { // "_1": "And cookies with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol index 84d55a1f5..2b8c1771a 100644 --- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol +++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol @@ -15,6 +15,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -31,5 +32,6 @@ contract test { // "_cookies": "And cookies with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol index 9847c3ac2..208a95095 100644 --- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol +++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol @@ -17,6 +17,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -34,5 +35,6 @@ contract test { // "_milk": "And milk with nutella" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol index 555c7f925..a96535a61 100644 --- a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol +++ b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol @@ -11,6 +11,7 @@ contract B is A { // ---- // :A devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -20,11 +21,13 @@ contract B is A { // "a": "a" // } // } -// } +// }, +// "version": 1 // } // // :B devdoc // { +// "kind": "dev", // "methods": // { // "g(int256)": @@ -34,5 +37,6 @@ contract B is A { // "b": "a" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_return_no_params.sol b/test/libsolidity/natspecJSON/dev_return_no_params.sol index 870058b07..e7e9e8cbb 100644 --- a/test/libsolidity/natspecJSON/dev_return_no_params.sol +++ b/test/libsolidity/natspecJSON/dev_return_no_params.sol @@ -7,6 +7,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": // { // "mul(uint256,uint256)": @@ -16,5 +17,6 @@ contract test { // "d": "The result of the multiplication" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol index 7cc09a183..5d9ce6e80 100644 --- a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol +++ b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol @@ -17,6 +17,7 @@ contract Thing is IThing { // ---- // :IThing devdoc // { +// "kind": "dev", // "methods": // { // "value()": @@ -27,11 +28,13 @@ contract Thing is IThing { // "y": "another number" // } // } -// } +// }, +// "version": 1 // } // // :Thing devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -43,5 +46,6 @@ contract Thing is IThing { // "y": "another number" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol index 050abfd7f..dcc86ed93 100644 --- a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol +++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol @@ -17,6 +17,7 @@ contract Thing is IThing { // ---- // :IThing devdoc // { +// "kind": "dev", // "methods": // { // "value()": @@ -27,11 +28,13 @@ contract Thing is IThing { // "y": "another number" // } // } -// } +// }, +// "version": 1 // } // // :Thing devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -43,5 +46,6 @@ contract Thing is IThing { // "b": "another number" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol index 927037f12..dc97cb8a9 100644 --- a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol +++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol @@ -15,6 +15,7 @@ contract Thing is IThing { // ---- // :IThing devdoc // { +// "kind": "dev", // "methods": // { // "value(uint256)": @@ -24,11 +25,13 @@ contract Thing is IThing { // "_0": "" // } // } -// } +// }, +// "version": 1 // } // // :Thing devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -40,5 +43,6 @@ contract Thing is IThing { // "x": "" // } // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/empty_comment.sol b/test/libsolidity/natspecJSON/empty_comment.sol index 0f7d691a2..db0f9e533 100644 --- a/test/libsolidity/natspecJSON/empty_comment.sol +++ b/test/libsolidity/natspecJSON/empty_comment.sol @@ -6,5 +6,7 @@ contract test // ---- // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/error.sol b/test/libsolidity/natspecJSON/error.sol index 71b6e9a62..c82412fec 100644 --- a/test/libsolidity/natspecJSON/error.sol +++ b/test/libsolidity/natspecJSON/error.sol @@ -24,7 +24,9 @@ contract test { // } // ] // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :test userdoc @@ -38,5 +40,7 @@ contract test { // } // ] // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/error_multiple.sol b/test/libsolidity/natspecJSON/error_multiple.sol index cb47cfa6d..336710ec3 100644 --- a/test/libsolidity/natspecJSON/error_multiple.sol +++ b/test/libsolidity/natspecJSON/error_multiple.sol @@ -45,7 +45,9 @@ contract test { // } // ] // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :test userdoc @@ -62,5 +64,7 @@ contract test { // } // ] // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/event.sol b/test/libsolidity/natspecJSON/event.sol index bf719b709..9887b021d 100644 --- a/test/libsolidity/natspecJSON/event.sol +++ b/test/libsolidity/natspecJSON/event.sol @@ -24,7 +24,9 @@ contract ERC20 { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :ERC20 userdoc @@ -36,5 +38,7 @@ contract ERC20 { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/event_inheritance.sol b/test/libsolidity/natspecJSON/event_inheritance.sol index e747b7175..7912bd1b5 100644 --- a/test/libsolidity/natspecJSON/event_inheritance.sol +++ b/test/libsolidity/natspecJSON/event_inheritance.sol @@ -28,7 +28,9 @@ contract B is A { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :A userdoc @@ -40,7 +42,9 @@ contract B is A { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } // // :B devdoc @@ -58,7 +62,9 @@ contract B is A { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :B userdoc @@ -70,7 +76,9 @@ contract B is A { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } // // :ERC20 devdoc @@ -88,7 +96,9 @@ contract B is A { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :ERC20 userdoc @@ -100,5 +110,7 @@ contract B is A { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/event_inheritance_interface.sol b/test/libsolidity/natspecJSON/event_inheritance_interface.sol index be93f9937..8b4137fcc 100644 --- a/test/libsolidity/natspecJSON/event_inheritance_interface.sol +++ b/test/libsolidity/natspecJSON/event_inheritance_interface.sol @@ -28,7 +28,9 @@ contract B is A { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :A userdoc @@ -40,7 +42,9 @@ contract B is A { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } // // :B devdoc @@ -58,7 +62,9 @@ contract B is A { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :B userdoc @@ -70,7 +76,9 @@ contract B is A { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } // // :ERC20 devdoc @@ -88,7 +96,9 @@ contract B is A { // } // } // }, -// "methods": {} +// "kind": "dev", +// "methods": {}, +// "version": 1 // } // // :ERC20 userdoc @@ -100,5 +110,7 @@ contract B is A { // "notice": "This event is emitted when a transfer occurs." // } // }, -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol index da28d3cd7..b29ccab0b 100644 --- a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol +++ b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol @@ -8,11 +8,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "mul(uint256)": // { // "notice": "I do something awesome which requires two lines to explain" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/notice_without_tag.sol b/test/libsolidity/natspecJSON/notice_without_tag.sol index 658f5316a..215393244 100644 --- a/test/libsolidity/natspecJSON/notice_without_tag.sol +++ b/test/libsolidity/natspecJSON/notice_without_tag.sol @@ -7,11 +7,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "mul(uint256)": // { // "notice": "I do something awesome" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/private_state_variable.sol b/test/libsolidity/natspecJSON/private_state_variable.sol index ed4bd56cc..7d7707a8d 100644 --- a/test/libsolidity/natspecJSON/private_state_variable.sol +++ b/test/libsolidity/natspecJSON/private_state_variable.sol @@ -7,6 +7,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -14,10 +15,13 @@ contract test { // { // "details": "example of dev" // } -// } +// }, +// "version": 1 // } // // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/public_state_variable.sol b/test/libsolidity/natspecJSON/public_state_variable.sol index 517080602..5fda30cec 100644 --- a/test/libsolidity/natspecJSON/public_state_variable.sol +++ b/test/libsolidity/natspecJSON/public_state_variable.sol @@ -9,6 +9,7 @@ contract test { // ---- // :test devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -21,16 +22,19 @@ contract test { // "_0": "returns state" // } // } -// } +// }, +// "version": 1 // } // // :test userdoc // { +// "kind": "user", // "methods": // { // "state()": // { // "notice": "example of notice" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct.sol b/test/libsolidity/natspecJSON/public_state_variable_struct.sol index a8dff229d..438247243 100644 --- a/test/libsolidity/natspecJSON/public_state_variable_struct.sol +++ b/test/libsolidity/natspecJSON/public_state_variable_struct.sol @@ -14,6 +14,7 @@ contract Bank { // ---- // :Bank devdoc // { +// "kind": "dev", // "methods": {}, // "stateVariables": // { @@ -25,16 +26,19 @@ contract Bank { // "reverseGraphicURL": "Back pic" // } // } -// } +// }, +// "version": 1 // } // // :Bank userdoc // { +// "kind": "user", // "methods": // { // "coinStack(uint256)": // { // "notice": "Get the n-th coin I own" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/slash3_slash3.sol b/test/libsolidity/natspecJSON/slash3_slash3.sol index ea40cdaa9..9c131ccc1 100644 --- a/test/libsolidity/natspecJSON/slash3_slash3.sol +++ b/test/libsolidity/natspecJSON/slash3_slash3.sol @@ -8,11 +8,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "f()": // { // "notice": "lorem ipsum" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/slash3_slash4.sol b/test/libsolidity/natspecJSON/slash3_slash4.sol index b8b5dc33e..4bdf5ba1a 100644 --- a/test/libsolidity/natspecJSON/slash3_slash4.sol +++ b/test/libsolidity/natspecJSON/slash3_slash4.sol @@ -8,11 +8,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "f()": // { // "notice": "lorem" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/slash4.sol b/test/libsolidity/natspecJSON/slash4.sol index 1016d6204..3acaea1f0 100644 --- a/test/libsolidity/natspecJSON/slash4.sol +++ b/test/libsolidity/natspecJSON/slash4.sol @@ -7,5 +7,7 @@ contract test { // ---- // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/star3.sol b/test/libsolidity/natspecJSON/star3.sol index 965ce1e66..c71fecad8 100644 --- a/test/libsolidity/natspecJSON/star3.sol +++ b/test/libsolidity/natspecJSON/star3.sol @@ -9,5 +9,7 @@ contract test { // ---- // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_basic_test.sol b/test/libsolidity/natspecJSON/user_basic_test.sol index 27df4c616..02d339e37 100644 --- a/test/libsolidity/natspecJSON/user_basic_test.sol +++ b/test/libsolidity/natspecJSON/user_basic_test.sol @@ -7,11 +7,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "mul(uint256)": // { // "notice": "Multiplies `a` by 7" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_constructor.sol b/test/libsolidity/natspecJSON/user_constructor.sol index bd49a376c..a3570f71d 100644 --- a/test/libsolidity/natspecJSON/user_constructor.sol +++ b/test/libsolidity/natspecJSON/user_constructor.sol @@ -7,11 +7,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "constructor": // { // "notice": "this is a really nice constructor" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_constructor_and_function.sol b/test/libsolidity/natspecJSON/user_constructor_and_function.sol index 0dd1b33fb..a6ace5f4a 100644 --- a/test/libsolidity/natspecJSON/user_constructor_and_function.sol +++ b/test/libsolidity/natspecJSON/user_constructor_and_function.sol @@ -9,6 +9,7 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "constructor": @@ -19,5 +20,6 @@ contract test { // { // "notice": "another multiplier" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_default_inherit.sol b/test/libsolidity/natspecJSON/user_default_inherit.sol index ab92e6bc6..459866247 100644 --- a/test/libsolidity/natspecJSON/user_default_inherit.sol +++ b/test/libsolidity/natspecJSON/user_default_inherit.sol @@ -25,33 +25,39 @@ contract Token is Middle { // ---- // :ERC20 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line." // } -// } +// }, +// "version": 1 // } // // :Middle userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line." // } -// } +// }, +// "version": 1 // } // // :Token userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line." // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol index eee21cd91..c470d0ba6 100644 --- a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol +++ b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol @@ -14,22 +14,26 @@ contract D is C { // ---- // :C userdoc // { +// "kind": "user", // "methods": // { // "x()": // { // "notice": "Hello world" // } -// } +// }, +// "version": 1 // } // // :D userdoc // { +// "kind": "user", // "methods": // { // "x()": // { // "notice": "Hello world" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_empty_contract.sol b/test/libsolidity/natspecJSON/user_empty_contract.sol index be7bc2a2f..afb1df7cb 100644 --- a/test/libsolidity/natspecJSON/user_empty_contract.sol +++ b/test/libsolidity/natspecJSON/user_empty_contract.sol @@ -4,5 +4,7 @@ contract test { } // ---- // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol index 08c438952..9c553e9a5 100644 --- a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol +++ b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol @@ -9,5 +9,7 @@ contract test { // ---- // :test userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit.sol b/test/libsolidity/natspecJSON/user_explicit_inherit.sol index 96ab8effe..2f02f415f 100644 --- a/test/libsolidity/natspecJSON/user_explicit_inherit.sol +++ b/test/libsolidity/natspecJSON/user_explicit_inherit.sol @@ -23,22 +23,26 @@ contract Token is ERC21, ERC20 { // ---- // :ERC20 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :Token userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol index 5be6140f0..74d76cd9e 100644 --- a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol +++ b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol @@ -23,33 +23,39 @@ contract Token is ERC20 { // ---- // :ERC20 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :ERC21 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :Token userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol index 5a865d822..7e85aae86 100644 --- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol +++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol @@ -25,22 +25,26 @@ contract Token is ERC21, ERC20 { // ---- // :ERC20 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :Token userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "override notice" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol index 460c90dd9..6f9fa996e 100644 --- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol +++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol @@ -25,22 +25,26 @@ contract Token is ERC21 { // ---- // :ERC20 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :Token userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "override notice" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol index 9e6e96bf6..f5171f4db 100644 --- a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol +++ b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol @@ -21,22 +21,26 @@ contract D is C, B { // ---- // :C userdoc // { +// "kind": "user", // "methods": // { // "x()": // { // "notice": "Hello world" // } -// } +// }, +// "version": 1 // } // // :D userdoc // { +// "kind": "user", // "methods": // { // "x()": // { // "notice": "Hello world" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol index a427f16af..2311106e3 100644 --- a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol +++ b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol @@ -22,27 +22,33 @@ contract Token is Middle { // ---- // :ERC20 userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :Middle userdoc // { +// "kind": "user", // "methods": // { // "transfer(address,uint256)": // { // "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``." // } -// } +// }, +// "version": 1 // } // // :Token userdoc // { -// "methods": {} +// "kind": "user", +// "methods": {}, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_multiline_comment.sol b/test/libsolidity/natspecJSON/user_multiline_comment.sol index e8c7f61de..a656bc636 100644 --- a/test/libsolidity/natspecJSON/user_multiline_comment.sol +++ b/test/libsolidity/natspecJSON/user_multiline_comment.sol @@ -10,11 +10,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "mul_and_add(uint256,uint256)": // { // "notice": "Multiplies `a` by 7 and then adds `b`" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol index 93f20a195..edd01f549 100644 --- a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol +++ b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol @@ -12,11 +12,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "f()": // { // "notice": "hello world" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_multiple_functions.sol b/test/libsolidity/natspecJSON/user_multiple_functions.sol index a2ae7f058..2a78e14cc 100644 --- a/test/libsolidity/natspecJSON/user_multiple_functions.sol +++ b/test/libsolidity/natspecJSON/user_multiple_functions.sol @@ -19,6 +19,7 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "divide(uint256,uint256)": @@ -33,5 +34,6 @@ contract test { // { // "notice": "Subtracts 3 from `input`" // } -// } +// }, +// "version": 1 // } diff --git a/test/libsolidity/natspecJSON/user_newline_break.sol b/test/libsolidity/natspecJSON/user_newline_break.sol index 97744a74f..64625864d 100644 --- a/test/libsolidity/natspecJSON/user_newline_break.sol +++ b/test/libsolidity/natspecJSON/user_newline_break.sol @@ -11,11 +11,13 @@ contract test { // ---- // :test userdoc // { +// "kind": "user", // "methods": // { // "f()": // { // "notice": "world" // } -// } +// }, +// "version": 1 // }