diff --git a/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol b/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol index 270f1908f..0d332bf1a 100644 --- a/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol +++ b/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol @@ -6,4 +6,4 @@ contract C { // ---- // DeclarationError: (28-45): The "constant" keyword can only be used for state variables. // TypeError: (69-72): Invalid array length, expected integer literal or constant expression. -// TypeError: (64-75): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (64-75): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol index b80849ceb..0ed969464 100644 --- a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol +++ b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol @@ -5,5 +5,4 @@ library L { } // ---- -// TypeError: (66-81): Data location must be "memory" for parameter in function, but "calldata" was given. -// TypeError: (159-173): Data location must be "memory" for parameter in function, but "storage" was given. +// TypeError: (159-173): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol index cbcf2a6e2..5d956b2f5 100644 --- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function i() external pure returns(uint[]) {} } // ---- -// TypeError: (52-58): Data location must be "memory" for return parameter in function, but none was given. +// TypeError: (52-58): Data location must be "memory" or "calldata" for return parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol index d30bde3f2..c831f96a2 100644 --- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol +++ b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_memory.sol @@ -2,4 +2,5 @@ contract test { function f(bytes memory) external; } // ---- -// TypeError: (31-43): Data location must be "calldata" for parameter in external function, but "memory" was given. +// TypeError: (0-56): Contract "test" should be marked as abstract. +// TypeError: (20-54): Functions without implementation must be marked virtual. diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol index 7dc5ba6d5..9c4df92d8 100644 --- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol +++ b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol @@ -2,4 +2,4 @@ contract test { function f(bytes storage) external; } // ---- -// TypeError: (31-44): Data location must be "calldata" for parameter in external function, but "storage" was given. +// TypeError: (31-44): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol index da3abff4e..edf6d04c5 100644 --- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol +++ b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_calldata.sol @@ -2,4 +2,5 @@ contract test { function f(bytes calldata) internal; } // ---- -// TypeError: (31-45): Data location must be "storage" or "memory" for parameter in function, but "calldata" was given. +// TypeError: (0-58): Contract "test" should be marked as abstract. +// TypeError: (20-56): Functions without implementation must be marked virtual. diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol index f1c4a5504..7ea8f2a57 100644 --- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function g(uint[]) internal pure {} } // ---- -// TypeError: (28-34): Data location must be "storage" or "memory" for parameter in function, but none was given. +// TypeError: (28-34): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol index a32995e75..847b595fe 100644 --- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function g() internal pure returns(uint[]) {} } // ---- -// TypeError: (52-58): Data location must be "storage" or "memory" for return parameter in function, but none was given. +// TypeError: (52-58): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol index c20088b7f..36619c5a3 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol @@ -6,7 +6,7 @@ library L { function j(mapping(uint => uint)) external pure {} } // ---- -// TypeError: (52-59): Data location must be "storage" or "calldata" for parameter in external function, but none was given. -// TypeError: (93-99): Data location must be "storage" or "calldata" for parameter in external function, but none was given. -// TypeError: (133-134): Data location must be "storage" or "calldata" for parameter in external function, but none was given. -// TypeError: (168-189): Data location must be "storage" or "calldata" for parameter in external function, but none was given. +// TypeError: (52-59): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given. +// TypeError: (93-99): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given. +// TypeError: (133-134): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given. +// TypeError: (168-189): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol index fa3a78213..4bbd34704 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol @@ -6,7 +6,7 @@ library L { function j() external pure returns (mapping(uint => uint)) {} } // ---- -// TypeError: (77-84): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (129-135): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (180-181): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (226-247): Data location must be "storage" or "memory" for return parameter in function, but none was given. +// TypeError: (77-84): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (129-135): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (180-181): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (226-247): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol index 68c177a8b..670201444 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol @@ -10,11 +10,11 @@ library L { function jp(mapping(uint => uint)) internal pure {} } // ---- -// TypeError: (77-84): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (129-135): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (180-181): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (226-247): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (268-275): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (310-316): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (351-352): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (387-408): Data location must be "storage" or "memory" for parameter in function, but none was given. +// TypeError: (77-84): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (129-135): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (180-181): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (226-247): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (268-275): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (310-316): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (351-352): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (387-408): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol index 35256eae1..d56607497 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol @@ -10,11 +10,11 @@ library L { function jp(mapping(uint => uint)) private pure {} } // ---- -// TypeError: (76-83): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (127-133): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (177-178): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (222-243): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (264-271): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (305-311): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (345-346): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (380-401): Data location must be "storage" or "memory" for parameter in function, but none was given. +// TypeError: (76-83): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (127-133): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (177-178): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (222-243): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (264-271): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (305-311): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (345-346): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (380-401): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol index f8f8dcb26..3910c79ed 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol @@ -9,11 +9,11 @@ library L { function ip(S) private pure {} function jp(mapping(uint => uint)) private pure {}} // ---- -// TypeError: (76-83): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (127-133): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (177-178): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (222-243): Data location must be "storage" or "memory" for return parameter in function, but none was given. -// TypeError: (264-271): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (305-311): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (345-346): Data location must be "storage" or "memory" for parameter in function, but none was given. -// TypeError: (380-401): Data location must be "storage" or "memory" for parameter in function, but none was given. +// TypeError: (76-83): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (127-133): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (177-178): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (222-243): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. +// TypeError: (264-271): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (305-311): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (345-346): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. +// TypeError: (380-401): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol index 8dd898452..2a374eb77 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_memory.sol @@ -2,4 +2,3 @@ library test { function f(bytes memory) external {} } // ---- -// TypeError: (30-42): Data location must be "storage" or "calldata" for parameter in external function, but "memory" was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol index c4b81f98b..b9291a52d 100644 --- a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol +++ b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_calldata.sol @@ -2,4 +2,3 @@ library test { function f(bytes calldata) internal pure {} } // ---- -// TypeError: (30-44): Data location must be "storage" or "memory" for parameter in function, but "calldata" was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol index fdd5cbaf6..1a58b6020 100644 --- a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function f(uint[]) private pure {} } // ---- -// TypeError: (28-34): Data location must be "storage" or "memory" for parameter in function, but none was given. +// TypeError: (28-34): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol index 65ec1bcef..cf38ba424 100644 --- a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function f() private pure returns(uint[]) {} } // ---- -// TypeError: (51-57): Data location must be "storage" or "memory" for return parameter in function, but none was given. +// TypeError: (51-57): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol index 3aba870f9..c1904542e 100644 --- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol +++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_calldata.sol @@ -2,4 +2,5 @@ contract test { function f(bytes calldata) public; } // ---- -// TypeError: (31-45): Data location must be "memory" for parameter in function, but "calldata" was given. +// TypeError: (0-56): Contract "test" should be marked as abstract. +// TypeError: (20-54): Functions without implementation must be marked virtual. diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol index 1c033a693..4a73c2a76 100644 --- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol +++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol @@ -2,4 +2,4 @@ contract test { function f(bytes storage) public; } // ---- -// TypeError: (31-44): Data location must be "memory" for parameter in function, but "storage" was given. +// TypeError: (31-44): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol index f76bd6313..31a731893 100644 --- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function h(uint[]) public pure {} } // ---- -// TypeError: (28-34): Data location must be "memory" for parameter in function, but none was given. +// TypeError: (28-34): Data location must be "memory" or "calldata" for parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol index 6b087c346..e1b86b092 100644 --- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol +++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol @@ -2,4 +2,4 @@ contract C { function h() public pure returns(uint[]) {} } // ---- -// TypeError: (50-56): Data location must be "memory" for return parameter in function, but none was given. +// TypeError: (50-56): Data location must be "memory" or "calldata" for return parameter in function, but none was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol index 678e7e42b..2d653805b 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol @@ -3,4 +3,4 @@ contract c { } // ---- // TypeError: (51-52): Invalid array length, expected integer literal or constant expression. -// TypeError: (45-55): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (45-55): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol index ab736e7da..3d21f42a7 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol @@ -3,4 +3,4 @@ contract c { } // ---- // TypeError: (51-53): Array with negative length specified. -// TypeError: (45-56): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (45-56): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol index 22d515eae..af9b8ba68 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/204_overwrite_memory_location_external.sol @@ -2,4 +2,3 @@ contract C { function f(uint[] memory a) external {} } // ---- -// TypeError: (28-43): Data location must be "calldata" for parameter in external function, but "memory" was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol index 3825809cc..c56a57c49 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol @@ -2,4 +2,4 @@ contract C { function f(uint[] storage a) external {} } // ---- -// TypeError: (28-44): Data location must be "calldata" for parameter in external function, but "storage" was given. +// TypeError: (28-44): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol index 7e18c5fe7..5b131e0f6 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol @@ -5,4 +5,4 @@ contract test { } // ---- // TypeError: (55-58): Array with fractional length specified. -// TypeError: (50-61): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (50-61): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol index 8aef0ac23..b11db892d 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol @@ -5,4 +5,4 @@ contract test { } // ---- // TypeError: (55-65): Invalid array length, expected integer literal or constant expression. -// TypeError: (50-68): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (50-68): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol index dfd145f8e..a3b8ad1f6 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol @@ -5,4 +5,4 @@ contract test { } // ---- // TypeError: (55-66): Invalid array length, expected integer literal or constant expression. -// TypeError: (50-69): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (50-69): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol index de42ebd7c..6a77c3785 100644 --- a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol +++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol @@ -9,5 +9,5 @@ contract C { } } // ---- -// TypeError: (104-107): Data location must be "storage" or "memory" for variable, but none was given. -// TypeError: (123-131): Data location must be "storage" or "memory" for variable, but none was given. +// TypeError: (104-107): Data location must be "storage", "memory" or "calldata" for variable, but none was given. +// TypeError: (123-131): Data location must be "storage", "memory" or "calldata" for variable, but none was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/argument_external.sol index 2b5e6b054..515b43741 100644 --- a/test/libsolidity/syntaxTests/types/mapping/argument_external.sol +++ b/test/libsolidity/syntaxTests/types/mapping/argument_external.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (28-57): Data location must be "calldata" for parameter in external function, but "storage" was given. +// TypeError: (28-57): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/argument_public.sol index 32f11fe91..bdd3ee602 100644 --- a/test/libsolidity/syntaxTests/types/mapping/argument_public.sol +++ b/test/libsolidity/syntaxTests/types/mapping/argument_public.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (28-57): Data location must be "memory" for parameter in function, but "storage" was given. +// TypeError: (28-57): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol index 0863653cc..993938a81 100644 --- a/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol +++ b/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (28-59): Data location must be "calldata" for parameter in external function, but "storage" was given. +// TypeError: (28-59): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol index 99c83d8ac..1ddf12e90 100644 --- a/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol +++ b/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (28-59): Data location must be "memory" for parameter in function, but "storage" was given. +// TypeError: (28-59): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol index 8638baf85..529c63bcf 100644 --- a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol +++ b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (37-64): Data location must be "memory" for parameter in function, but "storage" was given. +// TypeError: (37-64): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol index b9bd5bc3f..c18aff714 100644 --- a/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol +++ b/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (57-84): Data location must be "memory" for return parameter in function, but "storage" was given. +// TypeError: (57-84): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol index fe021bd06..2f7d7e2ed 100644 --- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol +++ b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (53-84): Data location must be "memory" for return parameter in function, but "storage" was given. +// TypeError: (53-84): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol index 1eb9d03b1..d48c8b2a8 100644 --- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol +++ b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (51-82): Data location must be "memory" for return parameter in function, but "storage" was given. +// TypeError: (51-82): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol index 17e646ceb..243bbf72f 100644 --- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol +++ b/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (53-82): Data location must be "memory" for return parameter in function, but "storage" was given. +// TypeError: (53-82): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given. diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol index cf5ec4ff9..e488a34e1 100644 --- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol +++ b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol @@ -3,4 +3,4 @@ contract C { } } // ---- -// TypeError: (51-80): Data location must be "memory" for return parameter in function, but "storage" was given. +// TypeError: (51-80): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.