[test] Update tests to include location string.

test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol

@@ -8,4 +8,4 @@ contract testContract {
     }
 }
 // ----
-// TypeError 5407: (171-183): Cannot implicitly convert component at position 0 from "address" to "address payable".
+// TypeError 5407: (171-183='(address(0))'): Cannot implicitly convert component at position 0 from "address" to "address payable".

test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol

@@ -12,5 +12,5 @@ contract testContract {
     }
 }
 // ----
-// TypeError 5407: (278-286): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
-// TypeError 5407: (329-337): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
+// TypeError 5407: (278-286='(this.g)'): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
+// TypeError 5407: (329-337='(this.h)'): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".

test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol

@@ -1,4 +1,4 @@
 pragma abicoder               v2;
 pragma abicoder v1;
 // ----
-// SyntaxError 3845: (34-53): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (34-53='pragma abicoder v1;'): ABI coder has already been selected for this source unit.

test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol

@@ -1,4 +1,4 @@
 pragma abicoder v1;
 pragma abicoder v2;
 // ----
-// SyntaxError 3845: (20-39): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (20-39='pragma abicoder v2;'): ABI coder has already been selected for this source unit.

test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol

@@ -6,4 +6,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (132-140): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (132-140='S memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.

test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol

@@ -5,4 +5,4 @@ contract C {
     function f(S[2] memory) public {}
 }
 // ----
-// TypeError 4103: (89-100): Internal type is not allowed for public or external functions.
+// TypeError 4103: (89-100='S[2] memory'): Internal type is not allowed for public or external functions.

test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol

@@ -5,4 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (92-100): Internal type is not allowed for public or external functions.
+// TypeError 4103: (92-100='S memory'): Internal type is not allowed for public or external functions.

test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol

@@ -5,4 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (103-111): Internal type is not allowed for public or external functions.
+// TypeError 4103: (103-111='S memory'): Internal type is not allowed for public or external functions.

test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol

@@ -5,4 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (105-113): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (105-113='S memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.

test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol

@@ -1,3 +1,3 @@
 pragma abicoder something;
 // ----
-// SyntaxError 2745: (0-26): Expected either "pragma abicoder v1" or "pragma abicoder v2".
+// SyntaxError 2745: (0-26='pragma abicoder something;'): Expected either "pragma abicoder v1" or "pragma abicoder v2".

test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol

@@ -1,4 +1,4 @@
 pragma experimental ABIEncoderV2;
 pragma abicoder v2;
 // ----
-// SyntaxError 3845: (34-53): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (34-53='pragma abicoder v2;'): ABI coder has already been selected for this source unit.

test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol

@@ -1,4 +1,4 @@
 pragma abicoder v1;
 pragma abicoder v1;
 // ----
-// SyntaxError 3845: (20-39): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (20-39='pragma abicoder v1;'): ABI coder has already been selected for this source unit.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol

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

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol

@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:119-129): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:119-129='C.Item(50)'): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol

@@ -20,4 +20,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:166-175): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:166-175='C.Item(5)'): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol

@@ -14,4 +14,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:85-105): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:85-105='C(address(0x00)).f()'): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol

@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112='C(address(0x00)).get()'): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol

@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112='C(address(0x00)).get()'): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol

@@ -17,4 +17,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:94-104): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:94-104='L.Item(42)'): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol

@@ -20,4 +20,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:106-117): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:106-117='uint(1).f()'): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol

@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-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.
+// TypeError 2428: (B:90-97='L.get()'): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol

@@ -14,4 +14,4 @@ import "A";
 
 contract D is C {}
 // ----
-// TypeError 6594: (B:33-51): 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.
+// TypeError 6594: (B:33-51='contract D is C {}'): 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.

test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol

@@ -14,4 +14,4 @@ import "A";
 
 contract D is C {}
 // ----
-// TypeError 6594: (B:33-51): 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.
+// TypeError 6594: (B:33-51='contract D is C {}'): 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.

