Merge pull request #12043 from ethereum/exportCanonicalName

Export canonicalName
2023-10-03 13:03:40 +00:00 · 2021-09-29 10:11:30 +02:00 · 2021-09-29 10:11:30 +02:00 · ed7884e341
commit ed7884e341
parent 1b540c175d b6e62d61ec
58 changed files with 76 additions and 4 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -8,6 +8,7 @@ Compiler Features:


 Bugfixes:
+ * AST: Export ``canonicalName`` for ``UserDefinedValueTypeDefinition`` and ``ContractDefinition``.



--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@ -275,6 +275,7 @@ bool ASTJsonConverter::visit(ContractDefinition const& _node)
 		make_pair("nodes", toJson(_node.subNodes())),
 		make_pair("scope", idOrNull(_node.scope()))
 	};
+	addIfSet(attributes, "canonicalName", _node.annotation().canonicalName);

 	if (_node.annotation().unimplementedDeclarations.has_value())
 		attributes.emplace_back("fullyImplemented", _node.annotation().unimplementedDeclarations->empty());
@ -361,6 +362,7 @@ bool ASTJsonConverter::visit(UserDefinedValueTypeDefinition const& _node)
 		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
 		make_pair("underlyingType", toJson(*_node.underlyingType()))
 	};
+	addIfSet(attributes, "canonicalName", _node.annotation().canonicalName);

 	setJsonNode(_node, "UserDefinedValueTypeDefinition", std::move(attributes));

--- a/test/cmdlineTests/ast_compact_json_with_base_path/output
+++ b/test/cmdlineTests/ast_compact_json_with_base_path/output
@ -30,6 +30,7 @@ JSON AST (compact format):
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/cmdlineTests/combined_json_with_base_path/output
+++ b/test/cmdlineTests/combined_json_with_base_path/output
@ -1 +1 @@
-{"contracts":{"combined_json_with_base_path/c.sol:C":{}},"sourceList":["combined_json_with_base_path/c.sol","combined_json_with_base_path/input.sol"],"sources":{"combined_json_with_base_path/c.sol":{"AST":{"absolutePath":"combined_json_with_base_path/c.sol","exportedSymbols":{"C":[5]},"id":6,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":4,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":5,"linearizedBaseContracts":[5],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":6,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}},"combined_json_with_base_path/input.sol":{"AST":{"absolutePath":"combined_json_with_base_path/input.sol","exportedSymbols":{"C":[5]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:1"},{"absolutePath":"combined_json_with_base_path/c.sol","file":"./c.sol","id":2,"nameLocation":"-1:-1:-1","nodeType":"ImportDirective","scope":3,"sourceUnit":6,"src":"60:17:1","symbolAliases":[],"unitAlias":""}],"src":"36:42:1"}}},"version": "<VERSION REMOVED>"}
+{"contracts":{"combined_json_with_base_path/c.sol:C":{}},"sourceList":["combined_json_with_base_path/c.sol","combined_json_with_base_path/input.sol"],"sources":{"combined_json_with_base_path/c.sol":{"AST":{"absolutePath":"combined_json_with_base_path/c.sol","exportedSymbols":{"C":[5]},"id":6,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":4,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":5,"linearizedBaseContracts":[5],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":6,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}},"combined_json_with_base_path/input.sol":{"AST":{"absolutePath":"combined_json_with_base_path/input.sol","exportedSymbols":{"C":[5]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:1"},{"absolutePath":"combined_json_with_base_path/c.sol","file":"./c.sol","id":2,"nameLocation":"-1:-1:-1","nodeType":"ImportDirective","scope":3,"sourceUnit":6,"src":"60:17:1","symbolAliases":[],"unitAlias":""}],"src":"36:42:1"}}},"version": "<VERSION REMOVED>"}
--- a/test/cmdlineTests/recovery_ast_constructor/output
+++ b/test/cmdlineTests/recovery_ast_constructor/output
@ -31,6 +31,7 @@ JSON AST (compact format):
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "Error1",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/cmdlineTests/recovery_standard_json/output.json
+++ b/test/cmdlineTests/recovery_standard_json/output.json
@ -10,4 +10,4 @@
 2 | pragma solidity >=0.0; contract Errort6 { using foo for  ; /* missing type name */ }
  |                                                                                    ^

