Use quote function for all errors/warnings

test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol

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

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

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

test/libsolidity/syntaxTests/array/no_array_pop.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (63-71): Member "pop" not found or not visible after argument-dependent lookup in uint256.
+// TypeError: (63-71): 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: (66-71): Member "pop" is not available in uint256[] calldata outside of storage.
+// TypeError: (66-71): 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: (72-77): Member "pop" is not available in uint256[] memory outside of storage.
+// TypeError: (72-77): 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: (66-72): Member "push" is not available in uint256[] calldata outside of storage.
+// TypeError: (66-72): 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: (72-78): Member "push" is not available in uint256[] memory outside of storage.
+// TypeError: (72-78): Member "push" is not available in "uint256[] memory" outside of storage.

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

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (65-88): Type bytes calldata slice is not implicitly convertible to expected type bytes memory.
+// TypeError: (65-88): Type "bytes calldata slice" is not implicitly convertible to expected type "bytes memory".

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

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (79-85): Invalid type for argument in function call. Invalid implicit conversion from bytes calldata slice to bytes memory requested.
+// TypeError: (79-85): Invalid type for argument in function call. Invalid implicit conversion from "bytes calldata slice" to "bytes memory" requested.

test/libsolidity/syntaxTests/array/static_storage_array_pop.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (66-74): Member "pop" not found or not visible after argument-dependent lookup in uint256[3] storage ref.
+// TypeError: (66-74): Member "pop" not found or not visible after argument-dependent lookup in "uint256[3] storage ref".

test/libsolidity/syntaxTests/array/string_pop.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (65-73): Member "pop" not found or not visible after argument-dependent lookup in string storage ref.
+// TypeError: (65-73): Member "pop" not found or not visible after argument-dependent lookup in "string storage ref".

test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol

@@ -3,5 +3,5 @@ contract C {
     uint constant b = mulmod(3, 4, 0.1);
 }
 // ----
-// TypeError: (48-51): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
-// TypeError: (89-92): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
+// TypeError: (48-51): Invalid type for argument in function call. Invalid implicit conversion from "rational_const 1 / 10" to "uint256" requested.
+// TypeError: (89-92): Invalid type for argument in function call. Invalid implicit conversion from "rational_const 1 / 10" to "uint256" requested.

test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol

@@ -2,4 +2,4 @@ contract C {
     uint constant a = a;
 }
 // ----
-// TypeError: (17-36): The value of the constant a has a cyclic dependency via a.
+// TypeError: (17-36): The value of the constant "a" has a cyclic dependency via "a".

test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol

@@ -5,6 +5,6 @@ contract C {
     uint constant d = 2 + a;
 }
 // ----
-// TypeError: (17-40): The value of the constant a has a cyclic dependency via c.
-// TypeError: (71-129): The value of the constant c has a cyclic dependency via d.
-// TypeError: (135-158): The value of the constant d has a cyclic dependency via a.
+// TypeError: (17-40): The value of the constant "a" has a cyclic dependency via "c".
+// TypeError: (71-129): The value of the constant "c" has a cyclic dependency via "d".
+// TypeError: (135-158): The value of the constant "d" has a cyclic dependency via "a".

test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol

@@ -5,7 +5,7 @@ contract C {
     uint constant c = b;
 }
 // ----
-// TypeError: (17-36): The value of the constant x has a cyclic dependency via a.
-// TypeError: (42-65): The value of the constant a has a cyclic dependency via b.
-// TypeError: (71-90): The value of the constant b has a cyclic dependency via c.
-// TypeError: (96-115): The value of the constant c has a cyclic dependency via b.
+// TypeError: (17-36): The value of the constant "x" has a cyclic dependency via "a".
+// TypeError: (42-65): The value of the constant "a" has a cyclic dependency via "b".
+// TypeError: (71-90): The value of the constant "b" has a cyclic dependency via "c".
+// TypeError: (96-115): The value of the constant "c" has a cyclic dependency via "b".

test/libsolidity/syntaxTests/constructor/overriding_constructor.sol

