From ef1ff80a58232aa0efe3d1c7e32240bf7b9a29a3 Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Mon, 20 Feb 2017 20:05:03 -0800 Subject: [PATCH] combine usage into one list --- main.cpp | 20 +--------- tests/class_forward_declaration.cc | 4 +- tests/constructors/constructor.cc | 25 ++++++------ tests/constructors/destructor.cc | 25 ++++++------ tests/declaration_vs_definition/class.cc | 4 +- .../declaration_vs_definition/class_member.cc | 8 ++-- .../class_member_static.cc | 10 ++--- tests/declaration_vs_definition/func.cc | 6 +-- tests/declaration_vs_definition/method.cc | 18 ++++----- tests/foobar.cc | 18 ++++----- tests/function_declaration.cc | 4 +- tests/function_declaration_definition.cc | 6 +-- tests/function_definition.cc | 4 +- tests/inheritance/class_inherit.cc | 9 ++--- .../class_inherit_templated_parent.cc | 28 ++++++------- tests/inheritance/class_multiple_inherit.cc | 19 ++++----- tests/inheritance/function_override.cc | 17 ++++---- tests/inheritance/interface_pure_virtual.cc | 8 ++-- tests/method_declaration.cc | 8 ++-- tests/method_definition.cc | 10 ++--- tests/method_inline_declaration.cc | 8 ++-- tests/namespaces/anonymous_function.cc | 4 +- tests/namespaces/function_declaration.cc | 4 +- tests/namespaces/function_definition.cc | 4 +- tests/namespaces/method_declaration.cc | 8 ++-- tests/namespaces/method_definition.cc | 10 ++--- tests/namespaces/method_inline_declaration.cc | 8 ++-- tests/usage/func_usage_addr_func.cc | 22 +++++------ tests/usage/func_usage_addr_method.cc | 20 +++++----- tests/usage/func_usage_call_func.cc | 12 +++--- tests/usage/func_usage_call_method.cc | 21 +++++----- .../usage/func_usage_class_inline_var_def.cc | 12 +++--- tests/usage/func_usage_forward_decl_func.cc | 12 +++--- tests/usage/func_usage_forward_decl_method.cc | 21 +++++----- tests/usage/func_usage_template_func.cc | 12 +++--- .../usage/type_usage_as_template_parameter.cc | 24 ++++++------ ...ype_usage_as_template_parameter_complex.cc | 39 +++++++++---------- ...type_usage_as_template_parameter_simple.cc | 12 +++--- tests/usage/type_usage_declare_extern.cc | 9 ++--- tests/usage/type_usage_declare_field.cc | 20 +++++----- tests/usage/type_usage_declare_local.cc | 20 +++++----- tests/usage/type_usage_declare_param.cc | 20 +++++----- .../type_usage_declare_param_prototype.cc | 13 +++---- .../usage/type_usage_declare_param_unnamed.cc | 7 ++-- tests/usage/type_usage_declare_qualifiers.cc | 33 ++++++++-------- tests/usage/type_usage_declare_static.cc | 7 ++-- tests/usage/type_usage_on_return_type.cc | 35 ++++++++--------- tests/usage/type_usage_typedef_and_using.cc | 38 ++++++++---------- .../type_usage_typedef_and_using_template.cc | 12 +++--- tests/usage/type_usage_various.cc | 19 +++++---- tests/usage/usage_inside_of_call.cc | 36 ++++++++--------- tests/usage/usage_inside_of_call_simple.cc | 18 ++++----- tests/usage/var_usage_call_function.cc | 16 ++++---- tests/usage/var_usage_class_member.cc | 35 ++++++++--------- tests/usage/var_usage_class_member_static.cc | 20 +++++----- tests/usage/var_usage_extern.cc | 8 ++-- tests/usage/var_usage_func_parameter.cc | 8 ++-- tests/usage/var_usage_local.cc | 8 ++-- tests/usage/var_usage_shadowed_local.cc | 12 +++--- tests/usage/var_usage_shadowed_parameter.cc | 12 +++--- tests/usage/var_usage_static.cc | 8 ++-- tests/vars/class_member.cc | 9 ++--- tests/vars/class_static_member.cc | 11 +++--- tests/vars/class_static_member_decl_only.cc | 8 ++-- tests/vars/function_local.cc | 11 +++--- tests/vars/function_param.cc | 15 ++++--- tests/vars/function_param_unnamed.cc | 4 +- tests/vars/function_shadow_local.cc | 12 +++--- tests/vars/function_shadow_param.cc | 12 +++--- tests/vars/global_variable.cc | 4 +- tests/vars/global_variable_decl_only.cc | 4 +- 71 files changed, 473 insertions(+), 535 deletions(-) diff --git a/main.cpp b/main.cpp index e1603a0d..5337945d 100644 --- a/main.cpp +++ b/main.cpp @@ -66,8 +66,8 @@ std::string ToString() { // 3 => column std::string result; - //if (interesting) - result += '*'; + if (interesting) + result += '*'; result += std::to_string(file_id); result += ':'; result += std::to_string(line); @@ -488,22 +488,6 @@ std::string ParsingDatabase::ToString() { WRITE(funcs); WRITE(vars); WRITE(all_uses); - - bool wrote_key = false; - for (Location usage : def.all_uses) { - if (usage.interesting) { - if (!wrote_key) { - writer.Key("interesting_uses"); - wrote_key = true; - writer.StartArray(); - } - - Write(writer, nullptr, usage); - } - } - if (wrote_key) - writer.EndArray(); - writer.EndObject(); } writer.EndArray(); diff --git a/tests/class_forward_declaration.cc b/tests/class_forward_declaration.cc index d63e2e9d..392dd694 100644 --- a/tests/class_forward_declaration.cc +++ b/tests/class_forward_declaration.cc @@ -11,8 +11,8 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:3:7", - "all_uses": ["*1:1:7", "*1:2:7", "*1:3:7", "*1:4:7"] + "definition": "1:3:7", + "all_uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"] }], "functions": [], "variables": [] diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc index 8074e43d..f3ec0115 100644 --- a/tests/constructors/constructor.cc +++ b/tests/constructors/constructor.cc @@ -23,45 +23,44 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [0], - "all_uses": ["*1:1:7", "*1:7:3", "*1:8:3", "*1:8:17"], - "interesting_uses": ["*1:7:3", "*1:8:3"] + "all_uses": ["1:1:7", "*1:7:3", "*1:8:3", "1:8:17"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", "qualified_name": "Foo::Foo", - "definition": "*1:3:3", + "definition": "1:3:3", "declaring_type": 0, - "callers": ["1@*1:7:7", "1@*1:8:17"], - "all_uses": ["*1:3:3", "*1:7:7", "*1:8:17"] + "callers": ["1@1:7:7", "1@1:8:17"], + "all_uses": ["1:3:3", "1:7:7", "1:8:17"] }, { "id": 1, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:6:6", - "callees": ["0@*1:7:7", "0@*1:8:17"], - "all_uses": ["*1:6:6"] + "definition": "1:6:6", + "callees": ["0@1:7:7", "0@1:8:17"], + "all_uses": ["1:6:6"] }], "variables": [{ "id": 0, "usr": "c:constructor.cc@56@F@foo#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:7:7", + "definition": "1:7:7", "variable_type": 0, - "all_uses": ["*1:7:7"] + "all_uses": ["1:7:7"] }, { "id": 1, "usr": "c:constructor.cc@66@F@foo#@f2", "short_name": "f2", "qualified_name": "f2", - "definition": "*1:8:8", + "definition": "1:8:8", "variable_type": 0, - "all_uses": ["*1:8:8"] + "all_uses": ["1:8:8"] }] } */ \ No newline at end of file diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc index 13ba4319..86beebe4 100644 --- a/tests/constructors/destructor.cc +++ b/tests/constructors/destructor.cc @@ -21,45 +21,44 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [0, 1], - "all_uses": ["*1:1:7", "*1:8:3"], - "interesting_uses": ["*1:8:3"] + "all_uses": ["1:1:7", "*1:8:3"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", "qualified_name": "Foo::Foo", - "definition": "*1:3:3", + "definition": "1:3:3", "declaring_type": 0, - "callers": ["2@*1:8:7"], - "all_uses": ["*1:3:3", "*1:8:7"] + "callers": ["2@1:8:7"], + "all_uses": ["1:3:3", "1:8:7"] }, { "id": 1, "usr": "c:@S@Foo@F@~Foo#", "short_name": "~Foo", "qualified_name": "Foo::~Foo", - "definition": "*1:4:3", + "definition": "1:4:3", "declaring_type": 0, - "all_uses": ["*1:4:3"] + "all_uses": ["1:4:3"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:7:6", - "callees": ["0@*1:8:7"], - "all_uses": ["*1:7:6"] + "definition": "1:7:6", + "callees": ["0@1:8:7"], + "all_uses": ["1:7:6"] }], "variables": [{ "id": 0, "usr": "c:destructor.cc@70@F@foo#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:8:7", + "definition": "1:8:7", "variable_type": 0, - "all_uses": ["*1:8:7"] + "all_uses": ["1:8:7"] }] } */ \ No newline at end of file diff --git a/tests/declaration_vs_definition/class.cc b/tests/declaration_vs_definition/class.cc index 4494cccc..9d0c26bb 100644 --- a/tests/declaration_vs_definition/class.cc +++ b/tests/declaration_vs_definition/class.cc @@ -13,8 +13,8 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:3:7", - "all_uses": ["*1:1:7", "*1:2:7", "*1:3:7", "*1:4:7"] + "definition": "1:3:7", + "all_uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"] }], "functions": [], "variables": [] diff --git a/tests/declaration_vs_definition/class_member.cc b/tests/declaration_vs_definition/class_member.cc index 9e9c551d..805bb0d8 100644 --- a/tests/declaration_vs_definition/class_member.cc +++ b/tests/declaration_vs_definition/class_member.cc @@ -10,9 +10,9 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "vars": [0], - "all_uses": ["*1:1:7"] + "all_uses": ["1:1:7"] }], "functions": [], "variables": [{ @@ -20,9 +20,9 @@ OUTPUT: "usr": "c:@S@Foo@FI@foo", "short_name": "foo", "qualified_name": "Foo::foo", - "definition": "*1:2:7", + "definition": "1:2:7", "declaring_type": 0, - "all_uses": ["*1:2:7"] + "all_uses": ["1:2:7"] }] } */ \ No newline at end of file diff --git a/tests/declaration_vs_definition/class_member_static.cc b/tests/declaration_vs_definition/class_member_static.cc index c723a736..2fae5da2 100644 --- a/tests/declaration_vs_definition/class_member_static.cc +++ b/tests/declaration_vs_definition/class_member_static.cc @@ -12,9 +12,9 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "vars": [0], - "all_uses": ["*1:1:7", "*1:5:5"] + "all_uses": ["1:1:7", "1:5:5"] }], "functions": [], "variables": [{ @@ -22,10 +22,10 @@ OUTPUT: "usr": "c:@S@Foo@foo", "short_name": "foo", "qualified_name": "Foo::foo", - "declaration": "*1:2:14", - "definition": "*1:5:10", + "declaration": "1:2:14", + "definition": "1:5:10", "declaring_type": 0, - "all_uses": ["*1:2:14", "*1:5:10"] + "all_uses": ["1:2:14", "1:5:10"] }] } */ \ No newline at end of file diff --git a/tests/declaration_vs_definition/func.cc b/tests/declaration_vs_definition/func.cc index fd9aafb5..32114692 100644 --- a/tests/declaration_vs_definition/func.cc +++ b/tests/declaration_vs_definition/func.cc @@ -13,9 +13,9 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:4:6", - "definition": "*1:3:6", - "all_uses": ["*1:1:6", "*1:2:6", "*1:3:6", "*1:4:6"] + "declaration": "1:4:6", + "definition": "1:3:6", + "all_uses": ["1:1:6", "1:2:6", "1:3:6", "1:4:6"] }], "variables": [] } diff --git a/tests/declaration_vs_definition/method.cc b/tests/declaration_vs_definition/method.cc index 61bda689..ec8502e2 100644 --- a/tests/declaration_vs_definition/method.cc +++ b/tests/declaration_vs_definition/method.cc @@ -14,34 +14,34 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [1, 2], - "all_uses": ["*1:1:7", "*1:7:6"] + "all_uses": ["1:1:7", "1:7:6"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@declonly#", "short_name": "declonly", "qualified_name": "Foo::declonly", - "declaration": "*1:2:8", - "all_uses": ["*1:2:8"] + "declaration": "1:2:8", + "all_uses": ["1:2:8"] }, { "id": 1, "usr": "c:@S@Foo@F@purevirtual#", "short_name": "purevirtual", "qualified_name": "Foo::purevirtual", - "declaration": "*1:3:16", + "declaration": "1:3:16", "declaring_type": 0, - "all_uses": ["*1:3:16"] + "all_uses": ["1:3:16"] }, { "id": 2, "usr": "c:@S@Foo@F@def#", "short_name": "def", "qualified_name": "Foo::def", - "declaration": "*1:4:8", - "definition": "*1:7:11", + "declaration": "1:4:8", + "definition": "1:7:11", "declaring_type": 0, - "all_uses": ["*1:4:8", "*1:7:11"] + "all_uses": ["1:4:8", "1:7:11"] }], "variables": [] } diff --git a/tests/foobar.cc b/tests/foobar.cc index c94e5010..89528132 100644 --- a/tests/foobar.cc +++ b/tests/foobar.cc @@ -14,25 +14,25 @@ OUTPUT: "usr": "c:@F@called#I#", "short_name": "called", "qualified_name": "called", - "declaration": "*1:1:6", - "callers": ["2@*1:6:3"], - "all_uses": ["*1:1:6", "*1:6:3"] + "declaration": "1:1:6", + "callers": ["2@1:6:3"], + "all_uses": ["1:1:6", "1:6:3"] }, { "id": 1, "usr": "c:@F@gen#", "short_name": "gen", "qualified_name": "gen", - "definition": "*1:3:5", - "callers": ["2@*1:6:10", "2@*1:6:18"], - "all_uses": ["*1:3:5", "*1:6:10", "*1:6:18"] + "definition": "1:3:5", + "callers": ["2@1:6:10", "2@1:6:18"], + "all_uses": ["1:3:5", "1:6:10", "1:6:18"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:5:6", - "callees": ["0@*1:6:3", "1@*1:6:10", "1@*1:6:18"], - "all_uses": ["*1:5:6"] + "definition": "1:5:6", + "callees": ["0@1:6:3", "1@1:6:10", "1@1:6:18"], + "all_uses": ["1:5:6"] }], "variables": [] } diff --git a/tests/function_declaration.cc b/tests/function_declaration.cc index cd078696..accc0996 100644 --- a/tests/function_declaration.cc +++ b/tests/function_declaration.cc @@ -9,8 +9,8 @@ OUTPUT: "usr": "c:@F@foo#I#I#", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:1:6", - "all_uses": ["*1:1:6"] + "declaration": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [] } diff --git a/tests/function_declaration_definition.cc b/tests/function_declaration_definition.cc index e16a3267..cf17f26a 100644 --- a/tests/function_declaration_definition.cc +++ b/tests/function_declaration_definition.cc @@ -11,9 +11,9 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:1:6", - "definition": "*1:3:6", - "all_uses": ["*1:1:6", "*1:3:6"] + "declaration": "1:1:6", + "definition": "1:3:6", + "all_uses": ["1:1:6", "1:3:6"] }], "variables": [] } diff --git a/tests/function_definition.cc b/tests/function_definition.cc index 215b62e2..43e70dab 100644 --- a/tests/function_definition.cc +++ b/tests/function_definition.cc @@ -9,8 +9,8 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [] } diff --git a/tests/inheritance/class_inherit.cc b/tests/inheritance/class_inherit.cc index 0c827ef4..17613be6 100644 --- a/tests/inheritance/class_inherit.cc +++ b/tests/inheritance/class_inherit.cc @@ -9,18 +9,17 @@ OUTPUT: "usr": "c:@S@Parent", "short_name": "Parent", "qualified_name": "Parent", - "definition": "*1:1:7", + "definition": "1:1:7", "derived": [1], - "all_uses": ["*1:1:7", "*1:2:24"], - "interesting_uses": ["*1:2:24"] + "all_uses": ["1:1:7", "*1:2:24"] }, { "id": 1, "usr": "c:@S@Derived", "short_name": "Derived", "qualified_name": "Derived", - "definition": "*1:2:7", + "definition": "1:2:7", "parents": [0], - "all_uses": ["*1:2:7"] + "all_uses": ["1:2:7"] }], "functions": [], "variables": [] diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc index eebdef17..2d6ee3de 100644 --- a/tests/inheritance/class_inherit_templated_parent.cc +++ b/tests/inheritance/class_inherit_templated_parent.cc @@ -20,53 +20,47 @@ OUTPUT: "usr": "c:@ST>1#Ni@Base1", "short_name": "Base1", "qualified_name": "Base1", - "definition": "*1:2:7", + "definition": "1:2:7", "derived": [2, 5], - "all_uses": ["*1:2:7", "*1:8:18", "*1:13:17"], - "interesting_uses": ["*1:8:18", "*1:13:17"] + "all_uses": ["1:2:7", "*1:8:18", "*1:13:17"] }, { "id": 1, "usr": "c:@ST>1#T@Base2", "short_name": "Base2", "qualified_name": "Base2", - "definition": "*1:5:7", + "definition": "1:5:7", "derived": [3, 5], - "all_uses": ["*1:5:7", "*1:11:18", "*1:13:27"], - "interesting_uses": ["*1:11:18", "*1:13:27"] + "all_uses": ["1:5:7", "*1:11:18", "*1:13:27"] }, { "id": 2, "usr": "c:@ST>1#Ni@Derived1", "short_name": "Derived1", "qualified_name": "Derived1", - "definition": "*1:8:7", + "definition": "1:8:7", "parents": [0], "derived": [5], - "all_uses": ["*1:8:7", "*1:13:43"], - "interesting_uses": ["*1:13:43"] + "all_uses": ["1:8:7", "*1:13:43"] }, { "id": 3, "usr": "c:@ST>1#T@Derived2", "short_name": "Derived2", "qualified_name": "Derived2", - "definition": "*1:11:7", + "definition": "1:11:7", "parents": [1], "derived": [5], - "all_uses": ["*1:11:7", "*1:13:56"], - "interesting_uses": ["*1:13:56"] + "all_uses": ["1:11:7", "*1:13:56"] }, { "id": 4, "usr": "c:class_inherit_templated_parent.cc@154", - "all_uses": ["*1:11:24"], - "interesting_uses": ["*1:11:24"] + "all_uses": ["*1:11:24"] }, { "id": 5, "usr": "c:@S@Derived", "short_name": "Derived", "qualified_name": "Derived", - "definition": "*1:13:7", + "definition": "1:13:7", "parents": [0, 1, 2, 3], - "all_uses": ["*1:13:7", "*1:13:33", "*1:13:65"], - "interesting_uses": ["*1:13:33", "*1:13:65"] + "all_uses": ["1:13:7", "*1:13:33", "*1:13:65"] }], "functions": [], "variables": [] diff --git a/tests/inheritance/class_multiple_inherit.cc b/tests/inheritance/class_multiple_inherit.cc index 24a80a75..b12c93d5 100644 --- a/tests/inheritance/class_multiple_inherit.cc +++ b/tests/inheritance/class_multiple_inherit.cc @@ -11,38 +11,35 @@ OUTPUT: "usr": "c:@S@Root", "short_name": "Root", "qualified_name": "Root", - "definition": "*1:1:7", + "definition": "1:1:7", "derived": [1, 2], - "all_uses": ["*1:1:7", "*1:2:24", "*1:3:24"], - "interesting_uses": ["*1:2:24", "*1:3:24"] + "all_uses": ["1:1:7", "*1:2:24", "*1:3:24"] }, { "id": 1, "usr": "c:@S@MiddleA", "short_name": "MiddleA", "qualified_name": "MiddleA", - "definition": "*1:2:7", + "definition": "1:2:7", "parents": [0], "derived": [3], - "all_uses": ["*1:2:7", "*1:4:24"], - "interesting_uses": ["*1:4:24"] + "all_uses": ["1:2:7", "*1:4:24"] }, { "id": 2, "usr": "c:@S@MiddleB", "short_name": "MiddleB", "qualified_name": "MiddleB", - "definition": "*1:3:7", + "definition": "1:3:7", "parents": [0], "derived": [3], - "all_uses": ["*1:3:7", "*1:4:40"], - "interesting_uses": ["*1:4:40"] + "all_uses": ["1:3:7", "*1:4:40"] }, { "id": 3, "usr": "c:@S@Derived", "short_name": "Derived", "qualified_name": "Derived", - "definition": "*1:4:7", + "definition": "1:4:7", "parents": [1, 2], - "all_uses": ["*1:4:7"] + "all_uses": ["1:4:7"] }], "functions": [], "variables": [] diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc index 1016885c..91a71ccb 100644 --- a/tests/inheritance/function_override.cc +++ b/tests/inheritance/function_override.cc @@ -13,37 +13,36 @@ OUTPUT: "usr": "c:@S@Root", "short_name": "Root", "qualified_name": "Root", - "definition": "*1:1:7", + "definition": "1:1:7", "derived": [1], - "all_uses": ["*1:1:7", "*1:4:24"], - "interesting_uses": ["*1:4:24"] + "all_uses": ["1:1:7", "*1:4:24"] }, { "id": 1, "usr": "c:@S@Derived", "short_name": "Derived", "qualified_name": "Derived", - "definition": "*1:4:7", + "definition": "1:4:7", "parents": [0], "funcs": [1], - "all_uses": ["*1:4:7"] + "all_uses": ["1:4:7"] }], "functions": [{ "id": 0, "usr": "c:@S@Root@F@foo#", "short_name": "foo", "qualified_name": "Root::foo", - "declaration": "*1:2:16", + "declaration": "1:2:16", "derived": [1], - "all_uses": ["*1:2:16"] + "all_uses": ["1:2:16"] }, { "id": 1, "usr": "c:@S@Derived@F@foo#", "short_name": "foo", "qualified_name": "Derived::foo", - "definition": "*1:5:8", + "definition": "1:5:8", "declaring_type": 1, "base": 0, - "all_uses": ["*1:5:8"] + "all_uses": ["1:5:8"] }], "variables": [] } diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc index 21d44ec4..4fa18481 100644 --- a/tests/inheritance/interface_pure_virtual.cc +++ b/tests/inheritance/interface_pure_virtual.cc @@ -10,18 +10,18 @@ OUTPUT: "usr": "c:@S@IFoo", "short_name": "IFoo", "qualified_name": "IFoo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [0], - "all_uses": ["*1:1:7"] + "all_uses": ["1:1:7"] }], "functions": [{ "id": 0, "usr": "c:@S@IFoo@F@foo#", "short_name": "foo", "qualified_name": "IFoo::foo", - "definition": "*1:2:16", + "definition": "1:2:16", "declaring_type": 0, - "all_uses": ["*1:2:16"] + "all_uses": ["1:2:16"] }], "variables": [] } diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc index 511db2a1..cf333246 100644 --- a/tests/method_declaration.cc +++ b/tests/method_declaration.cc @@ -14,16 +14,16 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", - "all_uses": ["*1:1:7"] + "definition": "1:1:7", + "all_uses": ["1:1:7"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "Foo::foo", - "declaration": "*1:2:8", - "all_uses": ["*1:2:8"] + "declaration": "1:2:8", + "all_uses": ["1:2:8"] }], "variables": [] } diff --git a/tests/method_definition.cc b/tests/method_definition.cc index c5bc4608..cfa5bab3 100644 --- a/tests/method_definition.cc +++ b/tests/method_definition.cc @@ -12,19 +12,19 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [0], - "all_uses": ["*1:1:7", "*1:5:6"] + "all_uses": ["1:1:7", "1:5:6"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "Foo::foo", - "declaration": "*1:2:8", - "definition": "*1:5:11", + "declaration": "1:2:8", + "definition": "1:5:11", "declaring_type": 0, - "all_uses": ["*1:2:8", "*1:5:11"] + "all_uses": ["1:2:8", "1:5:11"] }], "variables": [] } diff --git a/tests/method_inline_declaration.cc b/tests/method_inline_declaration.cc index 86da7d9d..85d19032 100644 --- a/tests/method_inline_declaration.cc +++ b/tests/method_inline_declaration.cc @@ -10,18 +10,18 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [0], - "all_uses": ["*1:1:7"] + "all_uses": ["1:1:7"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "Foo::foo", - "definition": "*1:2:8", + "definition": "1:2:8", "declaring_type": 0, - "all_uses": ["*1:2:8"] + "all_uses": ["1:2:8"] }], "variables": [] } diff --git a/tests/namespaces/anonymous_function.cc b/tests/namespaces/anonymous_function.cc index 693e0b83..1c2defd9 100644 --- a/tests/namespaces/anonymous_function.cc +++ b/tests/namespaces/anonymous_function.cc @@ -11,8 +11,8 @@ OUTPUT: "usr": "c:anonymous_function.cc@aN@F@foo#", "short_name": "foo", "qualified_name": "::foo", - "declaration": "*1:2:6", - "all_uses": ["*1:2:6"] + "declaration": "1:2:6", + "all_uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/namespaces/function_declaration.cc b/tests/namespaces/function_declaration.cc index 76040df7..ed161f25 100644 --- a/tests/namespaces/function_declaration.cc +++ b/tests/namespaces/function_declaration.cc @@ -11,8 +11,8 @@ OUTPUT: "usr": "c:@N@hello@F@foo#I#I#", "short_name": "foo", "qualified_name": "hello::foo", - "declaration": "*1:2:6", - "all_uses": ["*1:2:6"] + "declaration": "1:2:6", + "all_uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/namespaces/function_definition.cc b/tests/namespaces/function_definition.cc index 31ff9b2b..6a87d0c4 100644 --- a/tests/namespaces/function_definition.cc +++ b/tests/namespaces/function_definition.cc @@ -11,8 +11,8 @@ OUTPUT: "usr": "c:@N@hello@F@foo#", "short_name": "foo", "qualified_name": "hello::foo", - "definition": "*1:2:6", - "all_uses": ["*1:2:6"] + "definition": "1:2:6", + "all_uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/namespaces/method_declaration.cc b/tests/namespaces/method_declaration.cc index fdbe4793..8aee6f5d 100644 --- a/tests/namespaces/method_declaration.cc +++ b/tests/namespaces/method_declaration.cc @@ -12,16 +12,16 @@ OUTPUT: "usr": "c:@N@hello@S@Foo", "short_name": "Foo", "qualified_name": "hello::Foo", - "definition": "*1:2:7", - "all_uses": ["*1:2:7"] + "definition": "1:2:7", + "all_uses": ["1:2:7"] }], "functions": [{ "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "hello::Foo::foo", - "declaration": "*1:3:8", - "all_uses": ["*1:3:8"] + "declaration": "1:3:8", + "all_uses": ["1:3:8"] }], "variables": [] } diff --git a/tests/namespaces/method_definition.cc b/tests/namespaces/method_definition.cc index a779e672..8ffe778f 100644 --- a/tests/namespaces/method_definition.cc +++ b/tests/namespaces/method_definition.cc @@ -14,19 +14,19 @@ OUTPUT: "usr": "c:@N@hello@S@Foo", "short_name": "Foo", "qualified_name": "hello::Foo", - "definition": "*1:2:7", + "definition": "1:2:7", "funcs": [0], - "all_uses": ["*1:2:7", "*1:6:6"] + "all_uses": ["1:2:7", "1:6:6"] }], "functions": [{ "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "hello::Foo::foo", - "declaration": "*1:3:8", - "definition": "*1:6:11", + "declaration": "1:3:8", + "definition": "1:6:11", "declaring_type": 0, - "all_uses": ["*1:3:8", "*1:6:11"] + "all_uses": ["1:3:8", "1:6:11"] }], "variables": [] } diff --git a/tests/namespaces/method_inline_declaration.cc b/tests/namespaces/method_inline_declaration.cc index 2eb50b85..edafa84c 100644 --- a/tests/namespaces/method_inline_declaration.cc +++ b/tests/namespaces/method_inline_declaration.cc @@ -12,18 +12,18 @@ OUTPUT: "usr": "c:@N@hello@S@Foo", "short_name": "Foo", "qualified_name": "hello::Foo", - "definition": "*1:2:7", + "definition": "1:2:7", "funcs": [0], - "all_uses": ["*1:2:7"] + "all_uses": ["1:2:7"] }], "functions": [{ "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "hello::Foo::foo", - "definition": "*1:3:8", + "definition": "1:3:8", "declaring_type": 0, - "all_uses": ["*1:3:8"] + "all_uses": ["1:3:8"] }], "variables": [] } diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc index 8dde6c60..03f322d6 100644 --- a/tests/usage/func_usage_addr_func.cc +++ b/tests/usage/func_usage_addr_func.cc @@ -16,33 +16,33 @@ OUTPUT: "usr": "c:@F@consume#*v#", "short_name": "consume", "qualified_name": "consume", - "definition": "*1:1:6", - "callers": ["2@*1:7:3"], - "all_uses": ["*1:1:6", "*1:7:3"] + "definition": "1:1:6", + "callers": ["2@1:7:3"], + "all_uses": ["1:1:6", "1:7:3"] }, { "id": 1, "usr": "c:@F@used#", "short_name": "used", "qualified_name": "used", - "definition": "*1:3:6", - "callers": ["2@*1:6:13", "2@*1:7:12"], - "all_uses": ["*1:3:6", "*1:6:13", "*1:7:12"] + "definition": "1:3:6", + "callers": ["2@1:6:13", "2@1:7:12"], + "all_uses": ["1:3:6", "1:6:13", "1:7:12"] }, { "id": 2, "usr": "c:@F@user#", "short_name": "user", "qualified_name": "user", - "definition": "*1:5:6", - "callees": ["1@*1:6:13", "0@*1:7:3", "1@*1:7:12"], - "all_uses": ["*1:5:6"] + "definition": "1:5:6", + "callees": ["1@1:6:13", "0@1:7:3", "1@1:7:12"], + "all_uses": ["1:5:6"] }], "variables": [{ "id": 0, "usr": "c:func_usage_addr_func.cc@61@F@user#@x", "short_name": "x", "qualified_name": "x", - "definition": "*1:6:8", - "all_uses": ["*1:6:8"] + "definition": "1:6:8", + "all_uses": ["1:6:8"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc index 77e7c4c6..8ad98918 100644 --- a/tests/usage/func_usage_addr_method.cc +++ b/tests/usage/func_usage_addr_method.cc @@ -15,33 +15,33 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:8", - "all_uses": ["*1:1:8", "*1:6:13"] + "definition": "1:1:8", + "all_uses": ["1:1:8", "1:6:13"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@Used#", "short_name": "Used", "qualified_name": "Foo::Used", - "declaration": "*1:2:8", - "callers": ["1@*1:6:18"], - "all_uses": ["*1:2:8", "*1:6:18"] + "declaration": "1:2:8", + "callers": ["1@1:6:18"], + "all_uses": ["1:2:8", "1:6:18"] }, { "id": 1, "usr": "c:@F@user#", "short_name": "user", "qualified_name": "user", - "definition": "*1:5:6", - "callees": ["0@*1:6:18"], - "all_uses": ["*1:5:6"] + "definition": "1:5:6", + "callees": ["0@1:6:18"], + "all_uses": ["1:5:6"] }], "variables": [{ "id": 0, "usr": "c:func_usage_addr_method.cc@53@F@user#@x", "short_name": "x", "qualified_name": "x", - "definition": "*1:6:8", - "all_uses": ["*1:6:8"] + "definition": "1:6:8", + "all_uses": ["1:6:8"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_call_func.cc b/tests/usage/func_usage_call_func.cc index 6f3c7d1d..43baabc6 100644 --- a/tests/usage/func_usage_call_func.cc +++ b/tests/usage/func_usage_call_func.cc @@ -12,17 +12,17 @@ OUTPUT: "usr": "c:@F@called#", "short_name": "called", "qualified_name": "called", - "definition": "*1:1:6", - "callers": ["1@*1:3:3"], - "all_uses": ["*1:1:6", "*1:3:3"] + "definition": "1:1:6", + "callers": ["1@1:3:3"], + "all_uses": ["1:1:6", "1:3:3"] }, { "id": 1, "usr": "c:@F@caller#", "short_name": "caller", "qualified_name": "caller", - "definition": "*1:2:6", - "callees": ["0@*1:3:3"], - "all_uses": ["*1:2:6"] + "definition": "1:2:6", + "callees": ["0@1:3:3"], + "all_uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc index 2646e74a..62330364 100644 --- a/tests/usage/func_usage_call_method.cc +++ b/tests/usage/func_usage_call_method.cc @@ -15,35 +15,34 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:8", - "all_uses": ["*1:1:8", "*1:6:3"], - "interesting_uses": ["*1:6:3"] + "definition": "1:1:8", + "all_uses": ["1:1:8", "*1:6:3"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@Used#", "short_name": "Used", "qualified_name": "Foo::Used", - "declaration": "*1:2:8", - "callers": ["1@*1:7:6"], - "all_uses": ["*1:2:8", "*1:7:6"] + "declaration": "1:2:8", + "callers": ["1@1:7:6"], + "all_uses": ["1:2:8", "1:7:6"] }, { "id": 1, "usr": "c:@F@user#", "short_name": "user", "qualified_name": "user", - "definition": "*1:5:6", - "callees": ["0@*1:7:6"], - "all_uses": ["*1:5:6"] + "definition": "1:5:6", + "callees": ["0@1:7:6"], + "all_uses": ["1:5:6"] }], "variables": [{ "id": 0, "usr": "c:func_usage_call_method.cc@53@F@user#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:6:8", + "definition": "1:6:8", "variable_type": 0, - "all_uses": ["*1:6:8", "*1:7:3"] + "all_uses": ["1:6:8", "1:7:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc index 65fc0b31..06a5422e 100644 --- a/tests/usage/func_usage_class_inline_var_def.cc +++ b/tests/usage/func_usage_class_inline_var_def.cc @@ -14,26 +14,26 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:5:7", + "definition": "1:5:7", "vars": [0], - "all_uses": ["*1:5:7"] + "all_uses": ["1:5:7"] }], "functions": [{ "id": 0, "usr": "c:func_usage_class_inline_var_def.cc@F@helper#", "short_name": "helper", "qualified_name": "helper", - "definition": "*1:1:12", - "all_uses": ["*1:1:12", "*1:6:11"] + "definition": "1:1:12", + "all_uses": ["1:1:12", "1:6:11"] }], "variables": [{ "id": 0, "usr": "c:@S@Foo@FI@x", "short_name": "x", "qualified_name": "Foo::x", - "definition": "*1:6:7", + "definition": "1:6:7", "declaring_type": 0, - "all_uses": ["*1:6:7"] + "all_uses": ["1:6:7"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_forward_decl_func.cc b/tests/usage/func_usage_forward_decl_func.cc index 33579397..05620073 100644 --- a/tests/usage/func_usage_forward_decl_func.cc +++ b/tests/usage/func_usage_forward_decl_func.cc @@ -12,17 +12,17 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:1:6", - "callers": ["1@*1:4:3"], - "all_uses": ["*1:1:6", "*1:4:3"] + "declaration": "1:1:6", + "callers": ["1@1:4:3"], + "all_uses": ["1:1:6", "1:4:3"] }, { "id": 1, "usr": "c:@F@usage#", "short_name": "usage", "qualified_name": "usage", - "definition": "*1:3:6", - "callees": ["0@*1:4:3"], - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "callees": ["0@1:4:3"], + "all_uses": ["1:3:6"] }], "variables": [] } diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc index 8dec2695..4457d73a 100644 --- a/tests/usage/func_usage_forward_decl_method.cc +++ b/tests/usage/func_usage_forward_decl_method.cc @@ -14,35 +14,34 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:8", - "all_uses": ["*1:1:8", "*1:6:3"], - "interesting_uses": ["*1:6:3"] + "definition": "1:1:8", + "all_uses": ["1:1:8", "*1:6:3"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "Foo::foo", - "declaration": "*1:2:8", - "callers": ["1@*1:7:6"], - "all_uses": ["*1:2:8", "*1:7:6"] + "declaration": "1:2:8", + "callers": ["1@1:7:6"], + "all_uses": ["1:2:8", "1:7:6"] }, { "id": 1, "usr": "c:@F@usage#", "short_name": "usage", "qualified_name": "usage", - "definition": "*1:5:6", - "callees": ["0@*1:7:6"], - "all_uses": ["*1:5:6"] + "definition": "1:5:6", + "callees": ["0@1:7:6"], + "all_uses": ["1:5:6"] }], "variables": [{ "id": 0, "usr": "c:func_usage_forward_decl_method.cc@53@F@usage#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:6:8", + "definition": "1:6:8", "variable_type": 0, - "all_uses": ["*1:6:8", "*1:7:3"] + "all_uses": ["1:6:8", "1:7:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_template_func.cc b/tests/usage/func_usage_template_func.cc index df450459..8dae32fa 100644 --- a/tests/usage/func_usage_template_func.cc +++ b/tests/usage/func_usage_template_func.cc @@ -15,17 +15,17 @@ OUTPUT: "usr": "c:@FT@>1#Taccept#t0.0#v#", "short_name": "accept", "qualified_name": "accept", - "declaration": "*1:2:6", - "callers": ["1@*1:5:3", "1@*1:6:3"], - "all_uses": ["*1:2:6", "*1:5:3", "*1:6:3"] + "declaration": "1:2:6", + "callers": ["1@1:5:3", "1@1:6:3"], + "all_uses": ["1:2:6", "1:5:3", "1:6:3"] }, { "id": 1, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:4:6", - "callees": ["0@*1:5:3", "0@*1:6:3"], - "all_uses": ["*1:4:6"] + "definition": "1:4:6", + "callees": ["0@1:5:3", "0@1:6:3"], + "all_uses": ["1:4:6"] }], "variables": [] } diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc index 111489bb..31e1227c 100644 --- a/tests/usage/type_usage_as_template_parameter.cc +++ b/tests/usage/type_usage_as_template_parameter.cc @@ -16,49 +16,47 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@ST>1#T@unique_ptr", - "all_uses": ["*1:2:7", "*1:6:8", "*1:7:8", "*1:9:1", "*1:10:3"], - "interesting_uses": ["*1:6:8", "*1:7:8", "*1:9:1", "*1:10:3"] + "all_uses": ["1:2:7", "*1:6:8", "*1:7:8", "*1:9:1", "*1:10:3"] }, { "id": 1, "usr": "c:@S@S", "short_name": "S", "qualified_name": "S", - "definition": "*1:4:8", - "all_uses": ["*1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"], - "interesting_uses": ["*1:7:19", "*1:9:12", "*1:10:14"] + "definition": "1:4:8", + "all_uses": ["1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"] }], "functions": [{ "id": 0, "usr": "c:@F@return_type#", "short_name": "return_type", "qualified_name": "return_type", - "definition": "*1:9:16", - "all_uses": ["*1:9:16"] + "definition": "1:9:16", + "all_uses": ["1:9:16"] }], "variables": [{ "id": 0, "usr": "c:type_usage_as_template_parameter.cc@f0", "short_name": "f0", "qualified_name": "f0", - "definition": "*1:6:25", + "definition": "1:6:25", "variable_type": 0, - "all_uses": ["*1:6:25"] + "all_uses": ["1:6:25"] }, { "id": 1, "usr": "c:type_usage_as_template_parameter.cc@f1", "short_name": "f1", "qualified_name": "f1", - "definition": "*1:7:22", + "definition": "1:7:22", "variable_type": 0, - "all_uses": ["*1:7:22"] + "all_uses": ["1:7:22"] }, { "id": 2, "usr": "c:type_usage_as_template_parameter.cc@150@F@return_type#@local", "short_name": "local", "qualified_name": "local", - "definition": "*1:10:18", + "definition": "1:10:18", "variable_type": 0, - "all_uses": ["*1:10:18"] + "all_uses": ["1:10:18"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc index 2658264b..f1605cff 100644 --- a/tests/usage/type_usage_as_template_parameter_complex.cc +++ b/tests/usage/type_usage_as_template_parameter_complex.cc @@ -84,74 +84,71 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@ST>2#T#T@unique_ptr", - "all_uses": ["*1:2:7", "*1:15:8", "*1:15:19", "*1:33:1", "*1:33:12", "*1:33:52", "*1:54:3", "*1:54:14", "*1:65:3", "*1:79:1"], - "interesting_uses": ["*1:15:8", "*1:15:19", "*1:33:1", "*1:33:12", "*1:33:52", "*1:54:3", "*1:54:14", "*1:65:3", "*1:79:1"] + "all_uses": ["1:2:7", "*1:15:8", "*1:15:19", "*1:33:1", "*1:33:12", "*1:33:52", "*1:54:3", "*1:54:14", "*1:65:3", "*1:79:1"] }, { "id": 1, "usr": "c:@S@S1", - "all_uses": ["*1:4:8", "*1:15:30", "*1:33:23", "*1:33:63", "*1:54:25", "*1:65:14", "*1:79:12"], - "interesting_uses": ["*1:15:30", "*1:33:23", "*1:33:63", "*1:54:25", "*1:65:14", "*1:79:12"] + "all_uses": ["1:4:8", "*1:15:30", "*1:33:23", "*1:33:63", "*1:54:25", "*1:65:14", "*1:79:12"] }, { "id": 2, "usr": "c:@S@S2", - "all_uses": ["*1:5:8", "*1:15:34", "*1:15:39", "*1:33:27", "*1:33:32", "*1:33:67", "*1:54:29", "*1:54:34", "*1:65:18", "*1:79:16"], - "interesting_uses": ["*1:15:34", "*1:15:39", "*1:33:27", "*1:33:32", "*1:33:67", "*1:54:29", "*1:54:34", "*1:65:18", "*1:79:16"] + "all_uses": ["1:5:8", "*1:15:34", "*1:15:39", "*1:33:27", "*1:33:32", "*1:33:67", "*1:54:29", "*1:54:34", "*1:65:18", "*1:79:16"] }, { "id": 3, "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:64:7", + "definition": "1:64:7", "funcs": [3], - "all_uses": ["*1:64:7", "*1:79:21"] + "all_uses": ["1:64:7", "1:79:21"] }], "functions": [{ "id": 0, "usr": "c:@F@as_return_type#*$@S@unique_ptr>#$@S@S1#$@S@S2#", "short_name": "as_return_type", "qualified_name": "as_return_type", - "definition": "*1:33:37", - "all_uses": ["*1:33:37"] + "definition": "1:33:37", + "all_uses": ["1:33:37"] }, { "id": 1, "usr": "c:@F@no_return_type#I#", "short_name": "no_return_type", "qualified_name": "no_return_type", - "definition": "*1:40:6", - "all_uses": ["*1:40:6"] + "definition": "1:40:6", + "all_uses": ["1:40:6"] }, { "id": 2, "usr": "c:@F@empty#", "short_name": "empty", "qualified_name": "empty", - "definition": "*1:53:6", - "all_uses": ["*1:53:6"] + "definition": "1:53:6", + "all_uses": ["1:53:6"] }, { "id": 3, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", "qualified_name": "Foo::foo", - "declaration": "*1:65:23", - "definition": "*1:79:26", + "declaration": "1:65:23", + "definition": "1:79:26", "declaring_type": 3, - "all_uses": ["*1:65:23", "*1:79:26"] + "all_uses": ["1:65:23", "1:79:26"] }], "variables": [{ "id": 0, "usr": "c:@f", "short_name": "f", "qualified_name": "f", - "declaration": "*1:15:43", + "declaration": "1:15:43", "variable_type": 0, - "all_uses": ["*1:15:43"] + "all_uses": ["1:15:43"] }, { "id": 1, "usr": "c:type_usage_as_template_parameter_complex.cc@1062@F@empty#@local", "short_name": "local", "qualified_name": "local", - "definition": "*1:54:39", + "definition": "1:54:39", "variable_type": 0, - "all_uses": ["*1:54:39"] + "all_uses": ["1:54:39"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc index 0c6b8b89..54d47155 100644 --- a/tests/usage/type_usage_as_template_parameter_simple.cc +++ b/tests/usage/type_usage_as_template_parameter_simple.cc @@ -13,14 +13,12 @@ OUTPUT: "usr": "c:@ST>1#T@unique_ptr", "short_name": "unique_ptr", "qualified_name": "unique_ptr", - "definition": "*1:2:7", - "all_uses": ["*1:2:7", "*1:6:8"], - "interesting_uses": ["*1:6:8"] + "definition": "1:2:7", + "all_uses": ["1:2:7", "*1:6:8"] }, { "id": 1, "usr": "c:@S@S", - "all_uses": ["*1:4:8", "*1:6:19"], - "interesting_uses": ["*1:6:19"] + "all_uses": ["1:4:8", "*1:6:19"] }], "functions": [], "variables": [{ @@ -28,9 +26,9 @@ OUTPUT: "usr": "c:type_usage_as_template_parameter_simple.cc@foo", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:6:22", + "definition": "1:6:22", "variable_type": 0, - "all_uses": ["*1:6:22"] + "all_uses": ["1:6:22"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc index 057dbd89..e3de3450 100644 --- a/tests/usage/type_usage_declare_extern.cc +++ b/tests/usage/type_usage_declare_extern.cc @@ -9,9 +9,8 @@ OUTPUT: "usr": "c:@S@T", "short_name": "T", "qualified_name": "T", - "definition": "*1:1:8", - "all_uses": ["*1:1:8", "*1:3:8"], - "interesting_uses": ["*1:3:8"] + "definition": "1:1:8", + "all_uses": ["1:1:8", "*1:3:8"] }], "functions": [], "variables": [{ @@ -19,9 +18,9 @@ OUTPUT: "usr": "c:@t", "short_name": "t", "qualified_name": "t", - "declaration": "*1:3:10", + "declaration": "1:3:10", "variable_type": 0, - "all_uses": ["*1:3:10"] + "all_uses": ["1:3:10"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc index 94d937a5..f8390879 100644 --- a/tests/usage/type_usage_declare_field.cc +++ b/tests/usage/type_usage_declare_field.cc @@ -12,24 +12,22 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["*1:1:8", "*1:5:3"], - "interesting_uses": ["*1:5:3"] + "all_uses": ["1:1:8", "*1:5:3"] }, { "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", "qualified_name": "ImplementedType", - "definition": "*1:2:8", - "all_uses": ["*1:2:8", "*1:6:3"], - "interesting_uses": ["*1:6:3"] + "definition": "1:2:8", + "all_uses": ["1:2:8", "*1:6:3"] }, { "id": 2, "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:4:8", + "definition": "1:4:8", "vars": [0, 1], - "all_uses": ["*1:4:8"] + "all_uses": ["1:4:8"] }], "functions": [], "variables": [{ @@ -37,19 +35,19 @@ OUTPUT: "usr": "c:@S@Foo@FI@a", "short_name": "a", "qualified_name": "Foo::a", - "definition": "*1:5:16", + "definition": "1:5:16", "variable_type": 0, "declaring_type": 2, - "all_uses": ["*1:5:16"] + "all_uses": ["1:5:16"] }, { "id": 1, "usr": "c:@S@Foo@FI@b", "short_name": "b", "qualified_name": "Foo::b", - "definition": "*1:6:19", + "definition": "1:6:19", "variable_type": 1, "declaring_type": 2, - "all_uses": ["*1:6:19"] + "all_uses": ["1:6:19"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc index fd675709..74afbfa8 100644 --- a/tests/usage/type_usage_declare_local.cc +++ b/tests/usage/type_usage_declare_local.cc @@ -12,41 +12,39 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["*1:1:8", "*1:5:3"], - "interesting_uses": ["*1:5:3"] + "all_uses": ["1:1:8", "*1:5:3"] }, { "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", "qualified_name": "ImplementedType", - "definition": "*1:2:8", - "all_uses": ["*1:2:8", "*1:6:3"], - "interesting_uses": ["*1:6:3"] + "definition": "1:2:8", + "all_uses": ["1:2:8", "*1:6:3"] }], "functions": [{ "id": 0, "usr": "c:@F@Foo#", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:4:6", - "all_uses": ["*1:4:6"] + "definition": "1:4:6", + "all_uses": ["1:4:6"] }], "variables": [{ "id": 0, "usr": "c:type_usage_declare_local.cc@67@F@Foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:5:16", + "definition": "1:5:16", "variable_type": 0, - "all_uses": ["*1:5:16"] + "all_uses": ["1:5:16"] }, { "id": 1, "usr": "c:type_usage_declare_local.cc@86@F@Foo#@b", "short_name": "b", "qualified_name": "b", - "definition": "*1:6:19", + "definition": "1:6:19", "variable_type": 1, - "all_uses": ["*1:6:19"] + "all_uses": ["1:6:19"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc index 657c410f..f9269cad 100644 --- a/tests/usage/type_usage_declare_param.cc +++ b/tests/usage/type_usage_declare_param.cc @@ -9,41 +9,39 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["*1:1:8", "*1:4:10"], - "interesting_uses": ["*1:4:10"] + "all_uses": ["1:1:8", "*1:4:10"] }, { "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", "qualified_name": "ImplementedType", - "definition": "*1:2:8", - "all_uses": ["*1:2:8", "*1:4:26"], - "interesting_uses": ["*1:4:26"] + "definition": "1:2:8", + "all_uses": ["1:2:8", "*1:4:26"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:4:6", - "all_uses": ["*1:4:6"] + "definition": "1:4:6", + "all_uses": ["1:4:6"] }], "variables": [{ "id": 0, "usr": "c:type_usage_declare_param.cc@60@F@foo#*$@S@ForwardType#$@S@ImplementedType#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:4:23", + "definition": "1:4:23", "variable_type": 0, - "all_uses": ["*1:4:23"] + "all_uses": ["1:4:23"] }, { "id": 1, "usr": "c:type_usage_declare_param.cc@76@F@foo#*$@S@ForwardType#$@S@ImplementedType#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:4:42", + "definition": "1:4:42", "variable_type": 1, - "all_uses": ["*1:4:42"] + "all_uses": ["1:4:42"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc index 998110cc..5a68e4f6 100644 --- a/tests/usage/type_usage_declare_param_prototype.cc +++ b/tests/usage/type_usage_declare_param_prototype.cc @@ -14,26 +14,25 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["*1:1:8", "*1:3:10", "*1:3:18", "*1:4:10", "*1:4:18"], - "interesting_uses": ["*1:4:10", "*1:4:18"] + "all_uses": ["1:1:8", "1:3:10", "1:3:18", "*1:4:10", "*1:4:18"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:3:6", - "definition": "*1:4:6", - "all_uses": ["*1:3:6", "*1:4:6"] + "declaration": "1:3:6", + "definition": "1:4:6", + "all_uses": ["1:3:6", "1:4:6"] }], "variables": [{ "id": 0, "usr": "c:type_usage_declare_param_prototype.cc@49@F@foo#*$@S@Foo#S0_#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:4:15", + "definition": "1:4:15", "variable_type": 0, - "all_uses": ["*1:4:15"] + "all_uses": ["1:4:15"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc index 8b19230a..e70bbb93 100644 --- a/tests/usage/type_usage_declare_param_unnamed.cc +++ b/tests/usage/type_usage_declare_param_unnamed.cc @@ -6,16 +6,15 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["*1:1:8", "*1:2:10"], - "interesting_uses": ["*1:2:10"] + "all_uses": ["1:1:8", "*1:2:10"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#*$@S@ForwardType#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:2:6", - "all_uses": ["*1:2:6"] + "definition": "1:2:6", + "all_uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc index 1081b7f4..e14d2ab8 100644 --- a/tests/usage/type_usage_declare_qualifiers.cc +++ b/tests/usage/type_usage_declare_qualifiers.cc @@ -14,66 +14,65 @@ OUTPUT: "usr": "c:@S@Type", "short_name": "Type", "qualified_name": "Type", - "definition": "*1:1:8", - "all_uses": ["*1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"], - "interesting_uses": ["*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"] + "definition": "1:1:8", + "all_uses": ["1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#&$@S@Type#&1S1_#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:3:6", - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "all_uses": ["1:3:6"] }], "variables": [{ "id": 0, "usr": "c:type_usage_declare_qualifiers.cc@28@F@foo#&$@S@Type#&1S1_#@a0", "short_name": "a0", "qualified_name": "a0", - "definition": "*1:3:16", + "definition": "1:3:16", "variable_type": 0, - "all_uses": ["*1:3:16"] + "all_uses": ["1:3:16"] }, { "id": 1, "usr": "c:type_usage_declare_qualifiers.cc@38@F@foo#&$@S@Type#&1S1_#@a1", "short_name": "a1", "qualified_name": "a1", - "definition": "*1:3:32", + "definition": "1:3:32", "variable_type": 0, - "all_uses": ["*1:3:32"] + "all_uses": ["1:3:32"] }, { "id": 2, "usr": "c:type_usage_declare_qualifiers.cc@59@F@foo#&$@S@Type#&1S1_#@a2", "short_name": "a2", "qualified_name": "a2", - "definition": "*1:4:8", + "definition": "1:4:8", "variable_type": 0, - "all_uses": ["*1:4:8"] + "all_uses": ["1:4:8"] }, { "id": 3, "usr": "c:type_usage_declare_qualifiers.cc@71@F@foo#&$@S@Type#&1S1_#@a3", "short_name": "a3", "qualified_name": "a3", - "definition": "*1:5:9", + "definition": "1:5:9", "variable_type": 0, - "all_uses": ["*1:5:9"] + "all_uses": ["1:5:9"] }, { "id": 4, "usr": "c:type_usage_declare_qualifiers.cc@84@F@foo#&$@S@Type#&1S1_#@a4", "short_name": "a4", "qualified_name": "a4", - "definition": "*1:6:15", + "definition": "1:6:15", "variable_type": 0, - "all_uses": ["*1:6:15"] + "all_uses": ["1:6:15"] }, { "id": 5, "usr": "c:type_usage_declare_qualifiers.cc@103@F@foo#&$@S@Type#&1S1_#@a5", "short_name": "a5", "qualified_name": "a5", - "definition": "*1:7:21", + "definition": "1:7:21", "variable_type": 0, - "all_uses": ["*1:7:21"] + "all_uses": ["1:7:21"] }] } diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc index b2050d14..04ac05e3 100644 --- a/tests/usage/type_usage_declare_static.cc +++ b/tests/usage/type_usage_declare_static.cc @@ -6,8 +6,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Type", - "all_uses": ["*1:1:8", "*1:2:8"], - "interesting_uses": ["*1:2:8"] + "all_uses": ["1:1:8", "*1:2:8"] }], "functions": [], "variables": [{ @@ -15,9 +14,9 @@ OUTPUT: "usr": "c:type_usage_declare_static.cc@t", "short_name": "t", "qualified_name": "t", - "definition": "*1:2:13", + "definition": "1:2:13", "variable_type": 0, - "all_uses": ["*1:2:13"] + "all_uses": ["1:2:13"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc index 743eb1ba..e0517945 100644 --- a/tests/usage/type_usage_on_return_type.cc +++ b/tests/usage/type_usage_on_return_type.cc @@ -23,58 +23,57 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Type", - "all_uses": ["*1:1:8", "*1:3:1", "*1:4:1", "*1:5:1", "*1:8:3", "*1:12:1", "*1:15:14", "*1:17:8", "*1:18:8"], - "interesting_uses": ["*1:3:1", "*1:4:1", "*1:5:1", "*1:8:3", "*1:12:1", "*1:15:14", "*1:17:8", "*1:18:8"] + "all_uses": ["1:1:8", "*1:3:1", "*1:4:1", "*1:5:1", "*1:8:3", "*1:12:1", "*1:15:14", "*1:17:8", "*1:18:8"] }, { "id": 1, "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:7:7", + "definition": "1:7:7", "funcs": [1, 2], - "all_uses": ["*1:7:7", "*1:12:7", "*1:13:6"] + "all_uses": ["1:7:7", "1:12:7", "1:13:6"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:4:7", - "definition": "*1:5:7", - "all_uses": ["*1:3:7", "*1:4:7", "*1:5:7"] + "declaration": "1:4:7", + "definition": "1:5:7", + "all_uses": ["1:3:7", "1:4:7", "1:5:7"] }, { "id": 1, "usr": "c:@S@Foo@F@Get#I#", "short_name": "Get", "qualified_name": "Foo::Get", - "declaration": "*1:8:9", - "definition": "*1:12:12", + "declaration": "1:8:9", + "definition": "1:12:12", "declaring_type": 1, - "all_uses": ["*1:8:9", "*1:12:12"] + "all_uses": ["1:8:9", "1:12:12"] }, { "id": 2, "usr": "c:@S@Foo@F@Empty#", "short_name": "Empty", "qualified_name": "Foo::Empty", - "declaration": "*1:9:8", - "definition": "*1:13:11", + "declaration": "1:9:8", + "definition": "1:13:11", "declaring_type": 1, - "all_uses": ["*1:9:8", "*1:13:11"] + "all_uses": ["1:9:8", "1:13:11"] }, { "id": 3, "usr": "c:@F@external#", "short_name": "external", "qualified_name": "external", - "declaration": "*1:15:20", - "all_uses": ["*1:15:20"] + "declaration": "1:15:20", + "all_uses": ["1:15:20"] }, { "id": 4, "usr": "c:type_usage_on_return_type.cc@F@bar#", "short_name": "bar", "qualified_name": "bar", - "declaration": "*1:17:14", - "definition": "*1:18:14", - "all_uses": ["*1:17:14", "*1:18:14"] + "declaration": "1:17:14", + "definition": "1:18:14", + "all_uses": ["1:17:14", "1:18:14"] }], "variables": [] } diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc index ae2a1bcd..f287b852 100644 --- a/tests/usage/type_usage_typedef_and_using.cc +++ b/tests/usage/type_usage_typedef_and_using.cc @@ -20,71 +20,67 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["*1:1:8", "*1:2:14", "*1:3:9", "*1:7:13"], - "interesting_uses": ["*1:2:14", "*1:3:9", "*1:7:13"] + "all_uses": ["1:1:8", "*1:2:14", "*1:3:9", "*1:7:13"] }, { "id": 1, "usr": "c:@Foo1", "short_name": "Foo1", "qualified_name": "Foo1", - "definition": "*1:2:7", + "definition": "1:2:7", "alias_of": 0, - "all_uses": ["*1:2:7", "*1:4:14", "*1:8:14"], - "interesting_uses": ["*1:4:14", "*1:8:14"] + "all_uses": ["1:2:7", "*1:4:14", "*1:8:14"] }, { "id": 2, "usr": "c:type_usage_typedef_and_using.cc@T@Foo2", "short_name": "Foo2", "qualified_name": "Foo2", - "definition": "*1:3:13", + "definition": "1:3:13", "alias_of": 0, - "all_uses": ["*1:3:13", "*1:9:14"], - "interesting_uses": ["*1:9:14"] + "all_uses": ["1:3:13", "*1:9:14"] }, { "id": 3, "usr": "c:@Foo3", "short_name": "Foo3", "qualified_name": "Foo3", - "definition": "*1:4:7", + "definition": "1:4:7", "alias_of": 1, - "all_uses": ["*1:4:7", "*1:10:14"], - "interesting_uses": ["*1:10:14"] + "all_uses": ["1:4:7", "*1:10:14"] }, { "id": 4, "usr": "c:@Foo4", "short_name": "Foo4", "qualified_name": "Foo4", - "definition": "*1:5:7", - "all_uses": ["*1:5:7"] + "definition": "1:5:7", + "all_uses": ["1:5:7"] }], "functions": [{ "id": 0, "usr": "c:@F@accept#*$@S@Foo#", "short_name": "accept", "qualified_name": "accept", - "definition": "*1:7:6", - "all_uses": ["*1:7:6"] + "definition": "1:7:6", + "all_uses": ["1:7:6"] }, { "id": 1, "usr": "c:@F@accept1#**$@S@Foo#", "short_name": "accept1", "qualified_name": "accept1", - "definition": "*1:8:6", - "all_uses": ["*1:8:6"] + "definition": "1:8:6", + "all_uses": ["1:8:6"] }, { "id": 2, "usr": "c:@F@accept2#*$@S@Foo#", "short_name": "accept2", "qualified_name": "accept2", - "definition": "*1:9:6", - "all_uses": ["*1:9:6"] + "definition": "1:9:6", + "all_uses": ["1:9:6"] }, { "id": 3, "usr": "c:@F@accept3#**$@S@Foo#", "short_name": "accept3", "qualified_name": "accept3", - "definition": "*1:10:6", - "all_uses": ["*1:10:6"] + "definition": "1:10:6", + "all_uses": ["1:10:6"] }], "variables": [] } diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc index fa56a2bd..31c27107 100644 --- a/tests/usage/type_usage_typedef_and_using_template.cc +++ b/tests/usage/type_usage_typedef_and_using_template.cc @@ -10,25 +10,23 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", - "all_uses": ["*1:2:8", "*1:4:14", "*1:5:9"], - "interesting_uses": ["*1:4:14", "*1:5:9"] + "all_uses": ["1:2:8", "*1:4:14", "*1:5:9"] }, { "id": 1, "usr": "c:@Foo1", "short_name": "Foo1", "qualified_name": "Foo1", - "definition": "*1:4:7", + "definition": "1:4:7", "alias_of": 0, - "all_uses": ["*1:4:7", "*1:5:13"], - "interesting_uses": ["*1:5:13"] + "all_uses": ["1:4:7", "*1:5:13"] }, { "id": 2, "usr": "c:type_usage_typedef_and_using_template.cc@T@Foo2", "short_name": "Foo2", "qualified_name": "Foo2", - "definition": "*1:5:19", + "definition": "1:5:19", "alias_of": 0, - "all_uses": ["*1:5:19"] + "all_uses": ["1:5:19"] }], "functions": [], "variables": [] diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc index 5e0f54ce..853c1569 100644 --- a/tests/usage/type_usage_various.cc +++ b/tests/usage/type_usage_various.cc @@ -17,37 +17,36 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "funcs": [0], - "all_uses": ["*1:1:7", "*1:2:3", "*1:5:1", "*1:5:6", "*1:6:3", "*1:10:8"], - "interesting_uses": ["*1:2:3", "*1:5:1", "*1:6:3", "*1:10:8"] + "all_uses": ["1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"] }], "functions": [{ "id": 0, "usr": "c:@S@Foo@F@make#", "short_name": "make", "qualified_name": "Foo::make", - "declaration": "*1:2:8", - "definition": "*1:5:11", + "declaration": "1:2:8", + "definition": "1:5:11", "declaring_type": 0, - "all_uses": ["*1:2:8", "*1:5:11"] + "all_uses": ["1:2:8", "1:5:11"] }], "variables": [{ "id": 0, "usr": "c:type_usage_various.cc@58@S@Foo@F@make#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:6:7", + "definition": "1:6:7", "variable_type": 0, - "all_uses": ["*1:6:7"] + "all_uses": ["1:6:7"] }, { "id": 1, "usr": "c:@foo", "short_name": "foo", "qualified_name": "foo", - "declaration": "*1:10:12", + "declaration": "1:10:12", "variable_type": 0, - "all_uses": ["*1:10:12"] + "all_uses": ["1:10:12"] }] } */ \ No newline at end of file diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc index 877dc96a..f68f444c 100644 --- a/tests/usage/usage_inside_of_call.cc +++ b/tests/usage/usage_inside_of_call.cc @@ -22,59 +22,59 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:5:8", + "definition": "1:5:8", "vars": [1, 0], - "all_uses": ["*1:5:8", "*1:10:5", "*1:14:22", "*1:14:40"] + "all_uses": ["1:5:8", "1:10:5", "1:14:22", "1:14:40"] }], "functions": [{ "id": 0, "usr": "c:@F@called#I#", "short_name": "called", "qualified_name": "called", - "declaration": "*1:1:6", - "callers": ["2@*1:14:3"], - "all_uses": ["*1:1:6", "*1:14:3"] + "declaration": "1:1:6", + "callers": ["2@1:14:3"], + "all_uses": ["1:1:6", "1:14:3"] }, { "id": 1, "usr": "c:@F@gen#", "short_name": "gen", "qualified_name": "gen", - "declaration": "*1:3:5", - "callers": ["2@*1:14:14"], - "all_uses": ["*1:3:5", "*1:14:14"] + "declaration": "1:3:5", + "callers": ["2@1:14:14"], + "all_uses": ["1:3:5", "1:14:14"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:12:6", - "callees": ["0@*1:14:3", "1@*1:14:14"], - "all_uses": ["*1:12:6"] + "definition": "1:12:6", + "callees": ["0@1:14:3", "1@1:14:14"], + "all_uses": ["1:12:6"] }], "variables": [{ "id": 0, "usr": "c:@S@Foo@static_var", "short_name": "static_var", "qualified_name": "Foo::static_var", - "declaration": "*1:6:14", - "definition": "*1:10:10", + "declaration": "1:6:14", + "definition": "1:10:10", "declaring_type": 0, - "all_uses": ["*1:6:14", "*1:10:10", "*1:14:45"] + "all_uses": ["1:6:14", "1:10:10", "1:14:45"] }, { "id": 1, "usr": "c:@S@Foo@FI@field_var", "short_name": "field_var", "qualified_name": "Foo::field_var", - "definition": "*1:7:7", + "definition": "1:7:7", "declaring_type": 0, - "all_uses": ["*1:7:7", "*1:14:28"] + "all_uses": ["1:7:7", "1:14:28"] }, { "id": 2, "usr": "c:usage_inside_of_call.cc@145@F@foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:13:7", - "all_uses": ["*1:13:7", "*1:14:10"] + "definition": "1:13:7", + "all_uses": ["1:13:7", "1:14:10"] }] } */ \ No newline at end of file diff --git a/tests/usage/usage_inside_of_call_simple.cc b/tests/usage/usage_inside_of_call_simple.cc index d6d497b4..83f1a97f 100644 --- a/tests/usage/usage_inside_of_call_simple.cc +++ b/tests/usage/usage_inside_of_call_simple.cc @@ -15,25 +15,25 @@ OUTPUT: "usr": "c:@F@called#I#", "short_name": "called", "qualified_name": "called", - "declaration": "*1:1:6", - "callers": ["2@*1:6:3"], - "all_uses": ["*1:1:6", "*1:6:3"] + "declaration": "1:1:6", + "callers": ["2@1:6:3"], + "all_uses": ["1:1:6", "1:6:3"] }, { "id": 1, "usr": "c:@F@gen#", "short_name": "gen", "qualified_name": "gen", - "definition": "*1:3:5", - "callers": ["2@*1:6:10", "2@*1:6:18"], - "all_uses": ["*1:3:5", "*1:6:10", "*1:6:18"] + "definition": "1:3:5", + "callers": ["2@1:6:10", "2@1:6:18"], + "all_uses": ["1:3:5", "1:6:10", "1:6:18"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:5:6", - "callees": ["0@*1:6:3", "1@*1:6:10", "1@*1:6:18"], - "all_uses": ["*1:5:6"] + "definition": "1:5:6", + "callees": ["0@1:6:3", "1@1:6:10", "1@1:6:18"], + "all_uses": ["1:5:6"] }], "variables": [] } diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc index 746122ac..d1603b70 100644 --- a/tests/usage/var_usage_call_function.cc +++ b/tests/usage/var_usage_call_function.cc @@ -16,25 +16,25 @@ OUTPUT: "usr": "c:@F@called#", "short_name": "called", "qualified_name": "called", - "definition": "*1:1:6", - "callers": ["1@*1:4:13", "1@*1:7:3"], - "all_uses": ["*1:1:6", "*1:4:13", "*1:7:3"] + "definition": "1:1:6", + "callers": ["1@1:4:13", "1@1:7:3"], + "all_uses": ["1:1:6", "1:4:13", "1:7:3"] }, { "id": 1, "usr": "c:@F@caller#", "short_name": "caller", "qualified_name": "caller", - "definition": "*1:3:6", - "callees": ["0@*1:4:13", "0@*1:7:3"], - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "callees": ["0@1:4:13", "0@1:7:3"], + "all_uses": ["1:3:6"] }], "variables": [{ "id": 0, "usr": "c:var_usage_call_function.cc@39@F@caller#@x", "short_name": "x", "qualified_name": "x", - "definition": "*1:4:8", - "all_uses": ["*1:4:8", "*1:5:3"] + "definition": "1:4:8", + "all_uses": ["1:4:8", "1:5:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc index bf6afe5d..d88f0cff 100644 --- a/tests/usage/var_usage_class_member.cc +++ b/tests/usage/var_usage_class_member.cc @@ -25,60 +25,59 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "vars": [0, 1], - "all_uses": ["*1:1:7", "*1:11:3"], - "interesting_uses": ["*1:11:3"] + "all_uses": ["1:1:7", "*1:11:3"] }], "functions": [{ "id": 0, "usr": "c:@F@accept#I#", "short_name": "accept", "qualified_name": "accept", - "declaration": "*1:7:6", - "callers": ["2@*1:14:3", "2@*1:15:3", "2@*1:17:3"], - "all_uses": ["*1:7:6", "*1:14:3", "*1:15:3", "*1:17:3"] + "declaration": "1:7:6", + "callers": ["2@1:14:3", "2@1:15:3", "2@1:17:3"], + "all_uses": ["1:7:6", "1:14:3", "1:15:3", "1:17:3"] }, { "id": 1, "usr": "c:@F@accept#*I#", "short_name": "accept", "qualified_name": "accept", - "declaration": "*1:8:6", - "callers": ["2@*1:16:3"], - "all_uses": ["*1:8:6", "*1:16:3"] + "declaration": "1:8:6", + "callers": ["2@1:16:3"], + "all_uses": ["1:8:6", "1:16:3"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:10:6", - "callees": ["0@*1:14:3", "0@*1:15:3", "1@*1:16:3", "0@*1:17:3"], - "all_uses": ["*1:10:6"] + "definition": "1:10:6", + "callees": ["0@1:14:3", "0@1:15:3", "1@1:16:3", "0@1:17:3"], + "all_uses": ["1:10:6"] }], "variables": [{ "id": 0, "usr": "c:@S@Foo@FI@x", "short_name": "x", "qualified_name": "Foo::x", - "definition": "*1:3:7", + "definition": "1:3:7", "declaring_type": 0, - "all_uses": ["*1:3:7", "*1:12:5", "*1:13:5", "*1:14:12", "*1:15:12", "*1:16:13"] + "all_uses": ["1:3:7", "1:12:5", "1:13:5", "1:14:12", "1:15:12", "1:16:13"] }, { "id": 1, "usr": "c:@S@Foo@FI@y", "short_name": "y", "qualified_name": "Foo::y", - "definition": "*1:4:7", + "definition": "1:4:7", "declaring_type": 0, - "all_uses": ["*1:4:7", "*1:17:12"] + "all_uses": ["1:4:7", "1:17:12"] }, { "id": 2, "usr": "c:var_usage_class_member.cc@105@F@foo#@f", "short_name": "f", "qualified_name": "f", - "definition": "*1:11:7", + "definition": "1:11:7", "variable_type": 0, - "all_uses": ["*1:11:7", "*1:12:3", "*1:13:3", "*1:14:10", "*1:15:10", "*1:16:11", "*1:17:10"] + "all_uses": ["1:11:7", "1:12:3", "1:13:3", "1:14:10", "1:15:10", "1:16:11", "1:17:10"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc index a40a6e4e..7b81a359 100644 --- a/tests/usage/var_usage_class_member_static.cc +++ b/tests/usage/var_usage_class_member_static.cc @@ -16,33 +16,33 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:8", - "all_uses": ["*1:1:8", "*1:8:10"] + "definition": "1:1:8", + "all_uses": ["1:1:8", "1:8:10"] }], "functions": [{ "id": 0, "usr": "c:@F@accept#I#", "short_name": "accept", "qualified_name": "accept", - "declaration": "*1:5:6", - "callers": ["1@*1:8:3"], - "all_uses": ["*1:5:6", "*1:8:3"] + "declaration": "1:5:6", + "callers": ["1@1:8:3"], + "all_uses": ["1:5:6", "1:8:3"] }, { "id": 1, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:7:6", - "callees": ["0@*1:8:3"], - "all_uses": ["*1:7:6"] + "definition": "1:7:6", + "callees": ["0@1:8:3"], + "all_uses": ["1:7:6"] }], "variables": [{ "id": 0, "usr": "c:@S@Foo@x", "short_name": "x", "qualified_name": "Foo::x", - "declaration": "*1:2:14", - "all_uses": ["*1:2:14", "*1:8:15"] + "declaration": "1:2:14", + "all_uses": ["1:2:14", "1:8:15"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc index 86fc7ad0..c24e6fc6 100644 --- a/tests/usage/var_usage_extern.cc +++ b/tests/usage/var_usage_extern.cc @@ -12,16 +12,16 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:3:6", - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "all_uses": ["1:3:6"] }], "variables": [{ "id": 0, "usr": "c:@a", "short_name": "a", "qualified_name": "a", - "declaration": "*1:1:12", - "all_uses": ["*1:1:12", "*1:4:3"] + "declaration": "1:1:12", + "all_uses": ["1:1:12", "1:4:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc index e2b0cf55..b0b00659 100644 --- a/tests/usage/var_usage_func_parameter.cc +++ b/tests/usage/var_usage_func_parameter.cc @@ -10,16 +10,16 @@ OUTPUT: "usr": "c:@F@foo#I#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [{ "id": 0, "usr": "c:var_usage_func_parameter.cc@9@F@foo#I#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:1:14", - "all_uses": ["*1:1:14", "*1:2:3"] + "definition": "1:1:14", + "all_uses": ["1:1:14", "1:2:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc index 5e20528a..1807dcb5 100644 --- a/tests/usage/var_usage_local.cc +++ b/tests/usage/var_usage_local.cc @@ -11,16 +11,16 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [{ "id": 0, "usr": "c:var_usage_local.cc@16@F@foo#@x", "short_name": "x", "qualified_name": "x", - "definition": "*1:2:7", - "all_uses": ["*1:2:7", "*1:3:3"] + "definition": "1:2:7", + "all_uses": ["1:2:7", "1:3:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc index 2ec5c35e..4796699b 100644 --- a/tests/usage/var_usage_shadowed_local.cc +++ b/tests/usage/var_usage_shadowed_local.cc @@ -16,23 +16,23 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [{ "id": 0, "usr": "c:var_usage_shadowed_local.cc@16@F@foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:2:7", - "all_uses": ["*1:2:7", "*1:3:3", "*1:8:3"] + "definition": "1:2:7", + "all_uses": ["1:2:7", "1:3:3", "1:8:3"] }, { "id": 1, "usr": "c:var_usage_shadowed_local.cc@43@F@foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:5:9", - "all_uses": ["*1:5:9", "*1:6:5"] + "definition": "1:5:9", + "all_uses": ["1:5:9", "1:6:5"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc index 163a57de..8f027e54 100644 --- a/tests/usage/var_usage_shadowed_parameter.cc +++ b/tests/usage/var_usage_shadowed_parameter.cc @@ -16,23 +16,23 @@ OUTPUT: "usr": "c:@F@foo#I#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [{ "id": 0, "usr": "c:var_usage_shadowed_parameter.cc@9@F@foo#I#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:1:14", - "all_uses": ["*1:1:14", "*1:2:3", "*1:7:3"] + "definition": "1:1:14", + "all_uses": ["1:1:14", "1:2:3", "1:7:3"] }, { "id": 1, "usr": "c:var_usage_shadowed_parameter.cc@38@F@foo#I#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:4:9", - "all_uses": ["*1:4:9", "*1:5:5"] + "definition": "1:4:9", + "all_uses": ["1:4:9", "1:5:5"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc index e5045bf7..2552248a 100644 --- a/tests/usage/var_usage_static.cc +++ b/tests/usage/var_usage_static.cc @@ -13,16 +13,16 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:3:6", - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "all_uses": ["1:3:6"] }], "variables": [{ "id": 0, "usr": "c:var_usage_static.cc@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:1:12", - "all_uses": ["*1:1:12", "*1:4:3"] + "definition": "1:1:12", + "all_uses": ["1:1:12", "1:4:3"] }] } */ \ No newline at end of file diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc index fb0e13fd..63f2abf2 100644 --- a/tests/vars/class_member.cc +++ b/tests/vars/class_member.cc @@ -9,10 +9,9 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "vars": [0], - "all_uses": ["*1:1:7", "*1:2:3"], - "interesting_uses": ["*1:2:3"] + "all_uses": ["1:1:7", "*1:2:3"] }], "functions": [], "variables": [{ @@ -20,10 +19,10 @@ OUTPUT: "usr": "c:@S@Foo@FI@member", "short_name": "member", "qualified_name": "Foo::member", - "definition": "*1:2:8", + "definition": "1:2:8", "variable_type": 0, "declaring_type": 0, - "all_uses": ["*1:2:8"] + "all_uses": ["1:2:8"] }] } */ \ No newline at end of file diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc index 6a54f9e1..a7a3df8a 100644 --- a/tests/vars/class_static_member.cc +++ b/tests/vars/class_static_member.cc @@ -11,10 +11,9 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", + "definition": "1:1:7", "vars": [0], - "all_uses": ["*1:1:7", "*1:2:10", "*1:4:1", "*1:4:6"], - "interesting_uses": ["*1:2:10", "*1:4:1"] + "all_uses": ["1:1:7", "*1:2:10", "*1:4:1", "1:4:6"] }], "functions": [], "variables": [{ @@ -22,11 +21,11 @@ OUTPUT: "usr": "c:@S@Foo@member", "short_name": "member", "qualified_name": "Foo::member", - "declaration": "*1:2:15", - "definition": "*1:4:11", + "declaration": "1:2:15", + "definition": "1:4:11", "variable_type": 0, "declaring_type": 0, - "all_uses": ["*1:2:15", "*1:4:11"] + "all_uses": ["1:2:15", "1:4:11"] }] } */ \ No newline at end of file diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc index a7697b5c..f582277d 100644 --- a/tests/vars/class_static_member_decl_only.cc +++ b/tests/vars/class_static_member_decl_only.cc @@ -9,8 +9,8 @@ OUTPUT: "usr": "c:@S@Foo", "short_name": "Foo", "qualified_name": "Foo", - "definition": "*1:1:7", - "all_uses": ["*1:1:7"] + "definition": "1:1:7", + "all_uses": ["1:1:7"] }], "functions": [], "variables": [{ @@ -18,8 +18,8 @@ OUTPUT: "usr": "c:@S@Foo@member", "short_name": "member", "qualified_name": "Foo::member", - "declaration": "*1:2:14", - "all_uses": ["*1:2:14"] + "declaration": "1:2:14", + "all_uses": ["1:2:14"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc index fb3b9d9c..4585be48 100644 --- a/tests/vars/function_local.cc +++ b/tests/vars/function_local.cc @@ -10,25 +10,24 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["*1:1:8", "*1:4:3"], - "interesting_uses": ["*1:4:3"] + "all_uses": ["1:1:8", "*1:4:3"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:3:6", - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "all_uses": ["1:3:6"] }], "variables": [{ "id": 0, "usr": "c:function_local.cc@31@F@foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:4:8", + "definition": "1:4:8", "variable_type": 0, - "all_uses": ["*1:4:8"] + "all_uses": ["1:4:8"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc index 077c568d..8f08dbc9 100644 --- a/tests/vars/function_param.cc +++ b/tests/vars/function_param.cc @@ -8,33 +8,32 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["*1:1:8", "*1:3:10", "*1:3:19"], - "interesting_uses": ["*1:3:10", "*1:3:19"] + "all_uses": ["1:1:8", "*1:3:10", "*1:3:19"] }], "functions": [{ "id": 0, "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:3:6", - "all_uses": ["*1:3:6"] + "definition": "1:3:6", + "all_uses": ["1:3:6"] }], "variables": [{ "id": 0, "usr": "c:function_param.cc@24@F@foo#*$@S@Foo#S0_#@p0", "short_name": "p0", "qualified_name": "p0", - "definition": "*1:3:15", + "definition": "1:3:15", "variable_type": 0, - "all_uses": ["*1:3:15"] + "all_uses": ["1:3:15"] }, { "id": 1, "usr": "c:function_param.cc@33@F@foo#*$@S@Foo#S0_#@p1", "short_name": "p1", "qualified_name": "p1", - "definition": "*1:3:24", + "definition": "1:3:24", "variable_type": 0, - "all_uses": ["*1:3:24"] + "all_uses": ["1:3:24"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_param_unnamed.cc b/tests/vars/function_param_unnamed.cc index 213def7b..495e8ca1 100644 --- a/tests/vars/function_param_unnamed.cc +++ b/tests/vars/function_param_unnamed.cc @@ -8,8 +8,8 @@ OUTPUT: "usr": "c:@F@foo#I#I#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [] } diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc index 6893adbb..264704c5 100644 --- a/tests/vars/function_shadow_local.cc +++ b/tests/vars/function_shadow_local.cc @@ -16,23 +16,23 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [{ "id": 0, "usr": "c:function_shadow_local.cc@16@F@foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:2:7", - "all_uses": ["*1:2:7", "*1:3:3", "*1:8:3"] + "definition": "1:2:7", + "all_uses": ["1:2:7", "1:3:3", "1:8:3"] }, { "id": 1, "usr": "c:function_shadow_local.cc@43@F@foo#@a", "short_name": "a", "qualified_name": "a", - "definition": "*1:5:9", - "all_uses": ["*1:5:9", "*1:6:5"] + "definition": "1:5:9", + "all_uses": ["1:5:9", "1:6:5"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc index 25e7cf0d..e90b54d5 100644 --- a/tests/vars/function_shadow_param.cc +++ b/tests/vars/function_shadow_param.cc @@ -10,23 +10,23 @@ OUTPUT: "usr": "c:@F@foo#I#", "short_name": "foo", "qualified_name": "foo", - "definition": "*1:1:6", - "all_uses": ["*1:1:6"] + "definition": "1:1:6", + "all_uses": ["1:1:6"] }], "variables": [{ "id": 0, "usr": "c:function_shadow_param.cc@9@F@foo#I#@p", "short_name": "p", "qualified_name": "p", - "definition": "*1:1:14", - "all_uses": ["*1:1:14"] + "definition": "1:1:14", + "all_uses": ["1:1:14"] }, { "id": 1, "usr": "c:function_shadow_param.cc@21@F@foo#I#@p", "short_name": "p", "qualified_name": "p", - "definition": "*1:2:7", - "all_uses": ["*1:2:7"] + "definition": "1:2:7", + "all_uses": ["1:2:7"] }] } */ \ No newline at end of file diff --git a/tests/vars/global_variable.cc b/tests/vars/global_variable.cc index cf262b50..404f5abf 100644 --- a/tests/vars/global_variable.cc +++ b/tests/vars/global_variable.cc @@ -9,8 +9,8 @@ OUTPUT: "usr": "c:global_variable.cc@global", "short_name": "global", "qualified_name": "global", - "definition": "*1:1:12", - "all_uses": ["*1:1:12"] + "definition": "1:1:12", + "all_uses": ["1:1:12"] }] } */ \ No newline at end of file diff --git a/tests/vars/global_variable_decl_only.cc b/tests/vars/global_variable_decl_only.cc index 2ea9997b..896d56d4 100644 --- a/tests/vars/global_variable_decl_only.cc +++ b/tests/vars/global_variable_decl_only.cc @@ -9,8 +9,8 @@ OUTPUT: "usr": "c:@global", "short_name": "global", "qualified_name": "global", - "declaration": "*1:1:12", - "all_uses": ["*1:1:12"] + "declaration": "1:1:12", + "all_uses": ["1:1:12"] }] } */ \ No newline at end of file