-","message":"Recovered in ContractDefinition at '}'.","severity":"warning","sourceLocation":{"end":120,"file":"A","start":119},"type":"Warning"}],"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"Errort6":[3]},"id":4,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":3,"linearizedBaseContracts":[3],"name":"Errort6","nameLocation":"68:7:0","nodeType":"ContractDefinition","nodes":[],"scope":4,"src":"59:35:0","usedErrors":[]}],"src":"36:84:0"},"id":0}}}
+","message":"Recovered in ContractDefinition at '}'.","severity":"warning","sourceLocation":{"end":120,"file":"A","start":119},"type":"Warning"}],"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"Errort6":[3]},"id":4,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"Errort6","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":3,"linearizedBaseContracts":[3],"name":"Errort6","nameLocation":"68:7:0","nodeType":"ContractDefinition","nodes":[],"scope":4,"src":"59:35:0","usedErrors":[]}],"src":"36:84:0"},"id":0}}}
--- a/test/cmdlineTests/standard_only_ast_requested/output.json
+++ b/test/cmdlineTests/standard_only_ast_requested/output.json
@ -1 +1 @@
-{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nameLocation":"68:1:0","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"97:2:0","statements":[]},"functionSelector":"26121ff0","id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nameLocation":"81:1:0","nodeType":"FunctionDefinition","parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"82:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"97:0:0"},"scope":6,"src":"72:27:0","stateMutability":"pure","virtual":false,"visibility":"public"}],"scope":7,"src":"59:42:0","usedErrors":[]}],"src":"36:65:0"},"id":0}}}
+{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nameLocation":"68:1:0","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"97:2:0","statements":[]},"functionSelector":"26121ff0","id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nameLocation":"81:1:0","nodeType":"FunctionDefinition","parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"82:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"97:0:0"},"scope":6,"src":"72:27:0","stateMutability":"pure","virtual":false,"visibility":"public"}],"scope":7,"src":"59:42:0","usedErrors":[]}],"src":"36:65:0"},"id":0}}}
--- a/test/libsolidity/ASTJSON/abstract_contract.json
+++ b/test/libsolidity/ASTJSON/abstract_contract.json
@ -14,6 +14,7 @@
    {
      "abstract": true,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/array_type_name.json
+++ b/test/libsolidity/ASTJSON/array_type_name.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/call.json
+++ b/test/libsolidity/ASTJSON/assembly/call.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/empty_block.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/function.json
+++ b/test/libsolidity/ASTJSON/assembly/function.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/leave.json
+++ b/test/libsolidity/ASTJSON/assembly/leave.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/loop.json
+++ b/test/libsolidity/ASTJSON/assembly/loop.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "id": 8,
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/stringlit.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/switch.json
+++ b/test/libsolidity/ASTJSON/assembly/switch.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "id": 6,
--- a/test/libsolidity/ASTJSON/assembly/switch_default.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/assembly/var_access.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/base_constructor_call.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call.json
@ -18,6 +18,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "A",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -121,6 +122,7 @@
          "src": "50:1:1"
        }
      ],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/constructor.json
+++ b/test/libsolidity/ASTJSON/constructor.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/contract_dep_order.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order.json
@ -30,6 +30,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "A",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -64,6 +65,7 @@
          "src": "29:1:1"
        }
      ],
+      "canonicalName": "B",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -99,6 +101,7 @@
          "src": "49:1:1"
        }
      ],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -135,6 +138,7 @@
          "src": "69:1:1"
        }
      ],
+      "canonicalName": "D",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -172,6 +176,7 @@
          "src": "89:1:1"
        }
      ],
+      "canonicalName": "E",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/documentation.json
+++ b/test/libsolidity/ASTJSON/documentation.json
@ -15,6 +15,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "documentation":
@ -57,6 +58,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "documentation":
@ -99,6 +101,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/documentation_local_variable.json
+++ b/test/libsolidity/ASTJSON/documentation_local_variable.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/documentation_on_statements.json
+++ b/test/libsolidity/ASTJSON/documentation_on_statements.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/documentation_triple.json
+++ b/test/libsolidity/ASTJSON/documentation_triple.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/enum_value.json
+++ b/test/libsolidity/ASTJSON/enum_value.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/event_definition.json
+++ b/test/libsolidity/ASTJSON/event_definition.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/fallback.json
+++ b/test/libsolidity/ASTJSON/fallback.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/fallback_and_reveice_ether.json
+++ b/test/libsolidity/ASTJSON/fallback_and_reveice_ether.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/fallback_payable.json
+++ b/test/libsolidity/ASTJSON/fallback_payable.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/function_type.json
+++ b/test/libsolidity/ASTJSON/function_type.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/inheritance_specifier.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier.json
@ -18,6 +18,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C1",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -52,6 +53,7 @@
          "src": "30:2:1"
        }
      ],