@@ -7,4 +7,4 @@ contract B is A {
 }
 // ----
 // Warning: (58-101): This declaration shadows an existing declaration.
-// TypeError: (130-133): Member "f" not found or not visible after argument-dependent lookup in function () pure returns (uint8).
+// TypeError: (130-133): Member "f" not found or not visible after argument-dependent lookup in "function () pure returns (uint8)".

test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol

@@ -8,4 +8,4 @@ contract C {
 	}
 }
 // ----
-// TypeError: (169-171): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
+// TypeError: (169-171): Invalid type for argument in function call. Invalid implicit conversion from "address" to "address payable" requested.

test/libsolidity/syntaxTests/conversion/function_type_nonpayable_payable.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (105-144): Type function () external is not implicitly convertible to expected type function () payable external.
+// TypeError: (105-144): Type "function () external" is not implicitly convertible to expected type "function () payable external".

test/libsolidity/syntaxTests/conversion/function_type_nonpayable_pure.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (105-141): Type function () external is not implicitly convertible to expected type function () pure external.
+// TypeError: (105-141): Type "function () external" is not implicitly convertible to expected type "function () pure external".

test/libsolidity/syntaxTests/conversion/function_type_nonpayable_view.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (105-141): Type function () external is not implicitly convertible to expected type function () view external.
+// TypeError: (105-141): Type "function () external" is not implicitly convertible to expected type "function () view external".

test/libsolidity/syntaxTests/conversion/function_type_payable_pure.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (113-149): Type function () payable external is not implicitly convertible to expected type function () pure external.
+// TypeError: (113-149): Type "function () payable external" is not implicitly convertible to expected type "function () pure external".

test/libsolidity/syntaxTests/conversion/function_type_payable_view.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (113-149): Type function () payable external is not implicitly convertible to expected type function () view external.
+// TypeError: (113-149): Type "function () payable external" is not implicitly convertible to expected type "function () view external".

test/libsolidity/syntaxTests/conversion/function_type_pure_payable.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (110-149): Type function () pure external is not implicitly convertible to expected type function () payable external.
+// TypeError: (110-149): Type "function () pure external" is not implicitly convertible to expected type "function () payable external".

test/libsolidity/syntaxTests/conversion/function_type_view_payable.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (110-149): Type function () view external is not implicitly convertible to expected type function () payable external.
+// TypeError: (110-149): Type "function () view external" is not implicitly convertible to expected type "function () payable external".

test/libsolidity/syntaxTests/conversion/function_type_view_pure.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (110-146): Type function () view external is not implicitly convertible to expected type function () pure external.
+// TypeError: (110-146): Type "function () view external" is not implicitly convertible to expected type "function () pure external".

test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol

@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError: (93-94): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
-// TypeError: (102-110): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
+// TypeError: (93-94): Type "int256[] memory" is not implicitly convertible to expected type "int256[] storage pointer".
+// TypeError: (102-110): Type "int256[] memory" is not implicitly convertible to expected type "int256[] storage pointer".

test/libsolidity/syntaxTests/denominations/fixed_point_division.sol

@@ -3,4 +3,4 @@ contract C {
 	ufixed constant b = ufixed(4 ether / 3 hours);
 }
 // ----
-// TypeError: (32-49): Type rational_const 10000000000000000 / 27 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x62 or use an explicit conversion.
+// TypeError: (32-49): Type "rational_const 10000000000000000 / 27" is not implicitly convertible to expected type "uint256". Try converting to type "ufixed256x62" or use an explicit conversion.

test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol

@@ -9,5 +9,5 @@ contract C {
 // ----
 // TypeError: (52-76): Need at least 1 arguments for function call, but provided only 0.
 // TypeError: (86-111): Need at least 1 arguments for function call, but provided only 0.
-// TypeError: (144-151): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes4 requested.
-// TypeError: (189-196): Invalid type for argument in function call. Invalid implicit conversion from uint256 to string memory requested.
+// TypeError: (144-151): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes4" requested.
+// TypeError: (189-196): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "string memory" requested.

test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (77-92): Explicit type conversion not allowed from "function () view external returns (address)" to "address". To obtain the address of the contract of the function, you can use the .address member of the function.
+// TypeError: (77-92): Explicit type conversion not allowed from "function () view external returns (address)" to "address". To obtain the address of the contract of the function, you can use the ".address" member of the function.

test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (85-99): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
+// TypeError: (85-99): Return argument type "address" is not implicitly convertible to expected type (type of first return variable) "address payable".

test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol

@@ -3,4 +3,4 @@ contract test {
     function(bytes memory) external internal a = fa;
 }
 // ----
-// TypeError: (106-108): Type function (bytes memory) is not implicitly convertible to expected type function (bytes memory) external.
+// TypeError: (106-108): Type "function (bytes memory)" is not implicitly convertible to expected type "function (bytes memory) external".

test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol

@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // TypeError: (65-85): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError: (153-171): Invalid type for argument in function call. Invalid implicit conversion from bytes4 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError: (240-247): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError: (297-333): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError: (153-171): Invalid type for argument in function call. Invalid implicit conversion from "bytes4" to "bytes memory" requested. This function requires a single "bytes" argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.
+// TypeError: (240-247): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes memory" requested. This function requires a single "bytes" argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.
+// TypeError: (297-333): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.

test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol

@@ -10,5 +10,5 @@ contract C {
 }
 // ----
 // TypeError: (65-89): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError: (161-168): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError: (218-258): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError: (161-168): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes memory" requested. This function requires a single "bytes" argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.
+// TypeError: (218-258): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.

test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol

@@ -10,5 +10,5 @@ contract C {
 }
 // ----
 // TypeError: (65-93): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError: (169-176): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError: (226-270): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError: (169-176): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes memory" requested. This function requires a single "bytes" argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.
+// TypeError: (226-270): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use "abi.encode(...)" to properly generate it.

test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol

@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError: (100-107): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.
+// TypeError: (100-107): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes memory" requested. This function requires a single "bytes" argument. Use "abi.encodePacked(...)" to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.
+// TypeError: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.

test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol

@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError: (100-107): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.
+// TypeError: (100-107): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes memory" requested. This function requires a single "bytes" argument. Use "abi.encodePacked(...)" to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.
+// TypeError: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.

test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol

@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError: (55-63): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError: (94-101): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError: (126-150): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError: (55-63): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.
+// TypeError: (94-101): Invalid type for argument in function call. Invalid implicit conversion from "uint256" to "bytes memory" requested. This function requires a single "bytes" argument. Use "abi.encodePacked(...)" to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.
+// TypeError: (126-150): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or "abi.encode(...)" to use ABI encoding.

test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol

@@ -5,7 +5,7 @@ contract C {
   }
 }
 // ----
-// TypeError: (67-72): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256.
-// TypeError: (74-79): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256.
-// TypeError: (81-90): Type rational_const 9485...(73 digits omitted)...5712 / 5 is not implicitly convertible to expected type uint256.
+// TypeError: (67-72): Type "int_const 1897...(74 digits omitted)...1424" is not implicitly convertible to expected type "uint256".
+// TypeError: (74-79): Type "int_const 1897...(74 digits omitted)...1424" is not implicitly convertible to expected type "uint256".
+// TypeError: (81-90): Type "rational_const 9485...(73 digits omitted)...5712 / 5" is not implicitly convertible to expected type "uint256".
 // TypeError: (65-91): Index expression cannot be represented as an unsigned integer.

test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol

@@ -5,7 +5,7 @@ contract C {
   }
 }
 // ----
-// TypeError: (67-72): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256.
-// TypeError: (74-79): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256.
-// TypeError: (81-90): Type int_const -189...(75 digits omitted)...1423 is not implicitly convertible to expected type uint256.
+// TypeError: (67-72): Type "int_const 1897...(74 digits omitted)...1424" is not implicitly convertible to expected type "uint256".
+// TypeError: (74-79): Type "int_const 1897...(74 digits omitted)...1424" is not implicitly convertible to expected type "uint256".
+// TypeError: (81-90): Type "int_const -189...(75 digits omitted)...1423" is not implicitly convertible to expected type "uint256".
 // TypeError: (65-91): Index expression cannot be represented as an unsigned integer.

