cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wording in error messages.

Browse Source
This commit is contained in:
chriseth 2020-10-29 19:40:17 +01:00
parent 631570c547
commit e27a1b786b
29 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/analysis/ContractLevelChecker.cpp
View File

@ -489,9 +489,9 @@ void ContractLevelChecker::checkBaseABICompatibility(ContractDefinition const& _
errors, errors,
std::string("Contract \"") + std::string("Contract \"") +
_contract.name() + _contract.name() +
"\" does not use ABIEncoderV2 but wants to inherit from a contract " + "\" does not use ABI coder v2 but wants to inherit from a contract " +
"which uses types that require it. " + "which uses types that require it. " +
"Use \"pragma experimental ABIEncoderV2;\" for the inheriting contract as well to enable the feature." "Use \"pragma abicoder v2;\" for the inheriting contract as well to enable the feature."
); );
} }

2
libsolidity/analysis/SyntaxChecker.cpp
View File

@ -124,7 +124,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
m_errorReporter.syntaxError( m_errorReporter.syntaxError(
8273_error, 8273_error,
_pragma.location(), _pragma.location(),
"ABI coder V1 has already been selected through \"pragma abicoder v1\"." "ABI coder v1 has already been selected through \"pragma abicoder v1\"."
); );
} }
else else

20
libsolidity/analysis/TypeChecker.cpp
View File

@ -400,8 +400,8 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
) )
{ {
string message = string message =
"This type is only supported in ABIEncoderV2. " "This type is only supported in ABI coder v2. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature."; "Use \"pragma abicoder v2;\" to enable the feature.";
if (_function.isConstructor()) if (_function.isConstructor())
message += message +=
" Alternatively, make the contract abstract and supply the " " Alternatively, make the contract abstract and supply the "
@ -577,9 +577,9 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
m_errorReporter.typeError( m_errorReporter.typeError(
2763_error, 2763_error,
_variable.location(), _variable.location(),
"The following types are only supported for getters in ABIEncoderV2: " + "The following types are only supported for getters in ABI coder v2: " +
joinHumanReadable(unsupportedTypes) + joinHumanReadable(unsupportedTypes) +
". Either remove \"public\" or use \"pragma experimental ABIEncoderV2;\" to enable the feature." ". Either remove \"public\" or use \"pragma abicoder v2;\" to enable the feature."
); );
} }
if (!getter.interfaceFunctionType()) if (!getter.interfaceFunctionType())
@ -698,8 +698,8 @@ bool TypeChecker::visit(EventDefinition const& _eventDef)
m_errorReporter.typeError( m_errorReporter.typeError(
3061_error, 3061_error,
var->location(), var->location(),
"This type is only supported in ABIEncoderV2. " "This type is only supported in ABI coder v2. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature." "Use \"pragma abicoder v2;\" to enable the feature."
); );
} }
if (_eventDef.isAnonymous() && numIndexed > 4) if (_eventDef.isAnonymous() && numIndexed > 4)
@ -2205,8 +2205,8 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
2443_error, 2443_error,
paramArgMap[i]->location(), paramArgMap[i]->location(),
"The type of this parameter, " + parameterTypes[i]->toString(true) + ", " "The type of this parameter, " + parameterTypes[i]->toString(true) + ", "
"is only supported in ABIEncoderV2. " "is only supported in ABI coder v2. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature." "Use \"pragma abicoder v2;\" to enable the feature."
); );
} }
@ -2219,8 +2219,8 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
2428_error, 2428_error,
_functionCall.location(), _functionCall.location(),
"The type of return parameter " + toString(i + 1) + ", " + returnParameterTypes[i]->toString(true) + ", " "The type of return parameter " + toString(i + 1) + ", " + returnParameterTypes[i]->toString(true) + ", "
"is only supported in ABIEncoderV2. " "is only supported in ABI coder v2. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature." "Use \"pragma abicoder v2;\" to enable the feature."
); );
} }
} }

2
test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol
View File

@ -1,4 +1,4 @@
pragma abicoder v1; pragma abicoder v1;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
// ---- // ----
// SyntaxError 8273: (20-53): ABI coder V1 has already been selected through "pragma abicoder v1". // SyntaxError 8273: (20-53): ABI coder v1 has already been selected through "pragma abicoder v1".

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
View File

@ -17,4 +17,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2443: (B:71-80): The type of this parameter, struct C.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2443: (B:71-80): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
View File

@ -17,4 +17,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2443: (B:90-100): The type of this parameter, struct C.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2443: (B:90-100): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
View File

@ -19,4 +19,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2443: (B:146-155): The type of this parameter, struct C.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2443: (B:146-155): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
View File

@ -13,4 +13,4 @@ contract D {
} }
} }
// ---- // ----
// TypeError 2428: (B:65-76): The type of return parameter 1, string[], is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:65-76): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
View File

@ -17,4 +17,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2428: (B:70-83): The type of return parameter 1, struct C.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:70-83): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
View File

@ -17,4 +17,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2428: (B:70-83): The type of return parameter 1, struct C.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:70-83): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
View File

@ -16,4 +16,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2443: (B:74-84): The type of this parameter, struct L.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2443: (B:74-84): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
View File