+      "canonicalName": "C2",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/license.json
+++ b/test/libsolidity/ASTJSON/license.json
@ -15,6 +15,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
+++ b/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "c",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/long_type_name_identifier.json
+++ b/test/libsolidity/ASTJSON/long_type_name_identifier.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "c",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/mappings.json
+++ b/test/libsolidity/ASTJSON/mappings.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/modifier_definition.json
+++ b/test/libsolidity/ASTJSON/modifier_definition.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/modifier_invocation.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/mutability.json
+++ b/test/libsolidity/ASTJSON/mutability.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/non_utf8.json
+++ b/test/libsolidity/ASTJSON/non_utf8.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/override.json
+++ b/test/libsolidity/ASTJSON/override.json
@ -22,6 +22,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "A",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -94,6 +95,7 @@
          "src": "72:1:1"
        }
      ],
+      "canonicalName": "B",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": false,
@ -207,6 +209,7 @@
          "src": "167:1:1"
        }
      ],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/placeholder_statement.json
+++ b/test/libsolidity/ASTJSON/placeholder_statement.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/receive_ether.json
+++ b/test/libsolidity/ASTJSON/receive_ether.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/short_type_name.json
+++ b/test/libsolidity/ASTJSON/short_type_name.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "c",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/short_type_name_ref.json
+++ b/test/libsolidity/ASTJSON/short_type_name_ref.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "c",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/smoke.json
+++ b/test/libsolidity/ASTJSON/smoke.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/source_location.json
+++ b/test/libsolidity/ASTJSON/source_location.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/string.json
+++ b/test/libsolidity/ASTJSON/string.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/two_base_functions.json
+++ b/test/libsolidity/ASTJSON/two_base_functions.json
@ -22,6 +22,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "A",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -79,6 +80,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "B",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -164,6 +166,7 @@
          "src": "117:1:1"
        }
      ],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/unicode.json
+++ b/test/libsolidity/ASTJSON/unicode.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@ -112,6 +112,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.json
@ -24,6 +24,7 @@
  "nodes":
  [
    {
+      "canonicalName": "MyAddress",
      "id": 2,
      "name": "MyAddress",
      "nameLocation": "5:9:1",
@ -44,6 +45,7 @@
      }
    },
    {
+      "canonicalName": "MyUInt",
      "id": 4,
      "name": "MyUInt",
      "nameLocation": "32:6:1",
@ -202,6 +204,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
@ -216,6 +219,7 @@
      "nodes":
      [
        {
+          "canonicalName": "C.MyAddress",
          "id": 18,
          "name": "MyAddress",
          "nameLocation": "118:9:1",
@ -236,6 +240,7 @@
          }
        },
        {
+          "canonicalName": "C.MyUInt",
          "id": 20,
          "name": "MyUInt",
          "nameLocation": "149:6:1",
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ b/test/libsolidity/ASTJSON/using_for_directive.json
@ -18,6 +18,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "L",
      "contractDependencies": [],
      "contractKind": "library",
      "fullyImplemented": true,
@ -37,6 +38,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "C",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/ASTJSON/yul_hex_literal.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal.json
@ -14,6 +14,7 @@
    {
      "abstract": false,
      "baseContracts": [],
+      "canonicalName": "Sample",
      "contractDependencies": [],
      "contractKind": "contract",
      "fullyImplemented": true,
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@ -485,7 +485,7 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 	BOOST_CHECK_EQUAL(
 		util::jsonCompactPrint(result["sources"]["fileA"]["ast"]),
 		"{\"absolutePath\":\"fileA\",\"exportedSymbols\":{\"A\":[1]},\"id\":2,\"nodeType\":\"SourceUnit\",\"nodes\":[{\"abstract\":false,"
-		"\"baseContracts\":[],\"contractDependencies\":[],\"contractKind\":\"contract\",\"fullyImplemented\":true,\"id\":1,"
+		"\"baseContracts\":[],\"canonicalName\":\"A\",\"contractDependencies\":[],\"contractKind\":\"contract\",\"fullyImplemented\":true,\"id\":1,"
 		"\"linearizedBaseContracts\":[1],\"name\":\"A\",\"nameLocation\":\"9:1:0\",\"nodeType\":\"ContractDefinition\",\"nodes\":[],\"scope\":2,"
 		"\"src\":\"0:14:0\",\"usedErrors\":[]}],\"src\":\"0:14:0\"}"
 	);