test/libsolidity/syntaxTests/indexing/array_negative_index.sol

@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError: (67-69): Type int_const -1 is not implicitly convertible to expected type uint256.
+// TypeError: (67-69): Type "int_const -1" is not implicitly convertible to expected type "uint256".

test/libsolidity/syntaxTests/indexing/array_noninteger_index.sol

@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError: (67-178): Type int_const 8888...(103 digits omitted)...8888 is not implicitly convertible to expected type uint256.
+// TypeError: (67-178): Type "int_const 8888...(103 digits omitted)...8888" is not implicitly convertible to expected type "uint256".

test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol

@@ -5,5 +5,5 @@ contract C {
   }
 }
 // ----
-// TypeError: (58-60): Type int_const -1 is not implicitly convertible to expected type uint256.
+// TypeError: (58-60): Type "int_const -1" is not implicitly convertible to expected type "uint256".
 // TypeError: (56-61): Index expression cannot be represented as an unsigned integer.

test/libsolidity/syntaxTests/indexing/fixedbytes_noninteger_index.sol

@@ -5,5 +5,5 @@ contract C {
   }
 }
 // ----
-// TypeError: (58-169): Type int_const 8888...(103 digits omitted)...8888 is not implicitly convertible to expected type uint256.
+// TypeError: (58-169): Type "int_const 8888...(103 digits omitted)...8888" is not implicitly convertible to expected type "uint256".
 // TypeError: (56-170): Index expression cannot be represented as an unsigned integer.

test/libsolidity/syntaxTests/indexing/function_type.sol

@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// TypeError: (41-42): Indexed expression has to be a type, mapping or array (is function ())
+// TypeError: (41-42): Indexed expression has to be a type, mapping or array (is "function ()").

test/libsolidity/syntaxTests/indexing/function_type_without_index.sol

@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// TypeError: (41-42): Indexed expression has to be a type, mapping or array (is function ())
+// TypeError: (41-42): Indexed expression has to be a type, mapping or array (is "function ()").

test/libsolidity/syntaxTests/indexing/struct_array_noninteger_index.sol

@@ -7,4 +7,4 @@ contract test {
 }
 
 // ----
-// TypeError: (101-241): Type int_const 7555...(132 digits omitted)...5555 is not implicitly convertible to expected type uint256.
+// TypeError: (101-241): Type "int_const 7555...(132 digits omitted)...5555" is not implicitly convertible to expected type "uint256".

test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol

@@ -2,4 +2,4 @@ interface I {
 	function foo() virtual external;
 }
 // ----
-// Warning: (15-47): Interface functions are implicitly "virtual"
+// Warning: (15-47): Interface functions are implicitly "virtual".

test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol

@@ -4,4 +4,4 @@ contract C {
 	function() external override virtual fp3;
 }
 // ----
-// ParserError: (34-41): Expected identifier but got 'virtual'
+// ParserError: (34-41): Expected identifier but got "virtual"

test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol

@@ -7,4 +7,4 @@ contract X is A {
 	function test() internal override() returns (uint256);
 }
 // ----
-// ParserError: (164-165): Expected identifier but got ')'
+// ParserError: (164-165): Expected identifier but got ")"

test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol

@@ -5,4 +5,4 @@ contract X {
 	int public override(A,) testvar;
 }
 // ----
-// ParserError: (95-96): Expected identifier but got ')'
+// ParserError: (95-96): Expected identifier but got ")"

test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol

@@ -5,4 +5,4 @@ contract X {
 	function test() internal override(,) returns (uint256);
 }
 // ----
-// ParserError: (107-108): Expected identifier but got ','
+// ParserError: (107-108): Expected identifier but got ","

test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol

@@ -5,4 +5,4 @@ contract X {
 	function foo() internal override(X, address) returns (uint256);
 }
 // ----
-// ParserError: (109-116): Expected identifier but got 'address'
+// ParserError: (109-116): Expected identifier but got "address"

test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol

@@ -5,4 +5,4 @@ contract X {
 	int public override() testvar;
 }
 // ----
-// ParserError: (93-94): Expected identifier but got ')'
+// ParserError: (93-94): Expected identifier but got ")"

test/libsolidity/syntaxTests/inheritance/super_on_external.sol

@@ -7,4 +7,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError: (123-130): Member "f" not found or not visible after argument-dependent lookup in contract super B.
+// TypeError: (123-130): Member "f" not found or not visible after argument-dependent lookup in "contract super B".

test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol

@@ -6,4 +6,4 @@ contract Derived2 is Base {
   constructor() Base(2) public { }
 }
 // ----
-// TypeError: (74-77): Invalid type for argument in constructor call. Invalid implicit conversion from int_const 300 to uint8 requested. Literal is too large to fit in uint8.
+// TypeError: (74-77): Invalid type for argument in constructor call. Invalid implicit conversion from "int_const 300" to "uint8" requested. Literal is too large to fit in "uint8".

test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError: (95-98): Expected '(' but got identifier
+// ParserError: (95-98): Expected "(" but got identifier

test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol

@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (112-120): The suffixes _offset and _slot can only be used on non-constant storage variables.
+// TypeError: (112-120): The suffixes "_offset" and "_slot" can only be used on non-constant storage variables.

test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol

@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// ParserError: (72-73): Expected identifier but got '('
+// ParserError: (72-73): Expected identifier but got "("

test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_tack.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (75-83): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
+// TypeError: (75-83): Top-level expressions are not supposed to return values (this expression returns 1 value). Use "pop()" or assign them.

test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol

@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (89-90): Only local variables are supported. To access storage variables, use the _slot and _offset suffixes.
+// TypeError: (89-90): Only local variables are supported. To access storage variables, use the "_slot" and "_offset" suffixes.

test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol

@@ -10,4 +10,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (80-81): Only local variables are supported. To access storage variables, use the _slot and _offset suffixes.
+// TypeError: (80-81): Only local variables are supported. To access storage variables, use the "_slot" and "_offset" suffixes.

test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol

@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// ParserError: (85-86): Expected '(' but got '}'
+// ParserError: (85-86): Expected "(" but got "}"

test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol

@@ -5,4 +5,4 @@ contract c {
     }
 }
 // ----
-// TypeError: (75-76): Only local variables are supported. To access storage variables, use the _slot and _offset suffixes.
+// TypeError: (75-76): Only local variables are supported. To access storage variables, use the "_slot" and "_offset" suffixes.

test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol

@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ----
-// DeclarationError: (79-87): In variable declarations _slot and _offset can not be used as a suffix.
-// DeclarationError: (109-115): In variable declarations _slot and _offset can not be used as a suffix.
-// DeclarationError: (137-144): In variable declarations _slot and _offset can not be used as a suffix.
-// DeclarationError: (166-171): In variable declarations _slot and _offset can not be used as a suffix.
+// DeclarationError: (79-87): In variable declarations "_slot" and "_offset" can not be used as a suffix.
+// DeclarationError: (109-115): In variable declarations "_slot" and "_offset" can not be used as a suffix.
+// DeclarationError: (137-144): In variable declarations "_slot" and "_offset" can not be used as a suffix.
+// DeclarationError: (166-171): In variable declarations "_slot" and "_offset" can not be used as a suffix.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol

@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (118-119): You have to use the _slot or _offset suffix to access storage reference variables.
+// TypeError: (118-119): You have to use the "_slot" or "_offset" suffix to access storage reference variables.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError: (84-91): In variable names _slot and _offset can only be used as a suffix.
+// DeclarationError: (84-91): In variable names "_slot" and "_offset" can only be used as a suffix.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError: (84-89): In variable names _slot and _offset can only be used as a suffix.
+// DeclarationError: (84-89): In variable names "_slot" and "_offset" can only be used as a suffix.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (84-90): The suffixes _offset and _slot can only be used on storage variables.
+// TypeError: (84-90): The suffixes "_offset" and "_slot" can only be used on storage variables.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol

@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError: (117-123): The suffixes _offset and _slot can only be used on storage variables.
-// TypeError: (141-149): The suffixes _offset and _slot can only be used on storage variables.
+// TypeError: (117-123): The suffixes "_offset" and "_slot" can only be used on storage variables.
+// TypeError: (141-149): The suffixes "_offset" and "_slot" can only be used on storage variables.

test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol

@@ -5,4 +5,4 @@ contract C {
 }
 // ----
 // Warning: (47-69): Unused local variable.
-// Warning: (17-135): Function state mutability can be restricted to pure
+// Warning: (17-135): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion.sol

@@ -8,4 +8,4 @@
         }
     }
 // ----
-// Warning: (25-229): Function state mutability can be restricted to pure
+// Warning: (25-229): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_and_passing_implicit_conversion_strings.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// Warning: (17-198): Function state mutability can be restricted to pure
+// Warning: (17-198): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_int_conversion.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning: (17-121): Function state mutability can be restricted to pure
+// Warning: (17-121): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_const_string_conversion.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning: (17-140): Function state mutability can be restricted to pure
+// Warning: (17-140): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning: (17-88): Function state mutability can be restricted to pure
+// Warning: (17-88): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_declaration_no_type_strings.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning: (17-112): Function state mutability can be restricted to pure
+// Warning: (17-112): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol

@@ -6,4 +6,4 @@ contract test {
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning: (50-67): Unused local variable.
-// Warning: (20-119): Function state mutability can be restricted to pure
+// Warning: (20-119): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol

@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError: (66-69): Type mapping(int256 => int256) is only valid in storage.
+// TypeError: (66-69): Type "mapping(int256 => int256)" is only valid in storage.

test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol

@@ -6,4 +6,4 @@ contract test {
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning: (50-73): Unused local variable.
-// Warning: (20-118): Function state mutability can be restricted to pure
+// Warning: (20-118): Function state mutability can be restricted to "pure".

test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol

@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / 0;
 }
 // ----
-// TypeError: (35-40): Operator / not compatible with types int_const 1 and int_const 0
+// TypeError: (35-40): Operator "/" not compatible with types "int_const 1" and "int_const 0".

test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol

@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / ((1+3)-4);
 }
 // ----
-// TypeError: (35-48): Operator / not compatible with types int_const 1 and int_const 0
+// TypeError: (35-48): Operator "/" not compatible with types "int_const 1" and "int_const 0".

test/libsolidity/syntaxTests/literalOperations/mod_zero.sol

@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % 0;
 }
 // ----
-// TypeError: (36-41): Operator % not compatible with types int_const 1 and int_const 0
+// TypeError: (36-41): Operator "%" not compatible with types "int_const 1" and "int_const 0".

test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol

@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % (-4+((2)*2));
 }
 // ----
-// TypeError: (36-52): Operator % not compatible with types int_const 1 and int_const 0
+// TypeError: (36-52): Operator "%" not compatible with types "int_const 1" and "int_const 0".

test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol

@@ -6,4 +6,4 @@ contract C {
   function g() public { L.f(1, 2, 3); }
 }
 // ----
-// TypeError: (115-118): Member "f" not found or not visible after argument-dependent lookup in type(library L).
+// TypeError: (115-118): Member "f" not found or not visible after argument-dependent lookup in "type(library L)".

test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol

@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (282-287): Member "a" not unique after argument-dependent lookup in contract C.
+// TypeError: (282-287): Member "a" not unique after argument-dependent lookup in "contract C".

test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol

@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (290-299): Member "value" not unique after argument-dependent lookup in contract C - did you forget the "payable" modifier?
+// TypeError: (290-299): Member "value" not unique after argument-dependent lookup in "contract C" - did you forget the "payable" modifier?