@ -19,4 +19,4 @@ contract D {
} }
} }
// ---- // ----
// TypeError 2428: (B:86-97): The type of return parameter 1, struct L.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:86-97): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
View File

@ -17,4 +17,4 @@ contract Test {
} }
} }
// ---- // ----
// TypeError 2428: (B:70-77): The type of return parameter 1, struct L.Item, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:70-77): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
View File

@ -13,4 +13,4 @@ import "A";
contract D is C {} contract D is C {}
// ---- // ----
// TypeError 6594: (B:13-31): Contract "D" does not use ABIEncoderV2 but wants to inherit from a contract which uses types that require it. Use "pragma experimental ABIEncoderV2;" for the inheriting contract as well to enable the feature. // TypeError 6594: (B:13-31): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
View File

@ -13,4 +13,4 @@ import "A";
contract D is C {} contract D is C {}
// ---- // ----
// TypeError 6594: (B:13-31): Contract "D" does not use ABIEncoderV2 but wants to inherit from a contract which uses types that require it. Use "pragma experimental ABIEncoderV2;" for the inheriting contract as well to enable the feature. // TypeError 6594: (B:13-31): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
View File

@ -27,4 +27,4 @@ contract C is B {
{} {}
} }
// ---- // ----
// TypeError 2428: (B:60-73): The type of return parameter 1, struct Data, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:60-73): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
View File

@ -29,4 +29,4 @@ contract C is B {
{} {}
} }
// ---- // ----
// TypeError 2428: (B:60-73): The type of return parameter 1, struct Data, is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2428: (B:60-73): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

4
test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
View File

@ -3,5 +3,5 @@ contract Test {
function g(uint[][1] calldata) external { } function g(uint[][1] calldata) external { }
} }
// ---- // ----
// TypeError 4957: (31-48): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 4957: (31-48): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
// TypeError 4957: (78-96): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 4957: (78-96): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
View File

@ -2,4 +2,4 @@ contract C {
constructor(uint[][][] memory t) {} constructor(uint[][][] memory t) {}
} }
// ---- // ----
// TypeError 4957: (26-45): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract. // TypeError 4957: (26-45): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract.

2
test/libsolidity/syntaxTests/events/event_nested_array.sol
View File

@ -2,4 +2,4 @@ contract c {
event E(uint[][]); event E(uint[][]);
} }
// ---- // ----
// TypeError 3061: (25-33): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 3061: (25-33): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
View File

@ -3,4 +3,4 @@ contract c {
event E(S); event E(S);
} }
// ---- // ----
// TypeError 3061: (61-62): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 3061: (61-62): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/events/event_struct.sol
View File

@ -3,4 +3,4 @@ contract c {
event E(S); event E(S);
} }
// ---- // ----
// TypeError 3061: (51-52): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 3061: (51-52): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/events/event_struct_indexed.sol
View File

@ -3,4 +3,4 @@ contract c {
event E(S indexed); event E(S indexed);
} }
// ---- // ----
// TypeError 3061: (51-60): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 3061: (51-60): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/getter/nested_structs.sol
View File

@ -8,4 +8,4 @@ contract C {
mapping(uint256 => X) public m; mapping(uint256 => X) public m;
} }
// ---- // ----
// TypeError 2763: (88-118): The following types are only supported for getters in ABIEncoderV2: struct C.Y memory. Either remove "public" or use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 2763: (88-118): The following types are only supported for getters in ABI coder v2: struct C.Y memory. Either remove "public" or use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
View File

@ -16,4 +16,4 @@ contract B is A { }
import "./B.sol"; import "./B.sol";
contract C is B { } contract C is B { }
// ---- // ----
// TypeError 6594: (C.sol:18-37): Contract "C" does not use ABIEncoderV2 but wants to inherit from a contract which uses types that require it. Use "pragma experimental ABIEncoderV2;" for the inheriting contract as well to enable the feature. // TypeError 6594: (C.sol:18-37): Contract "C" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.

2
test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
View File

@ -14,4 +14,4 @@ contract B is A { }
import "./B.sol"; import "./B.sol";
contract C is B { } contract C is B { }
// ---- // ----
// TypeError 6594: (B.sol:18-37): Contract "B" does not use ABIEncoderV2 but wants to inherit from a contract which uses types that require it. Use "pragma experimental ABIEncoderV2;" for the inheriting contract as well to enable the feature. // TypeError 6594: (B.sol:18-37): Contract "B" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
View File

@ -2,4 +2,4 @@ contract C {
function f() public pure returns (string[][] memory) {} function f() public pure returns (string[][] memory) {}
} }
// ---- // ----
// TypeError 4957: (51-68): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 4957: (51-68): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
View File

@ -2,4 +2,4 @@ contract C {
function f() public pure returns (uint[][2] memory) {} function f() public pure returns (uint[][2] memory) {}
} }
// ---- // ----
// TypeError 4957: (51-67): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 4957: (51-67): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
View File

@ -3,4 +3,4 @@ contract C {
function f() public pure returns (S memory x) {} function f() public pure returns (S memory x) {}
} }
// ---- // ----
// TypeError 4957: (80-90): This type is only supported in ABIEncoderV2. Use "pragma experimental ABIEncoderV2;" to enable the feature. // TypeError 4957: (80-90): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.