test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol

@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (150-154): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (166-183): Unused local variable.
+// Warning 6321: (150-154='bool'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 2072: (166-183='uint[][] memory x'): Unused local variable.

test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol

@@ -29,4 +29,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102='A(address(0x00)).get()'): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol

@@ -30,4 +30,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102='A(address(0x00)).get()'): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol

@@ -4,4 +4,4 @@ interface A {
 contract B is A {
 }
 // ----
-// TypeError 3656: (69-88): Contract "B" should be marked as abstract.
+// TypeError 3656: (69-88='contract B is A { }'): Contract "B" should be marked as abstract.

test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol

@@ -9,4 +9,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4614: (208-228): Cannot instantiate an abstract contract.
+// TypeError 4614: (208-228='new AbstractContract'): Cannot instantiate an abstract contract.

test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol

@@ -1,3 +1,3 @@
 abstract A { }
 // ----
-// ParserError 3515: (9-10): Expected keyword "contract", "interface" or "library".
+// ParserError 3515: (9-10='A'): Expected keyword "contract", "interface" or "library".

test/libsolidity/syntaxTests/abstract/interface.sol

@@ -1,4 +1,4 @@
 interface B { }
 abstract interface A { }
 // ----
-// TypeError 9348: (16-40): Interfaces do not need the "abstract" keyword, they are abstract implicitly.
+// TypeError 9348: (16-40='abstract interface A { }'): Interfaces do not need the "abstract" keyword, they are abstract implicitly.

test/libsolidity/syntaxTests/abstract/library.sol

@@ -1,3 +1,3 @@
 abstract library A { }
 // ----
-// TypeError 9571: (0-22): Libraries cannot be abstract.
+// TypeError 9571: (0-22='abstract library A { }'): Libraries cannot be abstract.

test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol

@@ -4,4 +4,4 @@ abstract contract A {
 contract B is A {
 }
 // ----
-// TypeError 3656: (57-76): Contract "B" should be marked as abstract.
+// TypeError 3656: (57-76='contract B is A { }'): Contract "B" should be marked as abstract.

test/libsolidity/syntaxTests/array/array_pop_arg.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6160: (65-76): Wrong argument count for function call: 1 arguments given but expected 0.
+// TypeError 6160: (65-76='data.pop(5)'): Wrong argument count for function call: 1 arguments given but expected 0.

test/libsolidity/syntaxTests/array/calldata_assign.sol

@@ -3,4 +3,4 @@ contract Test {
     function f(uint256[] calldata s) external { s[0] = 4; }
 }
 // ----
-// TypeError 6182: (98-102): Calldata arrays are read-only.
+// TypeError 6182: (98-102='s[0]'): Calldata arrays are read-only.

test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol

@@ -4,5 +4,5 @@ contract Test {
     function g(uint[][1] calldata) external { }
 }
 // ----
-// TypeError 4957: (51-68): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
-// TypeError 4957: (98-116): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (51-68='uint[][] calldata'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (98-116='uint[][1] calldata'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.

test/libsolidity/syntaxTests/array/calldata_resize.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (75-83): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (75-83='x.length'): Member "length" is read-only and cannot be used to resize arrays.

test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (82-94): Return argument type function () pure returns (bytes memory) is not implicitly convertible to expected type (type of first return variable) bytes memory.
+// TypeError 6359: (82-94='bytes.concat'): Return argument type function () pure returns (bytes memory) is not implicitly convertible to expected type (type of first return variable) bytes memory.

test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes) provided.
+// TypeError 4259: (93-98='bytes'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes) provided.

test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (88-96): Member "concat" not found or not visible after argument-dependent lookup in bytes memory.
+// TypeError 9582: (88-96='a.concat'): Member "concat" not found or not visible after argument-dependent lookup in bytes memory.

test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol

@@ -9,6 +9,6 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (233-236): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] provided.
-// TypeError 8015: (248-249): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] provided.
-// TypeError 8015: (251-253): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string provided.
+// TypeError 8015: (233-236='num'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] provided.
+// TypeError 8015: (248-249='m'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] provided.
+// TypeError 8015: (251-253='c1'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string provided.