test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol

@@ -9,4 +9,4 @@ contract Test {
     }
 }
 // ----
-// TypeError: (208-218): Member "b1" is not available in struct Test.S1 memory outside of storage.
+// TypeError: (208-218): Member "b1" is not available in "struct Test.S1 memory" outside of storage.

test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol

@@ -7,4 +7,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError: (118-121): Member "b" is not available in struct Test.S memory outside of storage.
+// TypeError: (118-121): Member "b" is not available in "struct Test.S memory" outside of storage.

test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol

@@ -3,4 +3,4 @@ contract C {
     function f() costs(1 ether) public pure {}
 }
 // ----
-// TypeError: (101-115): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError: (101-115): Function declared as "pure", but this expression (potentially) reads from the environment or state and thus requires "view".

test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol

@@ -3,4 +3,4 @@ contract C {
     function f() costs(1 ether) public view {}
 }
 // ----
-// TypeError: (101-115): This modifier uses "msg.value" or "callvalue()" and thus the function has to be payable or internal.
+// TypeError: (101-115): This modifier uses "msg.value" or "callvalue()" and thus the function has to be "payable" or "internal".

test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol

@@ -5,4 +5,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError: (77-83): Member "push" is not available in uint256[] memory outside of storage.
+// TypeError: (77-83): Member "push" is not available in "uint256[] memory" outside of storage.

test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol

@@ -7,4 +7,4 @@ abstract contract Other {
     function f(uint) public returns (uint);
 }
 // ----
-// TypeError: (97-121): Member "creationCode" not found or not visible after argument-dependent lookup in type(contract Other).
+// TypeError: (97-121): Member "creationCode" not found or not visible after argument-dependent lookup in "type(contract Other)".

test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol

@@ -7,4 +7,4 @@ abstract contract Other {
     function f(uint) public returns (uint);
 }
 // ----
-// TypeError: (91-114): Member "runtimeCode" not found or not visible after argument-dependent lookup in type(contract Other).
+// TypeError: (91-114): Member "runtimeCode" not found or not visible after argument-dependent lookup in "type(contract Other)".

test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol

@@ -1,3 +1,3 @@
 contract type { }
 // ----
-// ParserError: (9-13): Expected identifier but got 'type'
+// ParserError: (9-13): Expected identifier but got "type"

test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol

@@ -3,4 +3,4 @@ contract Test {
     }
 }
 // ----
-// ParserError: (29-33): Expected identifier but got 'type'
+// ParserError: (29-33): Expected identifier but got "type"

test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol

@@ -3,4 +3,4 @@ contract Test {
     }
 }
 // ----
-// ParserError: (36-40): Expected ',' but got 'type'
+// ParserError: (36-40): Expected "," but got "type"

test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol

@@ -2,4 +2,4 @@ contract Test {
     uint type;
 }
 // ----
-// ParserError: (25-29): Expected identifier but got 'type'
+// ParserError: (25-29): Expected identifier but got "type"

test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol

@@ -4,4 +4,4 @@ contract Test {
     }
 }
 // ----
-// ParserError: (60-64): Expected ';' but got 'type'
+// ParserError: (60-64): Expected ";" but got "type"

test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol

@@ -4,5 +4,5 @@ contract Test {
     }
 }
 // ----
-// TypeError: (65-75): Invalid type for argument in function call. Contract type required, but type(contract Test) provided.
-// TypeError: (60-76): Invalid type for argument in function call. Contract type required, but tuple() provided.
+// TypeError: (65-75): Invalid type for argument in function call. Contract type required, but "type(contract Test)" provided.
+// TypeError: (60-76): Invalid type for argument in function call. Contract type required, but "tuple()" provided.

test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol

@@ -6,4 +6,4 @@ contract Test {
     }
 }
 // ----
-// TypeError: (154-155): Invalid type for argument in function call. Contract type required, but type(struct Test.S) provided.
+// TypeError: (154-155): Invalid type for argument in function call. Contract type required, but "type(struct Test.S)" provided.