test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6378: (60-62): Unable to deduce common type for array elements.
+// TypeError 6378: (60-62='[]'): Unable to deduce common type for array elements.

test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol

@@ -25,16 +25,16 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (425-426): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
-// TypeError 8015: (428-429): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256 provided.
-// TypeError 8015: (431-433): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
-// TypeError 8015: (435-436): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
-// TypeError 8015: (438-440): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address payable provided.
-// TypeError 8015: (442-446): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () external provided.
-// TypeError 8015: (448-452): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (454-462): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] provided.
-// TypeError 8015: (464-471): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] provided.
-// TypeError 8015: (473-474): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (476-477): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
-// TypeError 8015: (479-480): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
-// TypeError 8015: (482-483): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but mapping(uint256 => enum C.E) provided.
+// TypeError 8015: (425-426='b'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
+// TypeError 8015: (428-429='u'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256 provided.
+// TypeError 8015: (431-433='u8'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
+// TypeError 8015: (435-436='a'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
+// TypeError 8015: (438-440='ap'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address payable provided.
+// TypeError 8015: (442-446='fext'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () external provided.
+// TypeError 8015: (448-452='fint'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
+// TypeError 8015: (454-462='uDynamic'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] provided.
+// TypeError 8015: (464-471='uStatic'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] provided.
+// TypeError 8015: (473-474='c'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
+// TypeError 8015: (476-477='s'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
+// TypeError 8015: (479-480='e'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
+// TypeError 8015: (482-483='m'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but mapping(uint256 => enum C.E) provided.

test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol

@@ -34,25 +34,25 @@ contract C {
 // ----
 // TypeError 9640: (697-779): Explicit type conversion not allowed from "bytes32" to "bytes memory".
 // TypeError 1227: (697-782): Index range access is only supported for dynamic calldata arrays.
-// TypeError 1227: (864-870): Index range access is only supported for dynamic calldata arrays.
-// TypeError 8015: (133-138): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
-// TypeError 8015: (152-153): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 1 provided.
-// TypeError 8015: (167-171): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 10000000000 provided.
-// TypeError 8015: (185-190): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10000000000 provided.
-// TypeError 8015: (204-207): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10 provided.
-// TypeError 8015: (221-230): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 19088743 provided.
+// TypeError 1227: (864-870='[0][:]'): Index range access is only supported for dynamic calldata arrays.
+// TypeError 8015: (133-138='false'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
+// TypeError 8015: (152-153='1'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 1 provided.
+// TypeError 8015: (167-171='1e10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 10000000000 provided.
+// TypeError 8015: (185-190='1e-10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10000000000 provided.
+// TypeError 8015: (204-207='0.1'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10 provided.
+// TypeError 8015: (221-230='0x1234567'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 19088743 provided.
 // TypeError 8015: (244-284): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3806...(37 digits omitted)...1680 provided.
 // TypeError 8015: (335-377): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
 // TypeError 8015: (404-448): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 2494...(42 digits omitted)...0497 provided.
 // TypeError 8015: (495-561): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3027...(66 digits omitted)...5855 provided.
 // TypeError 8015: (596-663): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const -1 provided.
 // TypeError 8015: (697-782): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes slice provided.
-// TypeError 8015: (796-797): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (811-813): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple() provided.
-// TypeError 8015: (827-833): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple(int_const 0,int_const 0) provided.
-// TypeError 8015: (847-850): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] provided.
-// TypeError 8015: (864-870): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] slice provided.
-// TypeError 8015: (884-890): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
-// TypeError 8015: (904-911): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (925-929): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
-// TypeError 8015: (943-946): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
+// TypeError 8015: (796-797='f'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
+// TypeError 8015: (811-813='()'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple() provided.
+// TypeError 8015: (827-833='(0, 0)'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple(int_const 0,int_const 0) provided.
+// TypeError 8015: (847-850='[0]'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] provided.
+// TypeError 8015: (864-870='[0][:]'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] slice provided.
+// TypeError 8015: (884-890='[0][0]'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
+// TypeError 8015: (904-911='new C()'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
+// TypeError 8015: (925-929='S(0)'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
+// TypeError 8015: (943-946='E.A'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.

test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol

@@ -18,16 +18,16 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (78-79): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (93-95): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (109-112): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (126-130): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (144-148): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (162-167): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (181-186): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (200-206): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (220-223): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (237-241): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (255-260): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (78-79='0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (93-95='-0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (109-112='0.0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (126-130='-0.0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (144-148='0e10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (162-167='-0e10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (181-186='0e-10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (200-206='-0e-10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (220-223='(0)'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (237-241='0x00'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (255-260='-0x00'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
 // TypeError 8015: (274-340): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
 // TypeError 8015: (374-441): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.

test/libsolidity/syntaxTests/array/contract_index_access.sol

@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (52-56): Statement has no effect.
+// Warning 6133: (52-56='C[0]'): Statement has no effect.
 // Warning 2018: (17-63): Function state mutability can be restricted to pure

test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (148-150): Type function () external[] storage ref is not implicitly convertible to expected type function () view external[] storage ref.
+// TypeError 7407: (148-150='s0'): Type function () external[] storage ref is not implicitly convertible to expected type function () view external[] storage ref.

test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (74-82): Member "pop" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (74-82='data.pop'): Member "pop" is not available in uint256[] memory outside of storage.

test/libsolidity/syntaxTests/array/function_mapping.sol

@@ -4,4 +4,4 @@ contract Test {
     function f(mapping(uint => uint)[] memory x) public pure {}
 }
 // ----
-// TypeError 4103: (66-98): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (66-98='mapping(uint => uint)[] memory x'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.

test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol

@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (183-184): Type bytes storage ref is not implicitly convertible to expected type bytes16.
-// TypeError 7407: (199-205): Type bytes calldata slice is not implicitly convertible to expected type bytes3.
-// TypeError 9640: (220-230): Explicit type conversion not allowed from "string memory" to "bytes32".
-// TypeError 7407: (245-246): Type string memory is not implicitly convertible to expected type bytes32.
+// TypeError 7407: (183-184='s'): Type bytes storage ref is not implicitly convertible to expected type bytes16.
+// TypeError 7407: (199-205='c[0:3]'): Type bytes calldata slice is not implicitly convertible to expected type bytes3.
+// TypeError 9640: (220-230='bytes32(m)'): Explicit type conversion not allowed from "string memory" to "bytes32".
+// TypeError 7407: (245-246='m'): Type string memory is not implicitly convertible to expected type bytes32.

test/libsolidity/syntaxTests/array/invalid/library_array.sol

@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 1130: (51-52): Invalid use of a library name.
+// TypeError 1130: (51-52='L'): Invalid use of a library name.

test/libsolidity/syntaxTests/array/invalid/library_index_access.sol

@@ -4,4 +4,4 @@ library C {
     }
 }
 // ----
-// TypeError 2876: (51-55): Index access for library types and arrays of libraries are not possible.
+// TypeError 2876: (51-55='C[0]'): Index access for library types and arrays of libraries are not possible.

test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (134-156): Type bytes8[] calldata is not implicitly convertible to expected type bytes10[] memory.
+// TypeError 9574: (134-156='bytes10[] memory m = c'): Type bytes8[] calldata is not implicitly convertible to expected type bytes10[] memory.

test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol

@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (203-225): Type bytes8[] storage ref is not implicitly convertible to expected type bytes10[] memory.
+// TypeError 9574: (203-225='bytes10[] memory m = s'): Type bytes8[] storage ref is not implicitly convertible to expected type bytes10[] memory.

test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (101-106): Type bytes2[10] storage ref is not implicitly convertible to expected type bytes1[32] storage ref.
+// TypeError 7407: (101-106='data2'): Type bytes2[10] storage ref is not implicitly convertible to expected type bytes1[32] storage ref.

test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (102-107): Type uint256[10] storage ref is not implicitly convertible to expected type uint64[32] storage ref.
+// TypeError 7407: (102-107='data2'): Type uint256[10] storage ref is not implicitly convertible to expected type uint64[32] storage ref.

test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol

@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (102-107): Type uint256[10] storage ref is not implicitly convertible to expected type int256[32] storage ref.
-// TypeError 7407: (159-164): Type int256[32] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
+// TypeError 7407: (102-107='data2'): Type uint256[10] storage ref is not implicitly convertible to expected type int256[32] storage ref.
+// TypeError 7407: (159-164='data1'): Type int256[32] storage ref is not implicitly convertible to expected type uint256[10] storage ref.

test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (101-106): Type uint256[] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
+// TypeError 7407: (101-106='data2'): Type uint256[] storage ref is not implicitly convertible to expected type uint256[10] storage ref.

test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (103-108): Type uint256[18] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
+// TypeError 7407: (103-108='data2'): Type uint256[18] storage ref is not implicitly convertible to expected type uint256[10] storage ref.

test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol

@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 6118: (75-92): Type too large for memory.
+// TypeError 6118: (75-92='bytes1[999999999]'): Type too large for memory.

test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol

@@ -4,6 +4,6 @@ contract C {
     }
 }
 // ----
-// DeclarationError 1788: (28-45): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 5462: (69-72): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (64-75): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// DeclarationError 1788: (28-45='uint constant LEN'): The "constant" keyword can only be used for state variables or variables at file level.
+// TypeError 5462: (69-72='LEN'): Invalid array length, expected integer literal or constant expression.
+// TypeError 6651: (64-75='uint[LEN] a'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.

test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol

@@ -2,4 +2,4 @@ contract C {
     bytes32[8**90] ids;
 }
 // ----
-// TypeError 5462: (25-30): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (25-30='8**90'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol

@@ -2,4 +2,4 @@ contract C {
     bytes32[8**90][500] ids;
 }
 // ----
-// TypeError 5462: (25-30): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (25-30='8**90'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol

@@ -5,4 +5,4 @@ contract c {
     }
 }
 // ----
-// TypeError 7567: (72-91): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (72-91='storageArray.length'): Member "length" is read-only and cannot be used to resize arrays.

test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (80-93): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (80-93='map[0].length'): Member "length" is read-only and cannot be used to resize arrays.

test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol

@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (95-105): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (95-105='s.a.length'): Member "length" is read-only and cannot be used to resize arrays.

test/libsolidity/syntaxTests/array/length/cannot_be_function.sol

@@ -3,4 +3,4 @@ contract C {
     uint[f] ids;
 }
 // ----
-// TypeError 5462: (49-50): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (49-50='f'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol

@@ -4,4 +4,4 @@ contract C {
     uint[LEN] ids;
 }
 // ----
-// TypeError 5462: (84-87): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (84-87='LEN'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5210: (17-44): Cyclic constant definition (or maximum recursion depth exhausted).
+// TypeError 5210: (17-44='uint constant L2 = LEN - 10'): Cyclic constant definition (or maximum recursion depth exhausted).

test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol

@@ -3,4 +3,4 @@ contract C {
     uint[L] ids;
 }
 // ----
-// TypeError 5462: (51-52): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (51-52='L'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/cyclic_constant.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5210: (17-40): Cyclic constant definition (or maximum recursion depth exhausted).
+// TypeError 5210: (17-40='uint constant LEN = LEN'): Cyclic constant definition (or maximum recursion depth exhausted).

test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol

@@ -7,9 +7,9 @@ contract C {
   function e() public pure returns(string[0][500] memory) {}
 }
 // ----
-// TypeError 1406: (52-53): Array with zero length specified.
-// TypeError 1406: (111-112): Array with zero length specified.
-// TypeError 1406: (172-173): Array with zero length specified.
-// TypeError 1406: (234-235): Array with zero length specified.
-// TypeError 1406: (294-295): Array with zero length specified.
-// TypeError 1406: (355-356): Array with zero length specified.
+// TypeError 1406: (52-53='0'): Array with zero length specified.
+// TypeError 1406: (111-112='0'): Array with zero length specified.
+// TypeError 1406: (172-173='0'): Array with zero length specified.
+// TypeError 1406: (234-235='0'): Array with zero length specified.
+// TypeError 1406: (294-295='0'): Array with zero length specified.
+// TypeError 1406: (355-356='0'): Array with zero length specified.

test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol

@@ -7,9 +7,9 @@ contract C {
   string[0] f;
 }
 // ----
-// TypeError 1406: (19-20): Array with zero length specified.
-// TypeError 1406: (32-33): Array with zero length specified.
-// TypeError 1406: (47-48): Array with zero length specified.
-// TypeError 1406: (63-64): Array with zero length specified.
-// TypeError 1406: (77-78): Array with zero length specified.
-// TypeError 1406: (92-93): Array with zero length specified.
+// TypeError 1406: (19-20='0'): Array with zero length specified.
+// TypeError 1406: (32-33='0'): Array with zero length specified.
+// TypeError 1406: (47-48='0'): Array with zero length specified.
+// TypeError 1406: (63-64='0'): Array with zero length specified.
+// TypeError 1406: (77-78='0'): Array with zero length specified.
+// TypeError 1406: (92-93='0'): Array with zero length specified.

test/libsolidity/syntaxTests/array/length/inline_array.sol

@@ -2,4 +2,4 @@ contract C {
     uint[[2]] a15;
 }
 // ----
-// TypeError 5462: (22-25): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-25='[2]'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol

@@ -2,4 +2,4 @@ contract C {
     uint[-true] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='-true'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol

@@ -2,4 +2,4 @@ contract C {
     uint[true/1] ids;
 }
 // ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-28='true/1'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol

@@ -2,4 +2,4 @@ contract C {
     uint[1/true] ids;
 }
 // ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-28='1/true'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol

@@ -2,4 +2,4 @@ contract C {
     uint[1.111111E1111111111111] ids;
 }
 // ----
-// TypeError 5462: (22-44): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-44='1.111111E1111111111111'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol

@@ -2,4 +2,4 @@ contract C {
     uint[3/0] ids;
 }
 // ----
-// TypeError 6020: (22-25): Operator / not compatible with types int_const 3 and int_const 0
+// TypeError 6020: (22-25='3/0'): Operator / not compatible with types int_const 3 and int_const 0

test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol

@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // TypeError 1534: (48-90): Type too large for memory.
-// TypeError 1534: (96-118): Type too large for memory.
-// TypeError 1534: (124-153): Type too large for memory.
-// TypeError 1534: (159-188): Type too large for memory.
+// TypeError 1534: (96-118='uint[2**30][] memory y'): Type too large for memory.
+// TypeError 1534: (124-153='uint[2**30][2**30][] memory z'): Type too large for memory.
+// TypeError 1534: (159-188='uint[2**16][2**16][] memory w'): Type too large for memory.

test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol

@@ -3,4 +3,4 @@ contract C {
     uint[LEN] ids;
 }
 // ----
-// TypeError 5462: (52-55): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (52-55='LEN'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol

@@ -2,4 +2,4 @@ contract C {
     uint[true] ids;
 }
 // ----
-// TypeError 5462: (22-26): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-26='true'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol

@@ -6,6 +6,6 @@ contract C {
 }
 // ----
 // TypeError 1534: (26-66): Type too large for memory.
-// TypeError 1534: (96-116): Type too large for memory.
-// TypeError 1534: (146-173): Type too large for memory.
-// TypeError 1534: (203-230): Type too large for memory.
+// TypeError 1534: (96-116='uint[2**30][] memory'): Type too large for memory.
+// TypeError 1534: (146-173='uint[2**30][2**30][] memory'): Type too large for memory.
+// TypeError 1534: (203-230='uint[2**16][2**16][] memory'): Type too large for memory.

test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol

@@ -6,4 +6,4 @@ contract C {
 }
 // ----
 // TypeError 1534: (61-101): Type too large for memory.
-// TypeError 1534: (131-160): Type too large for memory.
+// TypeError 1534: (131-160='uint[2**30][2**30][][] memory'): Type too large for memory.

test/libsolidity/syntaxTests/array/length/pure_functions.sol

@@ -3,4 +3,4 @@ contract C {
     uint[LEN] ids;
 }
 // ----
-// TypeError 5462: (72-75): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (72-75='LEN'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/too_large.sol

@@ -2,4 +2,4 @@ contract C {
     uint[8**90] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='8**90'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/tuples.sol

@@ -2,4 +2,4 @@ contract C {
     uint[(1,2)] a15;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='(1,2)'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol

@@ -2,4 +2,4 @@ contract C {
     uint[8**90][500] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='8**90'): Invalid array length, expected integer literal or constant expression.

test/libsolidity/syntaxTests/array/library_array.sol

@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 1130: (63-64): Invalid use of a library name.
+// TypeError 1130: (63-64='L'): Invalid use of a library name.

test/libsolidity/syntaxTests/array/new_no_parentheses.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3904: (60-67): Length has to be placed in parentheses after the array type for new expression.
+// TypeError 3904: (60-67='uint[1]'): Length has to be placed in parentheses after the array type for new expression.

test/libsolidity/syntaxTests/array/no_array_pop.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (63-71): Member "pop" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (63-71='data.pop'): Member "pop" not found or not visible after argument-dependent lookup in uint256.

test/libsolidity/syntaxTests/array/pop/calldata_pop.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (66-71): Member "pop" is not available in uint256[] calldata outside of storage.
+// TypeError 4994: (66-71='x.pop'): Member "pop" is not available in uint256[] calldata outside of storage.

test/libsolidity/syntaxTests/array/pop/memory_pop.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (72-77): Member "pop" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (72-77='x.pop'): Member "pop" is not available in uint256[] memory outside of storage.

test/libsolidity/syntaxTests/array/push/calldata_push.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (66-72): Member "push" is not available in uint256[] calldata outside of storage.
+// TypeError 4994: (66-72='x.push'): Member "push" is not available in uint256[] calldata outside of storage.

test/libsolidity/syntaxTests/array/push/memory_push.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (72-78): Member "push" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (72-78='x.push'): Member "push" is not available in uint256[] memory outside of storage.

test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8871: (131-141): Storage arrays with nested mappings do not support .push(<arg>).
+// TypeError 8871: (131-141='array.push'): Storage arrays with nested mappings do not support .push(<arg>).

test/libsolidity/syntaxTests/array/slice/bytes_memory.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (66-72): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (66-72='x[1:2]'): Index range access is only supported for dynamic calldata arrays.

test/libsolidity/syntaxTests/array/slice/bytes_storage.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (65-71): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (65-71='x[1:2]'): Index range access is only supported for dynamic calldata arrays.

test/libsolidity/syntaxTests/array/slice/calldata_static.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (76-82): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (76-82='x[1:2]'): Index range access is only supported for dynamic calldata arrays.

test/libsolidity/syntaxTests/array/slice/member_access.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (92-100): Member "a" not found or not visible after argument-dependent lookup in uint256[] calldata slice.
+// TypeError 9582: (92-100='x[1:2].a'): Member "a" not found or not visible after argument-dependent lookup in uint256[] calldata slice.

test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (70-76): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (70-76='x[1:2]'): Index range access is only supported for dynamic calldata arrays.