From a920e717116be2838d67c1a9fb9191354fd2d28b Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 4 Oct 2018 23:31:59 -0700 Subject: [PATCH] Clean and update tests after Index* refactoring --- index_tests/class_forward_declaration.cc | 14 +- index_tests/constructors/constructor.cc | 60 ++-- index_tests/constructors/destructor.cc | 62 ++-- .../constructors/implicit_constructor.cc | 60 ++-- index_tests/constructors/invalid_reference.cc | 28 +- index_tests/constructors/make_functions.cc | 241 +++++++------- .../declaration_vs_definition/class.cc | 14 +- .../declaration_vs_definition/class_member.cc | 35 +- .../class_member_static.cc | 37 ++- index_tests/declaration_vs_definition/func.cc | 16 +- .../func_associated_function_params.cc | 47 +-- .../declaration_vs_definition/method.cc | 58 ++-- index_tests/enums/enum_class_decl.cc | 48 +-- index_tests/enums/enum_decl.cc | 34 +- index_tests/enums/enum_inherit.cc | 82 ++--- index_tests/enums/enum_usage.cc | 46 +-- index_tests/foobar.cc | 84 ++--- index_tests/function_declaration.cc | 13 +- .../function_declaration_definition.cc | 16 +- index_tests/function_definition.cc | 12 +- index_tests/inheritance/class_inherit.cc | 30 +- .../class_inherit_templated_parent.cc | 80 ++--- .../inheritance/class_multiple_inherit.cc | 62 ++-- index_tests/inheritance/function_override.cc | 55 +-- .../inheritance/interface_pure_virtual.cc | 27 +- .../inheritance/multiple_base_functions.cc | 84 ++--- index_tests/lambdas/lambda.cc | 73 ++-- index_tests/macros/complex.cc | 59 ++-- index_tests/macros/foo.cc | 69 ++-- index_tests/method_declaration.cc | 27 +- index_tests/method_definition.cc | 32 +- index_tests/method_inline_declaration.cc | 26 +- index_tests/multi_file/funky_enum.cc | 61 ++-- index_tests/multi_file/impl.cc | 168 +++++----- index_tests/multi_file/simple_impl.cc | 34 +- index_tests/multi_file/static.cc | 52 +-- index_tests/namespaces/anonymous_function.cc | 24 +- .../namespaces/function_declaration.cc | 24 +- index_tests/namespaces/function_definition.cc | 23 +- index_tests/namespaces/method_declaration.cc | 38 ++- index_tests/namespaces/method_definition.cc | 43 +-- .../namespaces/method_inline_declaration.cc | 37 ++- index_tests/namespaces/namespace_alias.cc | 105 +++--- index_tests/namespaces/namespace_reference.cc | 68 ++-- index_tests/operators/operator.cc | 67 ++-- .../outline/static_function_in_type.cc | 114 ++++--- index_tests/preprocessor/include_guard.cc | 10 +- .../func_specialized_template_param.cc | 48 +-- .../implicit_variable_instantiation.cc | 84 ++--- .../templates/member_ref_in_template.cc | 63 ++-- ...ass_template_func_usage_folded_into_one.cc | 70 ++-- ...ace_template_type_usage_folded_into_one.cc | 47 +-- index_tests/templates/specialization.cc | 313 +++++++++--------- .../templates/specialized_func_definition.cc | 55 +-- ...mplate_class_func_usage_folded_into_one.cc | 59 ++-- ...ass_template_func_usage_folded_into_one.cc | 59 ++-- ...mplate_class_type_usage_folded_into_one.cc | 84 ++--- ...emplate_class_var_usage_folded_into_one.cc | 54 +-- .../template_func_usage_folded_into_one.cc | 43 +-- .../template_type_usage_folded_into_one.cc | 36 +- .../template_var_usage_folded_into_one.cc | 76 ++--- index_tests/types/anonymous_struct.cc | 79 ++--- index_tests/types/typedefs.cc | 29 +- index_tests/unions/union_decl.cc | 56 ++-- index_tests/unions/union_usage.cc | 80 ++--- .../usage/func_called_from_constructor.cc | 44 +-- .../usage/func_called_from_macro_argument.cc | 35 +- .../usage/func_called_from_template.cc | 46 +-- .../usage/func_called_implicit_ctor.cc | 53 +-- index_tests/usage/func_usage_addr_func.cc | 46 +-- index_tests/usage/func_usage_addr_method.cc | 51 +-- index_tests/usage/func_usage_call_func.cc | 24 +- index_tests/usage/func_usage_call_method.cc | 51 +-- .../usage/func_usage_class_inline_var_def.cc | 47 +-- .../usage/func_usage_forward_decl_func.cc | 25 +- .../usage/func_usage_forward_decl_method.cc | 51 +-- index_tests/usage/func_usage_template_func.cc | 25 +- .../usage/type_usage_as_template_parameter.cc | 74 ++--- ...ype_usage_as_template_parameter_complex.cc | 124 +++---- ...type_usage_as_template_parameter_simple.cc | 39 +-- .../usage/type_usage_declare_extern.cc | 23 +- index_tests/usage/type_usage_declare_field.cc | 63 ++-- index_tests/usage/type_usage_declare_local.cc | 61 ++-- index_tests/usage/type_usage_declare_param.cc | 61 ++-- .../type_usage_declare_param_prototype.cc | 39 +-- .../usage/type_usage_declare_param_unnamed.cc | 25 +- .../usage/type_usage_declare_qualifiers.cc | 88 ++--- .../usage/type_usage_declare_static.cc | 26 +- .../usage/type_usage_on_return_type.cc | 106 +++--- .../usage/type_usage_typedef_and_using.cc | 123 +++---- .../type_usage_typedef_and_using_template.cc | 43 +-- index_tests/usage/type_usage_various.cc | 49 +-- index_tests/usage/usage_inside_of_call.cc | 95 +++--- .../usage/usage_inside_of_call_simple.cc | 37 ++- index_tests/usage/var_usage_call_function.cc | 34 +- index_tests/usage/var_usage_class_member.cc | 95 +++--- .../usage/var_usage_class_member_static.cc | 59 ++-- index_tests/usage/var_usage_cstyle_cast.cc | 42 +-- index_tests/usage/var_usage_extern.cc | 30 +- index_tests/usage/var_usage_func_parameter.cc | 33 +- index_tests/usage/var_usage_local.cc | 33 +- index_tests/usage/var_usage_shadowed_local.cc | 43 +-- .../usage/var_usage_shadowed_parameter.cc | 43 +-- index_tests/usage/var_usage_static.cc | 33 +- index_tests/vars/class_member.cc | 26 +- index_tests/vars/class_static_member.cc | 26 +- .../vars/class_static_member_decl_only.cc | 32 +- index_tests/vars/deduce_auto_type.cc | 48 +-- index_tests/vars/function_local.cc | 35 +- index_tests/vars/function_param.cc | 45 +-- index_tests/vars/function_param_unnamed.cc | 12 +- index_tests/vars/function_shadow_local.cc | 43 +-- index_tests/vars/function_shadow_param.cc | 43 +-- index_tests/vars/global_variable.cc | 21 +- index_tests/vars/global_variable_decl_only.cc | 18 +- .../vars/type_instance_on_using_type.cc | 54 +-- src/message_handler.cc | 5 +- 117 files changed, 3187 insertions(+), 3074 deletions(-) diff --git a/index_tests/class_forward_declaration.cc b/index_tests/class_forward_declaration.cc index 0da90161..7c5e23a2 100644 --- a/index_tests/class_forward_declaration.cc +++ b/index_tests/class_forward_declaration.cc @@ -14,16 +14,16 @@ OUTPUT: "detailed_name": "class Foo", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": ["1:7-1:10|1:1-1:10|0|1|1|-1", "2:7-2:10|2:1-2:10|0|1|1|-1", "4:7-4:10|4:1-4:10|0|1|1|-1"], - "spell": "3:7-3:10|0|1|2|-1", - "extent": "3:1-3:13|0|1|0|-1", - "alias_of": 0, + "spell": "3:7-3:10|3:1-3:13|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["1:7-1:10|1:1-1:10|1|-1", "2:7-2:10|2:1-2:10|1|-1", "4:7-4:10|4:1-4:10|1|-1"], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/constructors/constructor.cc b/index_tests/constructors/constructor.cc index 72fcaf0d..7901e0fb 100644 --- a/index_tests/constructors/constructor.cc +++ b/index_tests/constructors/constructor.cc @@ -18,75 +18,75 @@ OUTPUT: "detailed_name": "Foo::Foo()", "qual_name_offset": 0, "short_name": "Foo", + "spell": "3:3-3:6|3:3-3:11|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "3:3-3:6|15041163540773201510|2|1026|-1", - "extent": "3:3-3:11|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["7:7-7:8|4259594751088586730|3|16676|-1", "8:17-8:20|4259594751088586730|3|16676|-1"], - "callees": [] + "uses": ["7:7-7:8|16676|-1", "8:17-8:20|16676|-1"] }, { "usr": 4259594751088586730, "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "6:6-6:9|6:1-9:2|2|-1", + "bases": [], + "vars": [10983126130596230582, 17165811951126099095], + "callees": ["7:7-7:8|3385168158331140247|3|16676", "7:7-7:8|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "6:6-6:9|0|1|2|-1", - "extent": "6:1-9:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [10983126130596230582, 17165811951126099095], - "uses": [], - "callees": ["7:7-7:8|3385168158331140247|3|16676", "7:7-7:8|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676"] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [3385168158331140247], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [10983126130596230582, 17165811951126099095], - "uses": ["3:3-3:6|15041163540773201510|2|4|-1", "7:3-7:6|4259594751088586730|3|4|-1", "8:3-8:6|4259594751088586730|3|4|-1", "8:17-8:20|4259594751088586730|3|4|-1"] + "uses": ["3:3-3:6|4|-1", "7:3-7:6|4|-1", "8:3-8:6|4|-1", "8:17-8:20|4|-1"] }], "usr2var": [{ "usr": 10983126130596230582, "detailed_name": "Foo f", "qual_name_offset": 4, "short_name": "f", - "declarations": [], - "spell": "7:7-7:8|4259594751088586730|3|2|-1", - "extent": "7:3-7:8|4259594751088586730|3|0|-1", + "spell": "7:7-7:8|7:3-7:8|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 17165811951126099095, "detailed_name": "Foo *f2", "qual_name_offset": 5, "short_name": "f2", "hover": "Foo *f2 = new Foo()", - "declarations": [], - "spell": "8:8-8:10|4259594751088586730|3|2|-1", - "extent": "8:3-8:22|4259594751088586730|3|0|-1", + "spell": "8:8-8:10|8:3-8:22|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/constructors/destructor.cc b/index_tests/constructors/destructor.cc index 97207f37..c8ad82b7 100644 --- a/index_tests/constructors/destructor.cc +++ b/index_tests/constructors/destructor.cc @@ -23,77 +23,77 @@ OUTPUT: "detailed_name": "Foo::Foo()", "qual_name_offset": 0, "short_name": "Foo", + "spell": "3:3-3:6|3:3-3:11|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "3:3-3:6|15041163540773201510|2|1026|-1", - "extent": "3:3-3:11|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["8:7-8:8|4259594751088586730|3|16676|-1"], - "callees": [] + "uses": ["8:7-8:8|16676|-1"] }, { "usr": 4259594751088586730, "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "7:6-7:9|7:1-9:2|2|-1", + "bases": [], + "vars": [1893354193220338759], + "callees": ["8:7-8:8|3385168158331140247|3|16676", "8:7-8:8|3385168158331140247|3|16676"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "7:6-7:9|0|1|2|-1", - "extent": "7:1-9:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [1893354193220338759], - "uses": [], - "callees": ["8:7-8:8|3385168158331140247|3|16676", "8:7-8:8|3385168158331140247|3|16676"] + "uses": [] }, { "usr": 7440261702884428359, "detailed_name": "Foo::~Foo() noexcept", "qual_name_offset": 0, "short_name": "~Foo", + "spell": "4:3-4:7|4:3-4:12|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "4:3-4:7|15041163540773201510|2|1026|-1", - "extent": "4:3-4:12|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [3385168158331140247, 7440261702884428359], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [1893354193220338759], - "uses": ["3:3-3:6|15041163540773201510|2|4|-1", "4:4-4:7|15041163540773201510|2|4|-1", "8:3-8:6|4259594751088586730|3|4|-1"] + "uses": ["3:3-3:6|4|-1", "4:4-4:7|4|-1", "8:3-8:6|4|-1"] }], "usr2var": [{ "usr": 1893354193220338759, "detailed_name": "Foo f", "qual_name_offset": 4, "short_name": "f", - "declarations": [], - "spell": "8:7-8:8|4259594751088586730|3|2|-1", - "extent": "8:3-8:8|4259594751088586730|3|0|-1", + "spell": "8:7-8:8|8:3-8:8|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/constructors/implicit_constructor.cc b/index_tests/constructors/implicit_constructor.cc index b3995cfd..31c7c8ce 100644 --- a/index_tests/constructors/implicit_constructor.cc +++ b/index_tests/constructors/implicit_constructor.cc @@ -17,75 +17,75 @@ OUTPUT: "detailed_name": "void Make()", "qual_name_offset": 5, "short_name": "Make", + "spell": "5:6-5:10|5:1-8:2|2|-1", + "bases": [], + "vars": [449111627548814328, 17097499197730163115], + "callees": ["6:8-6:12|10530961286677896857|3|16676", "6:8-6:12|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:10|0|1|2|-1", - "extent": "5:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [449111627548814328, 17097499197730163115], - "uses": [], - "callees": ["6:8-6:12|10530961286677896857|3|16676", "6:8-6:12|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676"] + "uses": [] }, { "usr": 10530961286677896857, "detailed_name": "Type::Type()", "qual_name_offset": 0, "short_name": "Type", + "spell": "2:3-2:7|2:3-2:12|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "2:3-2:7|13487927231218873822|2|1026|-1", - "extent": "2:3-2:12|13487927231218873822|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["6:8-6:12|3957104924306079513|3|16676|-1", "7:15-7:19|3957104924306079513|3|16676|-1"], - "callees": [] + "uses": ["6:8-6:12|16676|-1", "7:15-7:19|16676|-1"] }], "usr2type": [{ "usr": 13487927231218873822, "detailed_name": "struct Type {}", "qual_name_offset": 7, "short_name": "Type", - "kind": 23, - "declarations": [], - "spell": "1:8-1:12|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:12|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [10530961286677896857], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [449111627548814328, 17097499197730163115], - "uses": ["2:3-2:7|13487927231218873822|2|4|-1", "6:3-6:7|3957104924306079513|3|4|-1", "7:15-7:19|3957104924306079513|3|4|-1"] + "uses": ["2:3-2:7|4|-1", "6:3-6:7|4|-1", "7:15-7:19|4|-1"] }], "usr2var": [{ "usr": 449111627548814328, "detailed_name": "Type foo0", "qual_name_offset": 5, "short_name": "foo0", - "declarations": [], - "spell": "6:8-6:12|3957104924306079513|3|2|-1", - "extent": "6:3-6:12|3957104924306079513|3|0|-1", + "spell": "6:8-6:12|6:3-6:12|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 17097499197730163115, "detailed_name": "Type foo1", "qual_name_offset": 5, "short_name": "foo1", "hover": "Type foo1 = Type()", - "declarations": [], - "spell": "7:8-7:12|3957104924306079513|3|2|-1", - "extent": "7:3-7:21|3957104924306079513|3|0|-1", + "spell": "7:8-7:12|7:3-7:21|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/constructors/invalid_reference.cc b/index_tests/constructors/invalid_reference.cc index dfb742c2..3b960a16 100644 --- a/index_tests/constructors/invalid_reference.cc +++ b/index_tests/constructors/invalid_reference.cc @@ -17,34 +17,34 @@ OUTPUT: "detailed_name": "Foo::Foo::Foo()", "qual_name_offset": 0, "short_name": "Foo", + "spell": "4:6-4:9|4:1-4:11|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "4:6-4:9|15041163540773201510|2|1026|-1", - "extent": "4:1-4:11|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "1:8-1:11|0|1|2|-1", - "extent": "1:1-1:14|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:11|1:1-1:14|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [17319723337446061757], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["4:1-4:4|0|1|4|-1", "4:6-4:9|15041163540773201510|2|4|-1"] + "uses": ["4:1-4:4|4|-1", "4:6-4:9|4|-1"] }], "usr2var": [] } diff --git a/index_tests/constructors/make_functions.cc b/index_tests/constructors/make_functions.cc index c285c1d5..5bc5004b 100644 --- a/index_tests/constructors/make_functions.cc +++ b/index_tests/constructors/make_functions.cc @@ -33,96 +33,96 @@ OUTPUT: make_functions.h "detailed_name": "Foobar::Foobar(int &&, Bar *, bool *)", "qual_name_offset": 0, "short_name": "Foobar", + "spell": "7:3-7:9|7:3-7:32|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "7:3-7:9|14935975554338052500|2|1026|-1", - "extent": "7:3-7:32|14935975554338052500|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 13028995015627606181, "detailed_name": "Foobar::Foobar(int)", "qual_name_offset": 0, "short_name": "Foobar", + "spell": "6:3-6:9|6:3-6:17|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "6:3-6:9|14935975554338052500|2|1026|-1", - "extent": "6:3-6:17|14935975554338052500|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 13131778807733950299, "detailed_name": "Foobar::Foobar()", "qual_name_offset": 0, "short_name": "Foobar", + "spell": "5:3-5:9|5:3-5:14|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "5:3-5:9|14935975554338052500|2|1026|-1", - "extent": "5:3-5:14|14935975554338052500|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 17321436359755983845, "detailed_name": "Foobar::Foobar(int, Bar *, bool *)", "qual_name_offset": 0, "short_name": "Foobar", + "spell": "8:3-8:9|8:3-8:30|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "8:3-8:9|14935975554338052500|2|1026|-1", - "extent": "8:3-8:30|14935975554338052500|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 12993848456528750350, "detailed_name": "struct Bar {}", "qual_name_offset": 7, "short_name": "Bar", - "kind": 23, - "declarations": [], - "spell": "1:8-1:11|0|1|2|-1", - "extent": "1:1-1:14|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:11|1:1-1:14|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:17-7:20|14935975554338052500|2|4|-1", "8:15-8:18|14935975554338052500|2|4|-1"] + "uses": ["7:17-7:20|4|-1", "8:15-8:18|4|-1"] }, { "usr": 14935975554338052500, "detailed_name": "class Foobar {}", "qual_name_offset": 6, "short_name": "Foobar", - "kind": 5, - "declarations": [], - "spell": "3:7-3:13|0|1|2|-1", - "extent": "3:1-9:2|0|1|0|-1", - "alias_of": 0, + "spell": "3:7-3:13|3:1-9:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [13131778807733950299, 13028995015627606181, 3765833212244435302, 17321436359755983845], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:3-5:9|14935975554338052500|2|4|-1", "6:3-6:9|14935975554338052500|2|4|-1", "7:3-7:9|14935975554338052500|2|4|-1", "8:3-8:9|14935975554338052500|2|4|-1"] + "uses": ["5:3-5:9|4|-1", "6:3-6:9|4|-1", "7:3-7:9|4|-1", "8:3-8:9|4|-1"] }], "usr2var": [] } @@ -138,99 +138,103 @@ OUTPUT: make_functions.cc "detailed_name": "", "qual_name_offset": 0, "short_name": "", + "bases": [], + "vars": [2555873744476712860, 2555873744476712860, 2555873744476712860], + "callees": [], "kind": 0, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [2555873744476712860, 2555873744476712860, 2555873744476712860], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 2532818908869373467, "detailed_name": "T *maKE_NoRefs(Args ...args)", "qual_name_offset": 3, "short_name": "maKE_NoRefs", + "spell": "9:4-9:15|9:1-11:2|2|-1", + "bases": [], + "vars": [3908732770590594660], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "9:4-9:15|0|1|2|-1", - "extent": "9:1-11:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [3908732770590594660], - "uses": ["17:3-17:14|2816883305867289955|3|16420|-1"], - "callees": [] + "uses": ["17:3-17:14|16420|-1"] }, { "usr": 2816883305867289955, "detailed_name": "void caller22()", "qual_name_offset": 5, "short_name": "caller22", + "spell": "13:6-13:14|13:1-18:2|2|-1", + "bases": [], + "vars": [], + "callees": ["14:3-14:13|15793662558620604611|3|16420", "15:3-15:13|15793662558620604611|3|16420", "16:3-16:13|15793662558620604611|3|16420", "17:3-17:14|2532818908869373467|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "13:6-13:14|0|1|2|-1", - "extent": "13:1-18:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["14:3-14:13|15793662558620604611|3|16420", "15:3-15:13|15793662558620604611|3|16420", "16:3-16:13|15793662558620604611|3|16420", "17:3-17:14|2532818908869373467|3|16420"] + "uses": [] }, { "usr": 11138976705878544996, "detailed_name": "", "qual_name_offset": 0, "short_name": "", + "bases": [], + "vars": [16395392342608151399], + "callees": [], "kind": 0, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [16395392342608151399], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 11363675606380070883, "detailed_name": "", "qual_name_offset": 0, "short_name": "", + "bases": [], + "vars": [180270746871803062, 180270746871803062, 180270746871803062], + "callees": [], "kind": 0, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [180270746871803062, 180270746871803062, 180270746871803062], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 15793662558620604611, "detailed_name": "T *MakeUnique(Args &&...args)", "qual_name_offset": 3, "short_name": "MakeUnique", + "spell": "4:4-4:14|4:1-6:2|2|-1", + "bases": [], + "vars": [8463700030555379526], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "4:4-4:14|0|1|2|-1", - "extent": "4:1-6:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [8463700030555379526], - "uses": ["14:3-14:13|2816883305867289955|3|16420|-1", "15:3-15:13|2816883305867289955|3|16420|-1", "16:3-16:13|2816883305867289955|3|16420|-1"], - "callees": [] + "uses": ["14:3-14:13|16420|-1", "15:3-15:13|16420|-1", "16:3-16:13|16420|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [180270746871803062], "uses": [] }, { @@ -238,14 +242,15 @@ OUTPUT: make_functions.cc "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [180270746871803062], "uses": [] }, { @@ -253,92 +258,94 @@ OUTPUT: make_functions.cc "detailed_name": "struct Bar {}", "qual_name_offset": 7, "short_name": "Bar", - "kind": 23, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["16:29-16:32|2816883305867289955|3|4|-1", "17:30-17:33|2816883305867289955|3|4|-1"] + "uses": ["16:29-16:32|4|-1", "17:30-17:33|4|-1"] }, { "usr": 14935975554338052500, "detailed_name": "class Foobar {}", "qual_name_offset": 6, "short_name": "Foobar", - "kind": 5, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["14:14-14:20|2816883305867289955|3|4|-1", "15:14-15:20|2816883305867289955|3|4|-1", "16:14-16:20|2816883305867289955|3|4|-1", "17:15-17:21|2816883305867289955|3|4|-1"] + "uses": ["14:14-14:20|4|-1", "15:14-15:20|4|-1", "16:14-16:20|4|-1", "17:15-17:21|4|-1"] }], "usr2var": [{ "usr": 180270746871803062, "detailed_name": "int args", "qual_name_offset": 4, "short_name": "args", - "declarations": [], - "spell": "9:24-9:28|11363675606380070883|3|1026|-1", - "extent": "9:16-9:28|11363675606380070883|3|0|-1", + "spell": "9:24-9:28|9:16-9:28|1026|-1", "type": 87, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 2555873744476712860, "detailed_name": "int &&args", "qual_name_offset": 6, "short_name": "args", - "declarations": [], - "spell": "4:25-4:29|768523651983844320|3|1026|-1", - "extent": "4:15-4:29|768523651983844320|3|0|-1", + "spell": "4:25-4:29|4:15-4:29|1026|-1", "type": 0, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 3908732770590594660, "detailed_name": "Args ...args", "qual_name_offset": 8, "short_name": "args", - "declarations": [], - "spell": "9:24-9:28|2532818908869373467|3|1026|-1", - "extent": "9:16-9:28|2532818908869373467|3|0|-1", + "spell": "9:24-9:28|9:16-9:28|1026|-1", "type": 0, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 8463700030555379526, "detailed_name": "Args &&...args", "qual_name_offset": 10, "short_name": "args", - "declarations": [], - "spell": "4:25-4:29|15793662558620604611|3|1026|-1", - "extent": "4:15-4:29|15793662558620604611|3|0|-1", + "spell": "4:25-4:29|4:15-4:29|1026|-1", "type": 0, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16395392342608151399, "detailed_name": "int &&args", "qual_name_offset": 6, "short_name": "args", - "declarations": [], - "spell": "4:25-4:29|11138976705878544996|3|1026|-1", - "extent": "4:15-4:29|11138976705878544996|3|0|-1", + "spell": "4:25-4:29|4:15-4:29|1026|-1", "type": 0, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/declaration_vs_definition/class.cc b/index_tests/declaration_vs_definition/class.cc index 51a35677..ee90a78b 100644 --- a/index_tests/declaration_vs_definition/class.cc +++ b/index_tests/declaration_vs_definition/class.cc @@ -16,16 +16,16 @@ OUTPUT: "detailed_name": "class Foo", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": ["1:7-1:10|1:1-1:10|0|1|1|-1", "2:7-2:10|2:1-2:10|0|1|1|-1", "4:7-4:10|4:1-4:10|0|1|1|-1"], - "spell": "3:7-3:10|0|1|2|-1", - "extent": "3:1-3:13|0|1|0|-1", - "alias_of": 0, + "spell": "3:7-3:10|3:1-3:13|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["1:7-1:10|1:1-1:10|1|-1", "2:7-2:10|2:1-2:10|1|-1", "4:7-4:10|4:1-4:10|1|-1"], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/declaration_vs_definition/class_member.cc b/index_tests/declaration_vs_definition/class_member.cc index ef14ac7b..0099e070 100644 --- a/index_tests/declaration_vs_definition/class_member.cc +++ b/index_tests/declaration_vs_definition/class_member.cc @@ -13,14 +13,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [9736582033442720743], "uses": [] }, { @@ -28,19 +29,19 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 9736582033442720743, "R": 0 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -49,13 +50,13 @@ OUTPUT: "detailed_name": "int Foo::foo", "qual_name_offset": 4, "short_name": "foo", - "declarations": [], - "spell": "2:7-2:10|15041163540773201510|2|1026|-1", - "extent": "2:3-2:10|15041163540773201510|2|0|-1", + "spell": "2:7-2:10|2:3-2:10|1026|-1", "type": 53, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/declaration_vs_definition/class_member_static.cc b/index_tests/declaration_vs_definition/class_member_static.cc index 4655b4be..6e7951e9 100644 --- a/index_tests/declaration_vs_definition/class_member_static.cc +++ b/index_tests/declaration_vs_definition/class_member_static.cc @@ -15,14 +15,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [8942920329766232482, 8942920329766232482], "uses": [] }, { @@ -30,31 +31,31 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:5-5:8|0|1|4|-1"] + "uses": ["5:5-5:8|4|-1"] }], "usr2var": [{ "usr": 8942920329766232482, "detailed_name": "static int Foo::foo", "qual_name_offset": 11, "short_name": "foo", - "declarations": ["2:14-2:17|2:3-2:17|15041163540773201510|2|1025|-1"], - "spell": "5:10-5:13|15041163540773201510|2|1026|-1", - "extent": "5:1-5:13|15041163540773201510|2|0|-1", + "spell": "5:10-5:13|5:1-5:13|1026|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 5, + "storage": 2, + "declarations": ["2:14-2:17|2:3-2:17|1025|-1"], + "uses": [] }] } */ diff --git a/index_tests/declaration_vs_definition/func.cc b/index_tests/declaration_vs_definition/func.cc index aacda01c..f1ad3749 100644 --- a/index_tests/declaration_vs_definition/func.cc +++ b/index_tests/declaration_vs_definition/func.cc @@ -14,16 +14,16 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:9|1:1-1:11|0|1|1|-1", "2:6-2:9|2:1-2:11|0|1|1|-1", "4:6-4:9|4:1-4:11|0|1|1|-1"], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-3:14|0|1|0|-1", + "spell": "3:6-3:9|3:1-3:14|2|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:9|1:1-1:11|1|-1", "2:6-2:9|2:1-2:11|1|-1", "4:6-4:9|4:1-4:11|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/declaration_vs_definition/func_associated_function_params.cc b/index_tests/declaration_vs_definition/func_associated_function_params.cc index 0aa1487e..fbf17f3a 100644 --- a/index_tests/declaration_vs_definition/func_associated_function_params.cc +++ b/index_tests/declaration_vs_definition/func_associated_function_params.cc @@ -14,30 +14,31 @@ OUTPUT: "detailed_name": "int foo(int, int)", "qual_name_offset": 4, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["1:5-1:8|1:1-1:18|0|1|1|-1", "2:5-2:8|2:1-3:16|0|1|1|-1", "4:5-4:8|4:1-4:26|0|1|1|-1"], - "spell": "5:5-5:8|0|1|2|-1", - "extent": "5:1-5:36|0|1|0|-1", + "spell": "5:5-5:8|5:1-5:36|2|-1", "bases": [], - "derived": [], "vars": [14555488990109936920, 10963664335057337329], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:5-1:8|1:1-1:18|1|-1", "2:5-2:8|2:1-3:16|1|-1", "4:5-4:8|4:1-4:26|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [14555488990109936920, 10963664335057337329], "uses": [] }], @@ -46,25 +47,25 @@ OUTPUT: "detailed_name": "int b", "qual_name_offset": 4, "short_name": "b", - "declarations": [], - "spell": "5:20-5:21|2747674671862363334|3|1026|-1", - "extent": "5:16-5:21|2747674671862363334|3|0|-1", + "spell": "5:20-5:21|5:16-5:21|1026|-1", "type": 53, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 14555488990109936920, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "5:13-5:14|2747674671862363334|3|1026|-1", - "extent": "5:9-5:14|2747674671862363334|3|0|-1", + "spell": "5:13-5:14|5:9-5:14|1026|-1", "type": 53, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/declaration_vs_definition/method.cc b/index_tests/declaration_vs_definition/method.cc index da2b46fb..ef280fdb 100644 --- a/index_tests/declaration_vs_definition/method.cc +++ b/index_tests/declaration_vs_definition/method.cc @@ -16,60 +16,62 @@ OUTPUT: "detailed_name": "void Foo::declonly()", "qual_name_offset": 5, "short_name": "declonly", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:16|2:3-2:18|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:8-2:16|2:3-2:18|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 10939323144126021546, "detailed_name": "virtual void Foo::purevirtual() = 0", "qual_name_offset": 13, "short_name": "purevirtual", - "kind": 6, - "storage": 0, - "declarations": ["3:16-3:27|3:3-3:33|15041163540773201510|2|1089|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:16-3:27|3:3-3:33|1089|-1"], + "derived": [], + "uses": [] }, { "usr": 15416083548883122431, "detailed_name": "void Foo::def()", "qual_name_offset": 5, "short_name": "def", - "kind": 6, - "storage": 0, - "declarations": ["4:8-4:11|4:3-4:13|15041163540773201510|2|1025|-1"], - "spell": "7:11-7:14|15041163540773201510|2|1026|-1", - "extent": "7:1-7:19|15041163540773201510|2|0|-1", + "spell": "7:11-7:14|7:1-7:19|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["4:8-4:11|4:3-4:13|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [4012226004228259562, 10939323144126021546, 15416083548883122431], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:6-7:9|0|1|4|-1"] + "uses": ["7:6-7:9|4|-1"] }], "usr2var": [] } diff --git a/index_tests/enums/enum_class_decl.cc b/index_tests/enums/enum_class_decl.cc index a31baff5..a49e0ed1 100644 --- a/index_tests/enums/enum_class_decl.cc +++ b/index_tests/enums/enum_class_decl.cc @@ -15,16 +15,16 @@ OUTPUT: "detailed_name": "typedef unsigned char uint8_t", "qual_name_offset": 22, "short_name": "uint8_t", - "kind": 252, - "declarations": [], - "spell": "1:23-1:30|0|1|2|-1", - "extent": "1:1-1:30|0|1|0|-1", - "alias_of": 0, + "spell": "1:23-1:30|1:1-1:30|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -32,16 +32,16 @@ OUTPUT: "detailed_name": "enum class Foo : uint8_t {}", "qual_name_offset": 11, "short_name": "Foo", - "kind": 10, - "declarations": [], - "spell": "2:12-2:15|0|1|2|-1", - "extent": "2:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "2:12-2:15|2:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -51,25 +51,25 @@ OUTPUT: "qual_name_offset": 0, "short_name": "A", "hover": "Foo::A = 0", - "declarations": [], - "spell": "3:3-3:4|16985894625255407295|2|1026|-1", - "extent": "3:3-3:4|16985894625255407295|2|0|-1", + "spell": "3:3-3:4|3:3-3:4|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15962370213938840720, "detailed_name": "Foo::B = 20", "qual_name_offset": 0, "short_name": "B", - "declarations": [], - "spell": "4:3-4:4|16985894625255407295|2|1026|-1", - "extent": "4:3-4:9|16985894625255407295|2|0|-1", + "spell": "4:3-4:4|4:3-4:9|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/enums/enum_decl.cc b/index_tests/enums/enum_decl.cc index bf760444..16697d86 100644 --- a/index_tests/enums/enum_decl.cc +++ b/index_tests/enums/enum_decl.cc @@ -14,16 +14,16 @@ OUTPUT: "detailed_name": "enum Foo {}", "qual_name_offset": 5, "short_name": "Foo", - "kind": 10, - "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:9|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -33,25 +33,25 @@ OUTPUT: "qual_name_offset": 0, "short_name": "A", "hover": "A = 0", - "declarations": [], - "spell": "2:3-2:4|16985894625255407295|2|1026|-1", - "extent": "2:3-2:4|16985894625255407295|2|0|-1", + "spell": "2:3-2:4|2:3-2:4|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15962370213938840720, "detailed_name": "B = 20", "qual_name_offset": 0, "short_name": "B", - "declarations": [], - "spell": "3:3-3:4|16985894625255407295|2|1026|-1", - "extent": "3:3-3:9|16985894625255407295|2|0|-1", + "spell": "3:3-3:4|3:3-3:9|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/enums/enum_inherit.cc b/index_tests/enums/enum_inherit.cc index 18cb37c0..3bf68d52 100644 --- a/index_tests/enums/enum_inherit.cc +++ b/index_tests/enums/enum_inherit.cc @@ -21,16 +21,16 @@ OUTPUT: "detailed_name": "enum class E : int32_t {}", "qual_name_offset": 11, "short_name": "E", - "kind": 10, - "declarations": [], - "spell": "8:12-8:13|0|1|2|-1", - "extent": "8:1-11:2|0|1|0|-1", - "alias_of": 0, + "spell": "8:12-8:13|8:1-11:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -38,16 +38,16 @@ OUTPUT: "detailed_name": "typedef int int32_t", "qual_name_offset": 12, "short_name": "int32_t", - "kind": 252, - "declarations": [], - "spell": "6:13-6:20|0|1|2|-1", - "extent": "6:1-6:20|0|1|0|-1", - "alias_of": 0, + "spell": "6:13-6:20|6:1-6:20|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -55,16 +55,16 @@ OUTPUT: "detailed_name": "enum Foo : int {}", "qual_name_offset": 5, "short_name": "Foo", - "kind": 10, - "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:9|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -74,50 +74,50 @@ OUTPUT: "qual_name_offset": 0, "short_name": "A", "hover": "A = 0", - "declarations": [], - "spell": "2:3-2:4|16985894625255407295|2|1026|-1", - "extent": "2:3-2:4|16985894625255407295|2|0|-1", + "spell": "2:3-2:4|2:3-2:4|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15962370213938840720, "detailed_name": "B = 20", "qual_name_offset": 0, "short_name": "B", - "declarations": [], - "spell": "3:3-3:4|16985894625255407295|2|1026|-1", - "extent": "3:3-3:9|16985894625255407295|2|0|-1", + "spell": "3:3-3:4|3:3-3:9|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16614320383091394267, "detailed_name": "E::E0", "qual_name_offset": 0, "short_name": "E0", "hover": "E::E0 = 0", - "declarations": [], - "spell": "9:3-9:5|2986879766914123941|2|1026|-1", - "extent": "9:3-9:5|2986879766914123941|2|0|-1", + "spell": "9:3-9:5|9:3-9:5|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16847439761518576294, "detailed_name": "E::E20 = 20", "qual_name_offset": 0, "short_name": "E20", - "declarations": [], - "spell": "10:3-10:6|2986879766914123941|2|1026|-1", - "extent": "10:3-10:11|2986879766914123941|2|0|-1", + "spell": "10:3-10:6|10:3-10:11|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/enums/enum_usage.cc b/index_tests/enums/enum_usage.cc index 07475c77..9d303710 100644 --- a/index_tests/enums/enum_usage.cc +++ b/index_tests/enums/enum_usage.cc @@ -16,18 +16,18 @@ OUTPUT: "detailed_name": "enum class Foo : int {}", "qual_name_offset": 11, "short_name": "Foo", - "kind": 10, - "declarations": [], - "spell": "1:12-1:15|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:12-1:15|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [10677751717622394455], - "uses": ["6:1-6:4|0|1|4|-1", "6:9-6:12|0|1|4|-1"] + "uses": ["6:1-6:4|4|-1", "6:9-6:12|4|-1"] }], "usr2var": [{ "usr": 439339022761937396, @@ -35,38 +35,38 @@ OUTPUT: "qual_name_offset": 0, "short_name": "A", "hover": "Foo::A = 0", - "declarations": [], - "spell": "2:3-2:4|16985894625255407295|2|1026|-1", - "extent": "2:3-2:4|16985894625255407295|2|0|-1", + "spell": "2:3-2:4|2:3-2:4|1026|-1", "type": 0, - "uses": ["6:14-6:15|0|1|4|-1"], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": ["6:14-6:15|4|-1"] }, { "usr": 10677751717622394455, "detailed_name": "Foo x", "qual_name_offset": 4, "short_name": "x", "hover": "Foo x = Foo::A", - "declarations": [], - "spell": "6:5-6:6|0|1|2|-1", - "extent": "6:1-6:15|0|1|0|-1", + "spell": "6:5-6:6|6:1-6:15|2|-1", "type": 16985894625255407295, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15962370213938840720, "detailed_name": "Foo::B = 20", "qual_name_offset": 0, "short_name": "B", - "declarations": [], - "spell": "3:3-3:4|16985894625255407295|2|1026|-1", - "extent": "3:3-3:9|16985894625255407295|2|0|-1", + "spell": "3:3-3:4|3:3-3:9|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/foobar.cc b/index_tests/foobar.cc index 4b9d2f65..6337f1ef 100644 --- a/index_tests/foobar.cc +++ b/index_tests/foobar.cc @@ -19,94 +19,94 @@ OUTPUT: "detailed_name": "enum A {}", "qual_name_offset": 5, "short_name": "A", - "kind": 10, - "declarations": [], - "spell": "1:6-1:7|0|1|2|-1", - "extent": "1:1-1:10|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:7|1:1-1:10|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["9:5-9:6|0|1|4|-1"] + "uses": ["9:5-9:6|4|-1"] }, { "usr": 10528472276654770367, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "5:8-5:11|0|1|2|-1", - "extent": "5:1-7:2|0|1|0|-1", - "alias_of": 0, + "spell": "5:8-5:11|5:1-7:2|2|-1", "bases": [], - "derived": [], - "types": [13938528237873543349], "funcs": [], + "types": [13938528237873543349], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [12028309045033782423], - "uses": ["9:1-9:4|0|1|4|-1", "10:1-10:4|0|1|4|-1"] + "uses": ["9:1-9:4|4|-1", "10:1-10:4|4|-1"] }, { "usr": 13892793056005362145, "detailed_name": "enum B {}", "qual_name_offset": 5, "short_name": "B", - "kind": 10, - "declarations": [], - "spell": "2:6-2:7|0|1|2|-1", - "extent": "2:1-2:10|0|1|0|-1", - "alias_of": 0, + "spell": "2:6-2:7|2:1-2:10|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["10:5-10:6|0|1|4|-1"] + "uses": ["10:5-10:6|4|-1"] }, { "usr": 13938528237873543349, "detailed_name": "struct Foo::Inner {}", "qual_name_offset": 7, "short_name": "Inner", - "kind": 23, - "declarations": [], - "spell": "6:10-6:15|10528472276654770367|2|1026|-1", - "extent": "6:3-6:18|10528472276654770367|2|0|-1", - "alias_of": 0, + "spell": "6:10-6:15|6:3-6:18|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 23, + "declarations": [], + "derived": [], "instances": [16721564935990383768], - "uses": ["9:9-9:14|0|1|4|-1"] + "uses": ["9:9-9:14|4|-1"] }], "usr2var": [{ "usr": 12028309045033782423, "detailed_name": "Foo b", "qual_name_offset": 7, "short_name": "b", - "declarations": [], - "spell": "10:8-10:9|0|1|2|-1", - "extent": "10:1-10:9|0|1|0|-1", + "spell": "10:8-10:9|10:1-10:9|2|-1", "type": 10528472276654770367, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "Foo::Inner a", "qual_name_offset": 14, "short_name": "a", - "declarations": [], - "spell": "9:15-9:16|0|1|2|-1", - "extent": "9:1-9:16|0|1|0|-1", + "spell": "9:15-9:16|9:1-9:16|2|-1", "type": 13938528237873543349, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/function_declaration.cc b/index_tests/function_declaration.cc index 9c38f574..49225d2f 100644 --- a/index_tests/function_declaration.cc +++ b/index_tests/function_declaration.cc @@ -10,14 +10,15 @@ OUTPUT: "detailed_name": "void foo(int a, int b)", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:9|1:1-1:23|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:9|1:1-1:23|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/function_declaration_definition.cc b/index_tests/function_declaration_definition.cc index 1eb2ba75..5350dbc2 100644 --- a/index_tests/function_declaration_definition.cc +++ b/index_tests/function_declaration_definition.cc @@ -12,16 +12,16 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:9|1:1-1:11|0|1|1|-1"], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-3:14|0|1|0|-1", + "spell": "3:6-3:9|3:1-3:14|2|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:9|1:1-1:11|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/function_definition.cc b/index_tests/function_definition.cc index 7ceee636..2176a658 100644 --- a/index_tests/function_definition.cc +++ b/index_tests/function_definition.cc @@ -10,16 +10,16 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-1:14|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-1:14|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/inheritance/class_inherit.cc b/index_tests/inheritance/class_inherit.cc index 701b0396..791d9865 100644 --- a/index_tests/inheritance/class_inherit.cc +++ b/index_tests/inheritance/class_inherit.cc @@ -12,33 +12,33 @@ OUTPUT: "detailed_name": "class Parent {}", "qual_name_offset": 6, "short_name": "Parent", - "kind": 5, - "declarations": [], - "spell": "1:7-1:13|0|1|2|-1", - "extent": "1:1-1:16|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:13|1:1-1:16|2|-1", "bases": [], - "derived": [10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["2:24-2:30|10963370434658308541|2|2052|-1"] + "uses": ["2:24-2:30|2052|-1"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : public Parent {}", "qual_name_offset": 6, "short_name": "Derived", - "kind": 5, - "declarations": [], - "spell": "2:7-2:14|0|1|2|-1", - "extent": "2:1-2:33|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:14|2:1-2:33|2|-1", "bases": [3866412049634585509], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/inheritance/class_inherit_templated_parent.cc b/index_tests/inheritance/class_inherit_templated_parent.cc index 4e20cd1b..4e3f5bde 100644 --- a/index_tests/inheritance/class_inherit_templated_parent.cc +++ b/index_tests/inheritance/class_inherit_templated_parent.cc @@ -23,86 +23,86 @@ OUTPUT: "detailed_name": "class Derived1 : Base1 {}", "qual_name_offset": 6, "short_name": "Derived1", - "kind": 5, - "declarations": [], - "spell": "8:7-8:15|0|1|2|-1", - "extent": "8:1-8:29|0|1|0|-1", - "alias_of": 0, + "spell": "8:7-8:15|8:1-8:29|2|-1", "bases": [11930058224338108382], - "derived": [10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["13:43-13:51|10963370434658308541|2|2052|-1"] + "uses": ["13:43-13:51|2052|-1"] }, { "usr": 10651399730831737929, "detailed_name": "class Derived2 : Base2 {}", "qual_name_offset": 6, "short_name": "Derived2", - "kind": 5, - "declarations": [], - "spell": "11:7-11:15|0|1|2|-1", - "extent": "11:1-11:29|0|1|0|-1", - "alias_of": 0, + "spell": "11:7-11:15|11:1-11:29|2|-1", "bases": [11118288764693061434], - "derived": [10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["13:56-13:64|10963370434658308541|2|2052|-1"] + "uses": ["13:56-13:64|2052|-1"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : Base1<3>, Base2, Derived1<4>, Derived2 {}", "qual_name_offset": 6, "short_name": "Derived", - "kind": 5, - "declarations": [], - "spell": "13:7-13:14|0|1|2|-1", - "extent": "13:1-13:76|0|1|0|-1", - "alias_of": 0, + "spell": "13:7-13:14|13:1-13:76|2|-1", "bases": [11930058224338108382, 11118288764693061434, 5863733211528032190, 10651399730831737929], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["13:33-13:40|10963370434658308541|2|2052|-1", "13:65-13:72|10963370434658308541|2|2052|-1"] + "uses": ["13:33-13:40|2052|-1", "13:65-13:72|2052|-1"] }, { "usr": 11118288764693061434, "detailed_name": "class Base2 {}", "qual_name_offset": 6, "short_name": "Base2", - "kind": 5, - "declarations": [], - "spell": "5:7-5:12|0|1|2|-1", - "extent": "5:1-5:15|0|1|0|-1", - "alias_of": 0, + "spell": "5:7-5:12|5:1-5:15|2|-1", "bases": [], - "derived": [10651399730831737929, 10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10651399730831737929, 10963370434658308541], "instances": [], - "uses": ["13:27-13:32|10963370434658308541|2|2052|-1"] + "uses": ["11:18-11:23|2052|-1", "13:27-13:32|2052|-1"] }, { "usr": 11930058224338108382, "detailed_name": "class Base1 {}", "qual_name_offset": 6, "short_name": "Base1", - "kind": 5, - "declarations": [], - "spell": "2:7-2:12|0|1|2|-1", - "extent": "2:1-2:15|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:12|2:1-2:15|2|-1", "bases": [], - "derived": [5863733211528032190, 10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [5863733211528032190, 10963370434658308541], "instances": [], - "uses": ["13:17-13:22|10963370434658308541|2|2052|-1"] + "uses": ["8:18-8:23|2052|-1", "13:17-13:22|2052|-1"] }], "usr2var": [] } diff --git a/index_tests/inheritance/class_multiple_inherit.cc b/index_tests/inheritance/class_multiple_inherit.cc index f8e171a2..49b09501 100644 --- a/index_tests/inheritance/class_multiple_inherit.cc +++ b/index_tests/inheritance/class_multiple_inherit.cc @@ -14,33 +14,33 @@ OUTPUT: "detailed_name": "class Root {}", "qual_name_offset": 6, "short_name": "Root", - "kind": 5, - "declarations": [], - "spell": "1:7-1:11|0|1|2|-1", - "extent": "1:1-1:14|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:11|1:1-1:14|2|-1", "bases": [], - "derived": [11863524815063131483, 14022569716337624303], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [11863524815063131483, 14022569716337624303], "instances": [], - "uses": ["2:24-2:28|11863524815063131483|2|2052|-1", "3:24-3:28|14022569716337624303|2|2052|-1"] + "uses": ["2:24-2:28|2052|-1", "3:24-3:28|2052|-1"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : public MiddleA, public MiddleB {}", "qual_name_offset": 6, "short_name": "Derived", - "kind": 5, - "declarations": [], - "spell": "4:7-4:14|0|1|2|-1", - "extent": "4:1-4:50|0|1|0|-1", - "alias_of": 0, + "spell": "4:7-4:14|4:1-4:50|2|-1", "bases": [11863524815063131483, 14022569716337624303], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -48,35 +48,35 @@ OUTPUT: "detailed_name": "class MiddleA : public Root {}", "qual_name_offset": 6, "short_name": "MiddleA", - "kind": 5, - "declarations": [], - "spell": "2:7-2:14|0|1|2|-1", - "extent": "2:1-2:31|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:14|2:1-2:31|2|-1", "bases": [3897841498936210886], - "derived": [10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["4:24-4:31|10963370434658308541|2|2052|-1"] + "uses": ["4:24-4:31|2052|-1"] }, { "usr": 14022569716337624303, "detailed_name": "class MiddleB : public Root {}", "qual_name_offset": 6, "short_name": "MiddleB", - "kind": 5, - "declarations": [], - "spell": "3:7-3:14|0|1|2|-1", - "extent": "3:1-3:31|0|1|0|-1", - "alias_of": 0, + "spell": "3:7-3:14|3:1-3:31|2|-1", "bases": [3897841498936210886], - "derived": [10963370434658308541], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["4:40-4:47|10963370434658308541|2|2052|-1"] + "uses": ["4:40-4:47|2052|-1"] }], "usr2var": [] } diff --git a/index_tests/inheritance/function_override.cc b/index_tests/inheritance/function_override.cc index 14a5661a..319b4394 100644 --- a/index_tests/inheritance/function_override.cc +++ b/index_tests/inheritance/function_override.cc @@ -15,62 +15,63 @@ OUTPUT: "detailed_name": "void Derived::foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "5:8-5:11|5:3-5:25|5186|-1", + "bases": [9948027785633571339], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "5:8-5:11|10963370434658308541|2|5186|-1", - "extent": "5:3-5:25|10963370434658308541|2|0|-1", - "bases": [9948027785633571339], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 9948027785633571339, "detailed_name": "virtual void Root::foo()", "qual_name_offset": 13, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["2:16-2:19|2:3-2:21|3897841498936210886|2|1089|-1"], "bases": [], - "derived": [6666242542855173890], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:16-2:19|2:3-2:21|1089|-1"], + "derived": [6666242542855173890], + "uses": [] }], "usr2type": [{ "usr": 3897841498936210886, "detailed_name": "class Root {}", "qual_name_offset": 6, "short_name": "Root", - "kind": 5, - "declarations": [], - "spell": "1:7-1:11|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:11|1:1-3:2|2|-1", "bases": [], - "derived": [10963370434658308541], - "types": [], "funcs": [9948027785633571339], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["4:24-4:28|10963370434658308541|2|2052|-1"] + "uses": ["4:24-4:28|2052|-1"] }, { "usr": 10963370434658308541, "detailed_name": "class Derived : public Root {}", "qual_name_offset": 6, "short_name": "Derived", - "kind": 5, - "declarations": [], - "spell": "4:7-4:14|0|1|2|-1", - "extent": "4:1-6:2|0|1|0|-1", - "alias_of": 0, + "spell": "4:7-4:14|4:1-6:2|2|-1", "bases": [3897841498936210886], - "derived": [], - "types": [], "funcs": [6666242542855173890], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/inheritance/interface_pure_virtual.cc b/index_tests/inheritance/interface_pure_virtual.cc index 58ee1d4f..fcf9841f 100644 --- a/index_tests/inheritance/interface_pure_virtual.cc +++ b/index_tests/inheritance/interface_pure_virtual.cc @@ -12,30 +12,31 @@ OUTPUT: "detailed_name": "virtual void IFoo::foo() = 0", "qual_name_offset": 13, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["2:16-2:19|2:3-2:25|9949214233977131946|2|1089|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:16-2:19|2:3-2:25|1089|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 9949214233977131946, "detailed_name": "class IFoo {}", "qual_name_offset": 6, "short_name": "IFoo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:11|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:11|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [3277829753446788562], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/inheritance/multiple_base_functions.cc b/index_tests/inheritance/multiple_base_functions.cc index 76cd27ee..f4ef3c4a 100644 --- a/index_tests/inheritance/multiple_base_functions.cc +++ b/index_tests/inheritance/multiple_base_functions.cc @@ -18,98 +18,98 @@ OUTPUT: "detailed_name": "virtual Base1::~Base1() noexcept", "qual_name_offset": 8, "short_name": "~Base1", + "spell": "5:11-5:17|5:3-5:23|1090|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "5:11-5:17|15826803741381445676|2|1090|-1", - "extent": "5:3-5:23|15826803741381445676|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 13164726294460837993, "detailed_name": "Derived::~Derived() noexcept", "qual_name_offset": 0, "short_name": "~Derived", + "spell": "8:3-8:11|8:3-8:26|5186|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "8:3-8:11|10963370434658308541|2|5186|-1", - "extent": "8:3-8:26|10963370434658308541|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 16347272523198263017, "detailed_name": "virtual Base0::~Base0() noexcept", "qual_name_offset": 8, "short_name": "~Base0", + "spell": "2:11-2:17|2:3-2:23|1090|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "2:11-2:17|11628904180681204356|2|1090|-1", - "extent": "2:3-2:23|11628904180681204356|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 10963370434658308541, "detailed_name": "struct Derived : Base0, Base1 {}", "qual_name_offset": 7, "short_name": "Derived", - "kind": 23, - "declarations": [], - "spell": "7:8-7:15|0|1|2|-1", - "extent": "7:1-9:2|0|1|0|-1", - "alias_of": 0, + "spell": "7:8-7:15|7:1-9:2|2|-1", "bases": [11628904180681204356, 15826803741381445676], - "derived": [], - "types": [], "funcs": [13164726294460837993], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["8:4-8:11|10963370434658308541|2|4|-1"] + "uses": ["8:4-8:11|4|-1"] }, { "usr": 11628904180681204356, "detailed_name": "struct Base0 {}", "qual_name_offset": 7, "short_name": "Base0", - "kind": 23, - "declarations": [], - "spell": "1:8-1:13|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:13|1:1-3:2|2|-1", "bases": [], - "derived": [10963370434658308541], - "types": [], "funcs": [16347272523198263017], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["2:12-2:17|11628904180681204356|2|4|-1", "7:18-7:23|10963370434658308541|2|2052|-1"] + "uses": ["2:12-2:17|4|-1", "7:18-7:23|2052|-1"] }, { "usr": 15826803741381445676, "detailed_name": "struct Base1 {}", "qual_name_offset": 7, "short_name": "Base1", - "kind": 23, - "declarations": [], - "spell": "4:8-4:13|0|1|2|-1", - "extent": "4:1-6:2|0|1|0|-1", - "alias_of": 0, + "spell": "4:8-4:13|4:1-6:2|2|-1", "bases": [], - "derived": [10963370434658308541], - "types": [], "funcs": [8401779086123965305], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [10963370434658308541], "instances": [], - "uses": ["5:12-5:17|15826803741381445676|2|4|-1", "7:25-7:30|10963370434658308541|2|2052|-1"] + "uses": ["5:12-5:17|4|-1", "7:25-7:30|2052|-1"] }], "usr2var": [] } diff --git a/index_tests/lambdas/lambda.cc b/index_tests/lambdas/lambda.cc index b4e58a30..059d148b 100644 --- a/index_tests/lambdas/lambda.cc +++ b/index_tests/lambdas/lambda.cc @@ -21,43 +21,45 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-12:2|2|-1", + "bases": [], + "vars": [12666114896600231317, 2981279427664991319], + "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420", "11:14-11:15|17926497908620168464|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-12:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [12666114896600231317, 2981279427664991319], - "uses": [], - "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420", "11:14-11:15|17926497908620168464|3|16420"] + "uses": [] }, { "usr": 17926497908620168464, "detailed_name": "inline void foo()::(anon class)::operator()(int y) const", "qual_name_offset": 12, "short_name": "operator()", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [], - "uses": ["9:14-9:15|4259594751088586730|3|16420|-1", "10:14-10:15|4259594751088586730|3|16420|-1", "11:14-11:15|4259594751088586730|3|16420|-1"], - "callees": [] + "uses": ["9:14-9:15|16420|-1", "10:14-10:15|16420|-1", "11:14-11:15|16420|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [12666114896600231317], "uses": [] }, { @@ -65,14 +67,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [2981279427664991319], "uses": [] }], @@ -82,37 +85,37 @@ OUTPUT: "qual_name_offset": 9, "short_name": "dosomething", "hover": "(lambda) dosomething", - "declarations": [], - "spell": "4:8-4:19|4259594751088586730|3|2|-1", - "extent": "4:3-7:4|4259594751088586730|3|0|-1", + "spell": "4:8-4:19|4:3-7:4|2|-1", "type": 14635009347499519042, - "uses": ["9:3-9:14|4259594751088586730|3|4|-1", "10:3-10:14|4259594751088586730|3|4|-1", "11:3-11:14|4259594751088586730|3|4|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["9:3-9:14|4|-1", "10:3-10:14|4|-1", "11:3-11:14|4|-1"] }, { "usr": 12666114896600231317, "detailed_name": "int x", "qual_name_offset": 4, "short_name": "x", - "declarations": [], - "spell": "2:7-2:8|4259594751088586730|3|2|-1", - "extent": "2:3-2:8|4259594751088586730|3|0|-1", + "spell": "2:7-2:8|2:3-2:8|2|-1", "type": 53, - "uses": ["4:24-4:25|4259594751088586730|3|4|-1", "5:7-5:8|4259594751088586730|3|28|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["4:24-4:25|4|-1", "5:7-5:8|28|-1"] }, { "usr": 12879188959314906706, "detailed_name": "int y", "qual_name_offset": 4, "short_name": "y", - "declarations": [], - "spell": "4:31-4:32|17926497908620168464|3|2|-1", - "extent": "4:27-4:32|4259594751088586730|3|0|-1", + "spell": "4:31-4:32|4:27-4:32|2|-1", "type": 0, - "uses": ["6:7-6:8|4259594751088586730|3|28|-1"], "kind": 253, - "storage": 0 + "parent_kind": 6, + "storage": 0, + "declarations": [], + "uses": ["6:7-6:8|28|-1"] }] } */ diff --git a/index_tests/macros/complex.cc b/index_tests/macros/complex.cc index b88c3eaa..41388665 100644 --- a/index_tests/macros/complex.cc +++ b/index_tests/macros/complex.cc @@ -21,45 +21,46 @@ OUTPUT: "detailed_name": "int a()", "qual_name_offset": 4, "short_name": "a", - "kind": 12, - "storage": 0, - "declarations": ["12:1-12:20|12:1-12:20|0|1|1|-1"], - "spell": "12:1-12:20|0|1|2|-1", - "extent": "12:1-12:20|0|1|0|-1", + "spell": "12:1-12:20|12:1-12:20|2|-1", "bases": [], - "derived": [], "vars": [], - "uses": ["2:7-2:8|0|1|64|0", "3:7-3:8|0|1|64|0"], - "callees": ["12:5-12:10|14400399977994209582|3|16420"] + "callees": ["12:5-12:10|14400399977994209582|3|16420"], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["12:1-12:20|12:1-12:20|1|-1"], + "derived": [], + "uses": ["2:7-2:8|64|0", "3:7-3:8|64|0"] }, { "usr": 14400399977994209582, "detailed_name": "int make1()", "qual_name_offset": 4, "short_name": "make1", + "spell": "6:5-6:10|6:1-8:2|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "6:5-6:10|0|1|2|-1", - "extent": "6:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["12:5-12:10|9720930732776154610|3|16420|-1", "12:5-12:10|0|1|64|0"], - "callees": [] + "uses": ["12:5-12:10|16420|-1", "12:5-12:10|64|0"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [2878407290385495202], "uses": [] }], @@ -69,26 +70,26 @@ OUTPUT: "qual_name_offset": 10, "short_name": "make2", "hover": "const int make2 = 5", - "declarations": [], - "spell": "9:11-9:16|0|1|2|-1", - "extent": "9:1-9:20|0|1|0|-1", + "spell": "9:11-9:16|9:1-9:20|2|-1", "type": 53, - "uses": ["12:14-12:19|9720930732776154610|3|12|-1", "12:14-12:19|0|1|64|0"], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": ["12:14-12:19|12|-1", "12:14-12:19|64|0"] }, { "usr": 14219599523415845943, "detailed_name": "FOO", "qual_name_offset": 0, "short_name": "FOO", "hover": "#define FOO(aaa, bbb) \\\n int a();\\\n int a() { return aaa + bbb; }", - "declarations": [], - "spell": "1:9-1:12|0|1|2|-1", - "extent": "1:9-3:32|0|1|0|-1", + "spell": "1:9-1:12|1:9-3:32|2|-1", "type": 0, - "uses": ["12:1-12:4|0|1|64|-1"], "kind": 255, - "storage": 0 + "parent_kind": 1, + "storage": 0, + "declarations": [], + "uses": ["12:1-12:4|64|-1"] }] } */ \ No newline at end of file diff --git a/index_tests/macros/foo.cc b/index_tests/macros/foo.cc index 156ab237..c8744e74 100644 --- a/index_tests/macros/foo.cc +++ b/index_tests/macros/foo.cc @@ -17,30 +17,31 @@ OUTPUT: "detailed_name": "Foo::Foo(Foo &&) = delete", "qual_name_offset": 0, "short_name": "Foo", + "spell": "5:12-5:15|5:12-5:15|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 9, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "5:12-5:15|15041163540773201510|2|1026|-1", - "extent": "5:12-5:15|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["5:12-5:15|0|1|64|0"], - "callees": [] + "uses": ["5:12-5:15|64|0"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [10677751717622394455], "uses": [] }, { @@ -48,18 +49,18 @@ OUTPUT: "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "4:8-4:11|0|1|2|-1", - "extent": "4:1-6:2|0|1|0|-1", - "alias_of": 0, + "spell": "4:8-4:11|4:1-6:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [13788753348312146871], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:12-5:15|15041163540773201510|2|4|-1", "5:12-5:15|0|1|64|0"] + "uses": ["5:12-5:15|4|-1", "5:12-5:15|64|0"] }], "usr2var": [{ "usr": 1569772797058982873, @@ -67,39 +68,39 @@ OUTPUT: "qual_name_offset": 0, "short_name": "A", "hover": "#define A 5", - "declarations": [], - "spell": "1:9-1:10|0|1|2|-1", - "extent": "1:9-1:12|0|1|0|-1", + "spell": "1:9-1:10|1:9-1:12|2|-1", "type": 0, - "uses": ["8:9-8:10|0|1|64|-1"], "kind": 255, - "storage": 0 + "parent_kind": 1, + "storage": 0, + "declarations": [], + "uses": ["8:9-8:10|64|-1"] }, { "usr": 4904139678698066671, "detailed_name": "DISALLOW", "qual_name_offset": 0, "short_name": "DISALLOW", "hover": "#define DISALLOW(type) type(type&&) = delete;", - "declarations": [], - "spell": "2:9-2:17|0|1|2|-1", - "extent": "2:9-2:46|0|1|0|-1", + "spell": "2:9-2:17|2:9-2:46|2|-1", "type": 0, - "uses": ["5:3-5:11|0|1|64|-1"], "kind": 255, - "storage": 0 + "parent_kind": 1, + "storage": 0, + "declarations": [], + "uses": ["5:3-5:11|64|-1"] }, { "usr": 10677751717622394455, "detailed_name": "int x", "qual_name_offset": 4, "short_name": "x", "hover": "int x = A", - "declarations": [], - "spell": "8:5-8:6|0|1|2|-1", - "extent": "8:1-1:1|0|1|0|-1", + "spell": "8:5-8:6|8:1-1:1|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/method_declaration.cc b/index_tests/method_declaration.cc index fae12cdc..c777fa49 100644 --- a/index_tests/method_declaration.cc +++ b/index_tests/method_declaration.cc @@ -16,30 +16,31 @@ OUTPUT: "detailed_name": "void Foo::foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:11|2:3-2:13|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:8-2:11|2:3-2:13|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [17922201480358737771], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/method_definition.cc b/index_tests/method_definition.cc index 895eac04..94ff8e56 100644 --- a/index_tests/method_definition.cc +++ b/index_tests/method_definition.cc @@ -14,34 +14,34 @@ OUTPUT: "detailed_name": "void Foo::foo() const", "qual_name_offset": 5, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:11|2:3-2:19|15041163540773201510|2|1025|-1"], - "spell": "5:11-5:14|15041163540773201510|2|1026|-1", - "extent": "5:1-5:25|15041163540773201510|2|0|-1", + "spell": "5:11-5:14|5:1-5:25|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["2:8-2:11|2:3-2:19|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [6446764306530590711], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:6-5:9|0|1|4|-1"] + "uses": ["5:6-5:9|4|-1"] }], "usr2var": [] } diff --git a/index_tests/method_inline_declaration.cc b/index_tests/method_inline_declaration.cc index f2294cd0..774bac0c 100644 --- a/index_tests/method_inline_declaration.cc +++ b/index_tests/method_inline_declaration.cc @@ -12,32 +12,32 @@ OUTPUT: "detailed_name": "void Foo::foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "2:8-2:11|2:3-2:16|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "2:8-2:11|15041163540773201510|2|1026|-1", - "extent": "2:3-2:16|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [17922201480358737771], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/multi_file/funky_enum.cc b/index_tests/multi_file/funky_enum.cc index 784f210d..7ceb5e71 100644 --- a/index_tests/multi_file/funky_enum.cc +++ b/index_tests/multi_file/funky_enum.cc @@ -11,22 +11,7 @@ OUTPUT: funky_enum.h "includes": [], "skipped_ranges": [], "usr2func": [], - "usr2type": [{ - "usr": 16985894625255407295, - "detailed_name": "", - "qual_name_offset": 0, - "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, - "bases": [], - "derived": [], - "types": [], - "funcs": [], - "vars": [], - "instances": [], - "uses": [] - }], + "usr2type": [], "usr2var": [{ "usr": 439339022761937396, "detailed_name": "A", @@ -34,13 +19,13 @@ OUTPUT: funky_enum.h "short_name": "A", "hover": "A = 0", "comments": "This file cannot be built directory. It is included in an enum definition of\nanother file.", - "declarations": [], - "spell": "4:1-4:2|16985894625255407295|2|1026|-1", - "extent": "4:1-4:2|16985894625255407295|2|0|-1", + "spell": "4:1-4:2|4:1-4:2|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 8524995777615948802, "detailed_name": "C", @@ -48,13 +33,13 @@ OUTPUT: funky_enum.h "short_name": "C", "hover": "C = 2", "comments": "This file cannot be built directory. It is included in an enum definition of\nanother file.", - "declarations": [], - "spell": "6:1-6:2|16985894625255407295|2|1026|-1", - "extent": "6:1-6:2|16985894625255407295|2|0|-1", + "spell": "6:1-6:2|6:1-6:2|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15962370213938840720, "detailed_name": "B", @@ -62,13 +47,13 @@ OUTPUT: funky_enum.h "short_name": "B", "hover": "B = 1", "comments": "This file cannot be built directory. It is included in an enum definition of\nanother file.", - "declarations": [], - "spell": "5:1-5:2|16985894625255407295|2|1026|-1", - "extent": "5:1-5:2|16985894625255407295|2|0|-1", + "spell": "5:1-5:2|5:1-5:2|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }] } OUTPUT: funky_enum.cc @@ -84,16 +69,16 @@ OUTPUT: funky_enum.cc "detailed_name": "enum Foo {}", "qual_name_offset": 5, "short_name": "Foo", - "kind": 10, - "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:9|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/multi_file/impl.cc b/index_tests/multi_file/impl.cc index dc754b8c..927f871b 100644 --- a/index_tests/multi_file/impl.cc +++ b/index_tests/multi_file/impl.cc @@ -14,30 +14,31 @@ OUTPUT: header.h "detailed_name": "void Foo1()", "qual_name_offset": 5, "short_name": "Foo1", + "spell": "10:6-10:10|10:1-10:15|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "10:6-10:10|0|1|2|-1", - "extent": "10:1-10:15|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [2638219001294786365, 8395885290297540138], "uses": [] }, { @@ -45,16 +46,16 @@ OUTPUT: header.h "detailed_name": "struct Foo2 {}", "qual_name_offset": 7, "short_name": "Foo2", - "kind": 23, - "declarations": [], - "spell": "13:8-13:12|0|1|2|-1", - "extent": "13:1-13:15|0|1|0|-1", - "alias_of": 0, + "spell": "13:8-13:12|13:1-13:15|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -62,16 +63,16 @@ OUTPUT: header.h "detailed_name": "using Foo0 = SameFileDerived", "qual_name_offset": 6, "short_name": "Foo0", - "kind": 252, - "declarations": [], - "spell": "7:7-7:11|0|1|2|-1", - "extent": "7:1-7:29|0|1|0|-1", - "alias_of": 16750616846959666305, + "spell": "7:7-7:11|7:1-7:29|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 16750616846959666305, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -79,16 +80,16 @@ OUTPUT: header.h "detailed_name": "enum Foo3 {}", "qual_name_offset": 5, "short_name": "Foo3", - "kind": 10, - "declarations": [], - "spell": "15:6-15:10|0|1|2|-1", - "extent": "15:1-15:22|0|1|0|-1", - "alias_of": 0, + "spell": "15:6-15:10|15:1-15:22|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -96,99 +97,99 @@ OUTPUT: header.h "detailed_name": "struct Base {}", "qual_name_offset": 7, "short_name": "Base", - "kind": 23, - "declarations": [], - "spell": "3:8-3:12|0|1|2|-1", - "extent": "3:1-3:15|0|1|0|-1", - "alias_of": 0, + "spell": "3:8-3:12|3:1-3:15|2|-1", "bases": [], - "derived": [16750616846959666305], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [16750616846959666305], "instances": [], - "uses": ["5:26-5:30|16750616846959666305|2|2052|-1"] + "uses": ["5:26-5:30|2052|-1"] }, { "usr": 16750616846959666305, "detailed_name": "struct SameFileDerived : Base {}", "qual_name_offset": 7, "short_name": "SameFileDerived", - "kind": 23, - "declarations": [], - "spell": "5:8-5:23|0|1|2|-1", - "extent": "5:1-5:33|0|1|0|-1", - "alias_of": 0, + "spell": "5:8-5:23|5:1-5:33|2|-1", "bases": [8420119006782424779], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:14-7:29|0|1|4|-1"] + "uses": ["7:14-7:29|4|-1"] }], "usr2var": [{ "usr": 2638219001294786365, "detailed_name": "int Foo4", "qual_name_offset": 4, "short_name": "Foo4", - "declarations": [], - "spell": "17:5-17:9|0|1|2|-1", - "extent": "17:1-17:9|0|1|0|-1", + "spell": "17:5-17:9|17:1-17:9|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 6141718166919284735, "detailed_name": "A", "qual_name_offset": 0, "short_name": "A", "hover": "A = 0", - "declarations": [], - "spell": "15:13-15:14|4481210672785600703|2|1026|-1", - "extent": "15:13-15:14|4481210672785600703|2|0|-1", + "spell": "15:13-15:14|15:13-15:14|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 7285646116511901840, "detailed_name": "C", "qual_name_offset": 0, "short_name": "C", "hover": "C = 2", - "declarations": [], - "spell": "15:19-15:20|4481210672785600703|2|1026|-1", - "extent": "15:19-15:20|4481210672785600703|2|0|-1", + "spell": "15:19-15:20|15:19-15:20|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 8395885290297540138, "detailed_name": "static int Foo5", "qual_name_offset": 11, "short_name": "Foo5", - "declarations": [], - "spell": "18:12-18:16|0|1|2|-1", - "extent": "18:1-18:16|0|1|0|-1", + "spell": "18:12-18:16|18:1-18:16|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": [] }, { "usr": 17716334512218775320, "detailed_name": "B", "qual_name_offset": 0, "short_name": "B", "hover": "B = 1", - "declarations": [], - "spell": "15:16-15:17|4481210672785600703|2|1026|-1", - "extent": "15:16-15:17|4481210672785600703|2|0|-1", + "spell": "15:16-15:17|15:16-15:17|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }] } OUTPUT: impl.cc @@ -203,29 +204,30 @@ OUTPUT: impl.cc "detailed_name": "void Impl()", "qual_name_offset": 5, "short_name": "Impl", + "spell": "3:6-3:10|3:1-5:2|2|-1", + "bases": [], + "vars": [], + "callees": ["4:3-4:7|11650481237659640387|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:10|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["4:3-4:7|11650481237659640387|3|16420"] + "uses": [] }, { "usr": 11650481237659640387, "detailed_name": "void Foo1()", "qual_name_offset": 5, "short_name": "Foo1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [], - "uses": ["4:3-4:7|5817708529036841195|3|16420|-1"], - "callees": [] + "uses": ["4:3-4:7|16420|-1"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/multi_file/simple_impl.cc b/index_tests/multi_file/simple_impl.cc index 75b57e37..e97af237 100644 --- a/index_tests/multi_file/simple_impl.cc +++ b/index_tests/multi_file/simple_impl.cc @@ -14,14 +14,15 @@ OUTPUT: simple_header.h "detailed_name": "void header()", "qual_name_offset": 5, "short_name": "header", - "kind": 12, - "storage": 0, - "declarations": ["3:6-3:12|3:1-3:14|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:6-3:12|3:1-3:14|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [], "usr2var": [] @@ -38,29 +39,30 @@ OUTPUT: simple_impl.cc "detailed_name": "void impl()", "qual_name_offset": 5, "short_name": "impl", + "spell": "3:6-3:10|3:1-5:2|2|-1", + "bases": [], + "vars": [], + "callees": ["4:3-4:9|16236105532929924676|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:10|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["4:3-4:9|16236105532929924676|3|16420"] + "uses": [] }, { "usr": 16236105532929924676, "detailed_name": "void header()", "qual_name_offset": 5, "short_name": "header", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [], - "uses": ["4:3-4:9|3373269392705484958|3|16420|-1"], - "callees": [] + "uses": ["4:3-4:9|16420|-1"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/multi_file/static.cc b/index_tests/multi_file/static.cc index 50096fb2..d344cb7e 100644 --- a/index_tests/multi_file/static.cc +++ b/index_tests/multi_file/static.cc @@ -12,30 +12,31 @@ OUTPUT: static.h "detailed_name": "static void Buffer::CreateSharedBuffer()", "qual_name_offset": 12, "short_name": "CreateSharedBuffer", - "kind": 254, - "storage": 0, - "declarations": ["4:15-4:33|4:3-4:35|9411323049603567600|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 254, + "parent_kind": 0, + "storage": 0, + "declarations": ["4:15-4:33|4:3-4:35|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 9411323049603567600, "detailed_name": "struct Buffer {}", "qual_name_offset": 7, "short_name": "Buffer", - "kind": 23, - "declarations": [], - "spell": "3:8-3:14|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "3:8-3:14|3:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [14576076421851654759], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -53,32 +54,33 @@ OUTPUT: static.cc "detailed_name": "static void Buffer::CreateSharedBuffer()", "qual_name_offset": 12, "short_name": "CreateSharedBuffer", + "spell": "3:14-3:32|3:1-3:37|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 254, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "3:14-3:32|9411323049603567600|2|1026|-1", - "extent": "3:1-3:37|9411323049603567600|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 9411323049603567600, "detailed_name": "struct Buffer {}", "qual_name_offset": 7, "short_name": "Buffer", - "kind": 23, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [14576076421851654759], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["3:6-3:12|0|1|4|-1"] + "uses": ["3:6-3:12|4|-1"] }], "usr2var": [] } diff --git a/index_tests/namespaces/anonymous_function.cc b/index_tests/namespaces/anonymous_function.cc index 89d660a7..7a69afce 100644 --- a/index_tests/namespaces/anonymous_function.cc +++ b/index_tests/namespaces/anonymous_function.cc @@ -12,28 +12,30 @@ OUTPUT: "detailed_name": "void (anon ns)::foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["2:6-2:9|2:1-2:11|7144845543074395457|2|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:6-2:9|2:1-2:11|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 7144845543074395457, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [5010253035933134245], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/namespaces/function_declaration.cc b/index_tests/namespaces/function_declaration.cc index 9ca5a4d8..fd16717e 100644 --- a/index_tests/namespaces/function_declaration.cc +++ b/index_tests/namespaces/function_declaration.cc @@ -12,28 +12,30 @@ OUTPUT: "detailed_name": "void hello::foo(int a, int b)", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["2:6-2:9|2:1-2:23|2029211996748007610|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:6-2:9|2:1-2:23|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 2029211996748007610, "detailed_name": "namespace hello {}", "qual_name_offset": 10, "short_name": "hello", - "kind": 3, - "declarations": ["1:11-1:16|1:1-3:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [18343102288837190527], + "types": [], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:16|1:1-3:2|1|-1"], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/namespaces/function_definition.cc b/index_tests/namespaces/function_definition.cc index e732b06e..afede23d 100644 --- a/index_tests/namespaces/function_definition.cc +++ b/index_tests/namespaces/function_definition.cc @@ -12,30 +12,31 @@ OUTPUT: "detailed_name": "void hello::foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "2:6-2:9|2:1-2:14|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 3, "storage": 0, "declarations": [], - "spell": "2:6-2:9|2029211996748007610|2|1026|-1", - "extent": "2:1-2:14|2029211996748007610|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 2029211996748007610, "detailed_name": "namespace hello {}", "qual_name_offset": 10, "short_name": "hello", - "kind": 3, - "declarations": ["1:11-1:16|1:1-3:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [243328841292951622], + "types": [], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:16|1:1-3:2|1|-1"], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/namespaces/method_declaration.cc b/index_tests/namespaces/method_declaration.cc index b957b1d5..236328cd 100644 --- a/index_tests/namespaces/method_declaration.cc +++ b/index_tests/namespaces/method_declaration.cc @@ -14,28 +14,30 @@ OUTPUT: "detailed_name": "void hello::Foo::foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["3:8-3:11|3:3-3:13|4508214972876735896|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:8-3:11|3:3-3:13|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 2029211996748007610, "detailed_name": "namespace hello {}", "qual_name_offset": 10, "short_name": "hello", - "kind": 3, - "declarations": ["1:11-1:16|1:1-5:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [4508214972876735896], "funcs": [], + "types": [4508214972876735896], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:16|1:1-5:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -43,16 +45,16 @@ OUTPUT: "detailed_name": "class hello::Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "2:7-2:10|2029211996748007610|2|1026|-1", - "extent": "2:1-4:2|2029211996748007610|2|0|-1", - "alias_of": 0, + "spell": "2:7-2:10|2:1-4:2|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [10487325150128053272], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/namespaces/method_definition.cc b/index_tests/namespaces/method_definition.cc index 00f55200..f2f47121 100644 --- a/index_tests/namespaces/method_definition.cc +++ b/index_tests/namespaces/method_definition.cc @@ -16,30 +16,31 @@ OUTPUT: "detailed_name": "void hello::Foo::foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["3:8-3:11|3:3-3:13|4508214972876735896|2|1025|-1"], - "spell": "6:11-6:14|4508214972876735896|2|1026|-1", - "extent": "6:1-6:19|4508214972876735896|2|0|-1", + "spell": "6:11-6:14|6:1-6:19|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["3:8-3:11|3:3-3:13|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 2029211996748007610, "detailed_name": "namespace hello {}", "qual_name_offset": 10, "short_name": "hello", - "kind": 3, - "declarations": ["1:11-1:16|1:1-7:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [4508214972876735896], "funcs": [], + "types": [4508214972876735896], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:16|1:1-7:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -47,18 +48,18 @@ OUTPUT: "detailed_name": "class hello::Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "2:7-2:10|2029211996748007610|2|1026|-1", - "extent": "2:1-4:2|2029211996748007610|2|0|-1", - "alias_of": 0, + "spell": "2:7-2:10|2:1-4:2|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [10487325150128053272], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [], - "uses": ["6:6-6:9|2029211996748007610|2|4|-1"] + "uses": ["6:6-6:9|4|-1"] }], "usr2var": [] } diff --git a/index_tests/namespaces/method_inline_declaration.cc b/index_tests/namespaces/method_inline_declaration.cc index 4d048be1..445bf61e 100644 --- a/index_tests/namespaces/method_inline_declaration.cc +++ b/index_tests/namespaces/method_inline_declaration.cc @@ -14,30 +14,31 @@ OUTPUT: "detailed_name": "void hello::Foo::foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "3:8-3:11|3:3-3:16|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "3:8-3:11|4508214972876735896|2|1026|-1", - "extent": "3:3-3:16|4508214972876735896|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 2029211996748007610, "detailed_name": "namespace hello {}", "qual_name_offset": 10, "short_name": "hello", - "kind": 3, - "declarations": ["1:11-1:16|1:1-5:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [4508214972876735896], "funcs": [], + "types": [4508214972876735896], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:16|1:1-5:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -45,16 +46,16 @@ OUTPUT: "detailed_name": "class hello::Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "2:7-2:10|2029211996748007610|2|1026|-1", - "extent": "2:1-4:2|2029211996748007610|2|0|-1", - "alias_of": 0, + "spell": "2:7-2:10|2:1-4:2|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [10487325150128053272], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/namespaces/namespace_alias.cc b/index_tests/namespaces/namespace_alias.cc index b8cbce9c..f74a7c79 100644 --- a/index_tests/namespaces/namespace_alias.cc +++ b/index_tests/namespaces/namespace_alias.cc @@ -23,30 +23,31 @@ OUTPUT: "detailed_name": "void func()", "qual_name_offset": 5, "short_name": "func", + "spell": "11:6-11:10|11:1-14:2|2|-1", + "bases": [], + "vars": [6030927277961448585, 7657277353101371136], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "11:6-11:10|0|1|2|-1", - "extent": "11:1-14:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [6030927277961448585, 7657277353101371136], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [15042442838933090518, 6030927277961448585, 7657277353101371136], "uses": [] }, { @@ -54,64 +55,68 @@ OUTPUT: "detailed_name": "namespace foo {}", "qual_name_offset": 10, "short_name": "foo", - "kind": 3, - "declarations": ["1:11-1:14|1:1-7:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [17805385787823406700], - "types": [17805385787823406700], "funcs": [], + "types": [17805385787823406700], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:14|1:1-7:2|1|-1"], + "derived": [17805385787823406700], "instances": [], - "uses": ["9:17-9:20|0|1|4|-1", "12:11-12:14|10818727483146447186|3|4|-1"] + "uses": ["9:17-9:20|4|-1", "12:11-12:14|4|-1"] }, { "usr": 11879713791858506216, "detailed_name": "namespace fbz = foo::bar::baz", "qual_name_offset": 10, "short_name": "fbz", - "kind": 252, - "declarations": ["9:11-9:14|9:1-9:30|0|1|1|-1"], - "alias_of": 14450849931009540802, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 14450849931009540802, + "kind": 252, + "parent_kind": 0, + "declarations": ["9:11-9:14|9:1-9:30|1|-1"], + "derived": [], "instances": [], - "uses": ["13:11-13:14|10818727483146447186|3|4|-1"] + "uses": ["13:11-13:14|4|-1"] }, { "usr": 14450849931009540802, "detailed_name": "namespace foo::bar::baz {}", "qual_name_offset": 10, "short_name": "baz", - "kind": 3, - "declarations": ["3:20-3:23|3:10-5:11|17805385787823406700|2|1025|-1"], - "alias_of": 0, "bases": [17805385787823406700], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 15042442838933090518, "R": -1 }], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["3:20-3:23|3:10-5:11|1025|-1"], + "derived": [], "instances": [], - "uses": ["9:27-9:30|0|1|4|-1", "12:21-12:24|10818727483146447186|3|4|-1"] + "uses": ["9:27-9:30|4|-1", "12:21-12:24|4|-1"] }, { "usr": 17805385787823406700, "detailed_name": "namespace foo::bar {}", "qual_name_offset": 10, "short_name": "bar", - "kind": 3, - "declarations": ["2:15-2:18|2:5-6:6|926793467007732869|2|1025|-1"], - "alias_of": 0, "bases": [926793467007732869], - "derived": [14450849931009540802], - "types": [14450849931009540802], "funcs": [], + "types": [14450849931009540802], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["2:15-2:18|2:5-6:6|1025|-1"], + "derived": [14450849931009540802], "instances": [], - "uses": ["9:22-9:25|0|1|4|-1", "12:16-12:19|10818727483146447186|3|4|-1"] + "uses": ["9:22-9:25|4|-1", "12:16-12:19|4|-1"] }], "usr2var": [{ "usr": 6030927277961448585, @@ -119,39 +124,39 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "hover": "int a = foo::bar::baz::qux", - "declarations": [], - "spell": "12:7-12:8|10818727483146447186|3|2|-1", - "extent": "12:3-12:29|10818727483146447186|3|0|-1", + "spell": "12:7-12:8|12:3-12:29|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 7657277353101371136, "detailed_name": "int b", "qual_name_offset": 4, "short_name": "b", "hover": "int b = fbz::qux", - "declarations": [], - "spell": "13:7-13:8|10818727483146447186|3|2|-1", - "extent": "13:3-13:19|10818727483146447186|3|0|-1", + "spell": "13:7-13:8|13:3-13:19|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15042442838933090518, "detailed_name": "int foo::bar::baz::qux", "qual_name_offset": 4, "short_name": "qux", "hover": "int foo::bar::baz::qux = 42", - "declarations": [], - "spell": "4:18-4:21|14450849931009540802|2|1026|-1", - "extent": "4:14-4:26|14450849931009540802|2|0|-1", + "spell": "4:18-4:21|4:14-4:26|1026|-1", "type": 53, - "uses": ["12:26-12:29|10818727483146447186|3|12|-1", "13:16-13:19|10818727483146447186|3|12|-1"], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": ["12:26-12:29|12|-1", "13:16-13:19|12|-1"] }] } */ diff --git a/index_tests/namespaces/namespace_reference.cc b/index_tests/namespaces/namespace_reference.cc index 4565040d..f90fd4b0 100644 --- a/index_tests/namespaces/namespace_reference.cc +++ b/index_tests/namespaces/namespace_reference.cc @@ -19,45 +19,46 @@ OUTPUT: "detailed_name": "void Runner()", "qual_name_offset": 5, "short_name": "Runner", + "spell": "6:6-6:12|6:1-10:2|2|-1", + "bases": [], + "vars": [], + "callees": ["7:7-7:13|17328473273923617489|3|16420", "9:3-9:9|17328473273923617489|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "6:6-6:12|0|1|2|-1", - "extent": "6:1-10:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["7:7-7:13|17328473273923617489|3|16420", "9:3-9:9|17328473273923617489|3|16420"] + "uses": [] }, { "usr": 17328473273923617489, "detailed_name": "void ns::Accept(int a)", "qual_name_offset": 5, "short_name": "Accept", + "spell": "3:8-3:14|3:3-3:24|1026|-1", + "bases": [], + "vars": [3649375698083002347], + "callees": [], "kind": 12, + "parent_kind": 3, "storage": 0, "declarations": [], - "spell": "3:8-3:14|11072669167287398027|2|1026|-1", - "extent": "3:3-3:24|11072669167287398027|2|0|-1", - "bases": [], "derived": [], - "vars": [3649375698083002347], - "uses": ["7:7-7:13|631910859630953711|3|16420|-1", "9:3-9:9|631910859630953711|3|16420|-1"], - "callees": [] + "uses": ["7:7-7:13|16420|-1", "9:3-9:9|16420|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [12898699035586282159, 3649375698083002347], "uses": [] }, { @@ -65,44 +66,45 @@ OUTPUT: "detailed_name": "namespace ns {}", "qual_name_offset": 10, "short_name": "ns", - "kind": 3, - "declarations": ["1:11-1:13|1:1-4:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [17328473273923617489], + "types": [], "vars": [{ "L": 12898699035586282159, "R": -1 }], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:13|1:1-4:2|1|-1"], + "derived": [], "instances": [], - "uses": ["7:3-7:5|631910859630953711|3|4|-1", "7:14-7:16|631910859630953711|3|4|-1", "8:19-8:21|631910859630953711|3|4|-1"] + "uses": ["7:3-7:5|4|-1", "7:14-7:16|4|-1", "8:19-8:21|4|-1"] }], "usr2var": [{ "usr": 3649375698083002347, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "3:19-3:20|17328473273923617489|3|1026|-1", - "extent": "3:15-3:20|17328473273923617489|3|0|-1", + "spell": "3:19-3:20|3:15-3:20|1026|-1", "type": 53, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 12898699035586282159, "detailed_name": "int ns::Foo", "qual_name_offset": 4, "short_name": "Foo", - "declarations": [], - "spell": "2:7-2:10|11072669167287398027|2|1026|-1", - "extent": "2:3-2:10|11072669167287398027|2|0|-1", + "spell": "2:7-2:10|2:3-2:10|1026|-1", "type": 53, - "uses": ["7:18-7:21|631910859630953711|3|12|-1", "9:10-9:13|631910859630953711|3|12|-1"], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": ["7:18-7:21|12|-1", "9:10-9:13|12|-1"] }] } */ diff --git a/index_tests/operators/operator.cc b/index_tests/operators/operator.cc index 009db1c0..0640a220 100644 --- a/index_tests/operators/operator.cc +++ b/index_tests/operators/operator.cc @@ -16,73 +16,76 @@ OUTPUT: "detailed_name": "void Foo::operator()(bool)", "qual_name_offset": 5, "short_name": "operator()", - "kind": 6, - "storage": 0, - "declarations": ["3:8-3:16|3:3-3:24|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:8-3:16|3:3-3:24|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 3986818119971932909, "detailed_name": "int Foo::operator()(int a, int b)", "qual_name_offset": 4, "short_name": "operator()", - "kind": 6, - "storage": 0, - "declarations": ["4:7-4:15|4:3-4:31|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["4:7-4:15|4:3-4:31|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 7874436189163837815, "detailed_name": "void Foo::operator()(int)", "qual_name_offset": 5, "short_name": "operator()", + "spell": "2:8-2:18|2:3-2:27|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "2:8-2:18|15041163540773201510|2|1026|-1", - "extent": "2:3-2:27|15041163540773201510|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 8288368475529136092, "detailed_name": "Foo &operator+=(const Foo &, const int &)", "qual_name_offset": 5, "short_name": "operator+=", - "kind": 12, - "storage": 0, - "declarations": ["7:6-7:14|7:1-7:42|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["7:6-7:14|7:1-7:42|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [7874436189163837815, 3545323327609582678, 3986818119971932909], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:1-7:4|0|1|4|-1", "7:25-7:28|0|1|4|-1"] + "uses": ["7:1-7:4|4|-1", "7:25-7:28|4|-1"] }], "usr2var": [] } diff --git a/index_tests/outline/static_function_in_type.cc b/index_tests/outline/static_function_in_type.cc index c29aae07..7120de03 100644 --- a/index_tests/outline/static_function_in_type.cc +++ b/index_tests/outline/static_function_in_type.cc @@ -16,43 +16,46 @@ OUTPUT: static_function_in_type.h "detailed_name": "static void ns::Foo::Register(ns::Manager *)", "qual_name_offset": 12, "short_name": "Register", - "kind": 254, - "storage": 0, - "declarations": ["6:15-6:23|6:3-6:33|17262466801709381811|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 254, + "parent_kind": 0, + "storage": 0, + "declarations": ["6:15-6:23|6:3-6:33|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 1972401196751872203, "detailed_name": "class ns::Manager", "qual_name_offset": 6, "short_name": "Manager", - "kind": 5, - "declarations": ["3:7-3:14|3:1-3:14|11072669167287398027|2|1025|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["3:7-3:14|3:1-3:14|1025|-1"], + "derived": [], "instances": [], - "uses": ["6:24-6:31|17262466801709381811|2|4|-1"] + "uses": ["6:24-6:31|4|-1"] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {}", "qual_name_offset": 10, "short_name": "ns", - "kind": 3, - "declarations": ["1:11-1:13|1:1-9:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [1972401196751872203, 17262466801709381811], "funcs": [], + "types": [1972401196751872203, 17262466801709381811], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:13|1:1-9:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -60,16 +63,16 @@ OUTPUT: static_function_in_type.h "detailed_name": "struct ns::Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "5:8-5:11|11072669167287398027|2|1026|-1", - "extent": "5:1-7:2|11072669167287398027|2|0|-1", - "alias_of": 0, + "spell": "5:8-5:11|5:1-7:2|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [17019747379608639279], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -87,46 +90,48 @@ OUTPUT: static_function_in_type.cc "detailed_name": "static void ns::Foo::Register(ns::Manager *)", "qual_name_offset": 12, "short_name": "Register", - "kind": 254, - "storage": 0, + "spell": "5:11-5:19|5:1-6:2|1026|-1", "comments": "static", - "declarations": [], - "spell": "5:11-5:19|17262466801709381811|2|1026|-1", - "extent": "5:1-6:2|17262466801709381811|2|0|-1", "bases": [], - "derived": [], "vars": [13569879755236306838], - "uses": [], - "callees": [] + "callees": [], + "kind": 254, + "parent_kind": 23, + "storage": 0, + "declarations": [], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 1972401196751872203, "detailed_name": "class ns::Manager", "qual_name_offset": 6, "short_name": "Manager", - "kind": 5, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [13569879755236306838], - "uses": ["5:20-5:27|11072669167287398027|2|4|-1"] + "uses": ["5:20-5:27|4|-1"] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {}", "qual_name_offset": 10, "short_name": "ns", - "kind": 3, - "declarations": ["3:11-3:13|3:1-7:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["3:11-3:13|3:1-7:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -134,29 +139,30 @@ OUTPUT: static_function_in_type.cc "detailed_name": "struct ns::Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [17019747379608639279], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:6-5:9|11072669167287398027|2|4|-1"] + "uses": ["5:6-5:9|4|-1"] }], "usr2var": [{ "usr": 13569879755236306838, "detailed_name": "ns::Manager *m", "qual_name_offset": 13, "short_name": "m", - "declarations": [], - "spell": "5:29-5:30|17019747379608639279|3|1026|-1", - "extent": "5:20-5:30|17019747379608639279|3|0|-1", + "spell": "5:29-5:30|5:20-5:30|1026|-1", "type": 1972401196751872203, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 254, + "storage": 0, + "declarations": [], + "uses": [] }] } */ \ No newline at end of file diff --git a/index_tests/preprocessor/include_guard.cc b/index_tests/preprocessor/include_guard.cc index d9d069f7..efee4de5 100644 --- a/index_tests/preprocessor/include_guard.cc +++ b/index_tests/preprocessor/include_guard.cc @@ -16,13 +16,13 @@ OUTPUT: "qual_name_offset": 0, "short_name": "FOO", "hover": "#define FOO", - "declarations": [], - "spell": "2:9-2:12|0|1|2|-1", - "extent": "2:9-2:12|0|1|0|-1", + "spell": "2:9-2:12|2:9-2:12|2|-1", "type": 0, - "uses": [], "kind": 255, - "storage": 0 + "parent_kind": 1, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/func_specialized_template_param.cc b/index_tests/templates/func_specialized_template_param.cc index af88d365..0cb68a03 100644 --- a/index_tests/templates/func_specialized_template_param.cc +++ b/index_tests/templates/func_specialized_template_param.cc @@ -17,51 +17,51 @@ OUTPUT: "detailed_name": "void Foo::Bar(Template &)", "qual_name_offset": 5, "short_name": "Bar", - "kind": 6, - "storage": 0, - "declarations": ["5:8-5:11|5:3-5:30|15041163540773201510|2|1025|-1"], - "spell": "8:11-8:14|15041163540773201510|2|1026|-1", - "extent": "8:1-8:36|15041163540773201510|2|0|-1", + "spell": "8:11-8:14|8:1-8:36|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 23, + "storage": 0, + "declarations": ["5:8-5:11|5:3-5:30|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "4:8-4:11|0|1|2|-1", - "extent": "4:1-6:2|0|1|0|-1", - "alias_of": 0, + "spell": "4:8-4:11|4:1-6:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [8412238651648388423], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["8:6-8:9|0|1|4|-1"] + "uses": ["8:6-8:9|4|-1"] }, { "usr": 17107291254533526269, "detailed_name": "class Template {}", "qual_name_offset": 6, "short_name": "Template", - "kind": 5, - "declarations": [], - "spell": "2:7-2:15|0|1|2|-1", - "extent": "2:1-2:18|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:15|2:1-2:18|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:12-5:20|15041163540773201510|2|4|-1", "8:15-8:23|0|1|4|-1"] + "uses": ["5:12-5:20|4|-1", "8:15-8:23|4|-1"] }], "usr2var": [] } diff --git a/index_tests/templates/implicit_variable_instantiation.cc b/index_tests/templates/implicit_variable_instantiation.cc index 6548d39b..b0244358 100644 --- a/index_tests/templates/implicit_variable_instantiation.cc +++ b/index_tests/templates/implicit_variable_instantiation.cc @@ -25,14 +25,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [12898699035586282159, 9008550860229740818], "uses": [] }, { @@ -40,30 +41,26 @@ OUTPUT: "detailed_name": "enum ns::VarType {}", "qual_name_offset": 5, "short_name": "VarType", - "kind": 10, - "declarations": [], - "spell": "2:8-2:15|11072669167287398027|2|1026|-1", - "extent": "2:3-2:18|11072669167287398027|2|0|-1", - "alias_of": 0, + "spell": "2:8-2:15|2:3-2:18|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [4731849186641714451, 4731849186641714451], - "uses": ["6:22-6:29|12688716854043726585|2|4|-1", "6:44-6:51|12688716854043726585|2|4|-1", "10:18-10:25|11072669167287398027|2|4|-1"] + "uses": ["6:22-6:29|4|-1", "6:44-6:51|4|-1", "10:18-10:25|4|-1"] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {}", "qual_name_offset": 10, "short_name": "ns", - "kind": 3, - "declarations": ["1:11-1:13|1:1-15:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [1532099849728741556, 12688716854043726585], "funcs": [], + "types": [1532099849728741556, 12688716854043726585], "vars": [{ "L": 12898699035586282159, "R": -1 @@ -71,6 +68,11 @@ OUTPUT: "L": 9008550860229740818, "R": -1 }], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:13|1:1-15:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -78,18 +80,18 @@ OUTPUT: "detailed_name": "struct ns::Holder {}", "qual_name_offset": 7, "short_name": "Holder", - "kind": 23, - "declarations": [], - "spell": "5:10-5:16|11072669167287398027|2|1026|-1", - "extent": "5:3-7:4|11072669167287398027|2|0|-1", - "alias_of": 0, + "spell": "5:10-5:16|5:3-7:4|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [], - "uses": ["10:26-10:32|11072669167287398027|2|4|-1", "13:13-13:19|11072669167287398027|2|4|-1", "14:14-14:20|11072669167287398027|2|4|-1"] + "uses": ["10:26-10:32|4|-1", "13:13-13:19|4|-1", "14:14-14:20|4|-1"] }], "usr2var": [{ "usr": 4731849186641714451, @@ -97,39 +99,39 @@ OUTPUT: "qual_name_offset": 29, "short_name": "static_var", "hover": "static constexpr ns::VarType ns::Holder::static_var = (VarType)0x0", - "declarations": ["6:30-6:40|6:5-6:55|12688716854043726585|2|1025|-1"], - "spell": "10:37-10:47|12688716854043726585|2|1026|-1", - "extent": "9:3-10:47|12688716854043726585|2|0|-1", + "spell": "10:37-10:47|9:3-10:47|1026|-1", "type": 1532099849728741556, - "uses": ["13:26-13:36|11072669167287398027|2|12|-1", "14:27-14:37|11072669167287398027|2|12|-1"], "kind": 13, - "storage": 2 + "parent_kind": 23, + "storage": 2, + "declarations": ["6:30-6:40|6:5-6:55|1025|-1"], + "uses": ["13:26-13:36|12|-1", "14:27-14:37|12|-1"] }, { "usr": 9008550860229740818, "detailed_name": "int ns::Foo2", "qual_name_offset": 4, "short_name": "Foo2", "hover": "int ns::Foo2 = Holder::static_var", - "declarations": [], - "spell": "14:7-14:11|11072669167287398027|2|1026|-1", - "extent": "14:3-14:37|11072669167287398027|2|0|-1", + "spell": "14:7-14:11|14:3-14:37|1026|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 12898699035586282159, "detailed_name": "int ns::Foo", "qual_name_offset": 4, "short_name": "Foo", "hover": "int ns::Foo = Holder::static_var", - "declarations": [], - "spell": "13:7-13:10|11072669167287398027|2|1026|-1", - "extent": "13:3-13:36|11072669167287398027|2|0|-1", + "spell": "13:7-13:10|13:3-13:36|1026|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/member_ref_in_template.cc b/index_tests/templates/member_ref_in_template.cc index 312441e2..c9cc268e 100644 --- a/index_tests/templates/member_ref_in_template.cc +++ b/index_tests/templates/member_ref_in_template.cc @@ -30,48 +30,49 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "8:6-8:9|8:1-8:11|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "8:6-8:9|0|1|2|-1", - "extent": "8:1-8:11|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 8905286151237717330, "detailed_name": "void C::bar()", "qual_name_offset": 5, "short_name": "bar", - "kind": 6, - "storage": 0, - "declarations": ["4:8-4:11|4:3-4:13|8402783583255987702|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["4:8-4:11|4:3-4:13|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 8402783583255987702, "detailed_name": "struct C {}", "qual_name_offset": 7, "short_name": "C", - "kind": 23, - "declarations": [], - "spell": "2:8-2:9|0|1|2|-1", - "extent": "2:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:9|2:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [8905286151237717330], + "types": [], "vars": [{ "L": 5866801090710377175, "R": -1 }], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -79,16 +80,16 @@ OUTPUT: "detailed_name": "T", "qual_name_offset": 0, "short_name": "T", - "kind": 26, - "declarations": [], - "spell": "1:17-1:18|8402783583255987702|2|2|-1", - "extent": "1:11-1:18|8402783583255987702|2|0|-1", - "alias_of": 0, + "spell": "1:17-1:18|1:11-1:18|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 5, + "declarations": [], + "derived": [], "instances": [5866801090710377175], "uses": [] }], @@ -97,13 +98,13 @@ OUTPUT: "detailed_name": "T C::x", "qual_name_offset": 2, "short_name": "x", - "declarations": [], - "spell": "3:5-3:6|8402783583255987702|2|1026|-1", - "extent": "3:3-3:6|8402783583255987702|2|0|-1", + "spell": "3:5-3:6|3:3-3:6|1026|-1", "type": 14750650276757822712, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc b/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc index a9005f18..de9c3143 100644 --- a/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc +++ b/index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc @@ -21,30 +21,31 @@ OUTPUT: "detailed_name": "static int ns::Foo::foo()", "qual_name_offset": 11, "short_name": "foo", + "spell": "5:16-5:19|5:5-7:6|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 254, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "5:16-5:19|14042997404480181958|2|1026|-1", - "extent": "5:5-7:6|14042997404480181958|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["10:21-10:24|11072669167287398027|2|36|-1", "11:22-11:25|11072669167287398027|2|36|-1"], - "callees": [] + "uses": ["10:21-10:24|36|-1", "11:22-11:25|36|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [15768138241775955040, 3182917058194750998], "uses": [] }, { @@ -52,13 +53,9 @@ OUTPUT: "detailed_name": "namespace ns {}", "qual_name_offset": 10, "short_name": "ns", - "kind": 3, - "declarations": ["1:11-1:13|1:1-12:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [14042997404480181958], "funcs": [], + "types": [14042997404480181958], "vars": [{ "L": 15768138241775955040, "R": -1 @@ -66,6 +63,11 @@ OUTPUT: "L": 3182917058194750998, "R": -1 }], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:13|1:1-12:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -73,18 +75,18 @@ OUTPUT: "detailed_name": "struct ns::Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "3:10-3:13|11072669167287398027|2|1026|-1", - "extent": "3:3-8:4|11072669167287398027|2|0|-1", - "alias_of": 0, + "spell": "3:10-3:13|3:3-8:4|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [8221803074608342407], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [], - "uses": ["10:11-10:14|11072669167287398027|2|4|-1", "11:11-11:14|11072669167287398027|2|4|-1"] + "uses": ["10:11-10:14|4|-1", "11:11-11:14|4|-1"] }], "usr2var": [{ "usr": 3182917058194750998, @@ -92,26 +94,26 @@ OUTPUT: "qual_name_offset": 4, "short_name": "b", "hover": "int ns::b = Foo::foo()", - "declarations": [], - "spell": "11:7-11:8|11072669167287398027|2|1026|-1", - "extent": "11:3-11:35|11072669167287398027|2|0|-1", + "spell": "11:7-11:8|11:3-11:35|1026|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15768138241775955040, "detailed_name": "int ns::a", "qual_name_offset": 4, "short_name": "a", "hover": "int ns::a = Foo::foo()", - "declarations": [], - "spell": "10:7-10:8|11072669167287398027|2|1026|-1", - "extent": "10:3-10:33|11072669167287398027|2|0|-1", + "spell": "10:7-10:8|10:3-10:33|1026|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/namespace_template_type_usage_folded_into_one.cc b/index_tests/templates/namespace_template_type_usage_folded_into_one.cc index b3144b08..e8c8367c 100644 --- a/index_tests/templates/namespace_template_type_usage_folded_into_one.cc +++ b/index_tests/templates/namespace_template_type_usage_folded_into_one.cc @@ -17,13 +17,9 @@ OUTPUT: "detailed_name": "namespace ns {}", "qual_name_offset": 10, "short_name": "ns", - "kind": 3, - "declarations": ["1:11-1:13|1:1-7:2|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [14042997404480181958], "funcs": [], + "types": [14042997404480181958], "vars": [{ "L": 15768138241775955040, "R": -1 @@ -31,6 +27,11 @@ OUTPUT: "L": 3182917058194750998, "R": -1 }], + "alias_of": 0, + "kind": 3, + "parent_kind": 0, + "declarations": ["1:11-1:13|1:1-7:2|1|-1"], + "derived": [], "instances": [], "uses": [] }, { @@ -38,43 +39,43 @@ OUTPUT: "detailed_name": "class ns::Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "3:9-3:12|11072669167287398027|2|1026|-1", - "extent": "3:3-3:15|11072669167287398027|2|0|-1", - "alias_of": 0, + "spell": "3:9-3:12|3:3-3:15|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 3, + "declarations": [], + "derived": [], "instances": [15768138241775955040, 3182917058194750998], - "uses": ["5:3-5:6|11072669167287398027|2|4|-1", "6:3-6:6|11072669167287398027|2|4|-1"] + "uses": ["5:3-5:6|4|-1", "6:3-6:6|4|-1"] }], "usr2var": [{ "usr": 3182917058194750998, "detailed_name": "Foo ns::b", "qual_name_offset": 10, "short_name": "b", - "declarations": [], - "spell": "6:13-6:14|11072669167287398027|2|1026|-1", - "extent": "6:3-6:14|11072669167287398027|2|0|-1", + "spell": "6:13-6:14|6:3-6:14|1026|-1", "type": 14042997404480181958, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15768138241775955040, "detailed_name": "Foo ns::a", "qual_name_offset": 9, "short_name": "a", - "declarations": [], - "spell": "5:12-5:13|11072669167287398027|2|1026|-1", - "extent": "5:3-5:13|11072669167287398027|2|0|-1", + "spell": "5:12-5:13|5:3-5:13|1026|-1", "type": 14042997404480181958, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 3, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/specialization.cc b/index_tests/templates/specialization.cc index 52cfe543..4b414b7d 100644 --- a/index_tests/templates/specialization.cc +++ b/index_tests/templates/specialization.cc @@ -52,69 +52,73 @@ OUTPUT: "detailed_name": "template<> void foo(float Value)", "qual_name_offset": 16, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["43:6-43:9|42:1-43:50|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["43:6-43:9|42:1-43:50|1|-1"], + "derived": [], + "uses": [] }, { "usr": 6113470698424012876, "detailed_name": "void vector >::clear()", "qual_name_offset": 5, "short_name": "clear", - "kind": 6, - "storage": 0, - "declarations": ["27:8-27:13|27:3-27:15|1663022413889915338|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["27:8-27:13|27:3-27:15|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 17498190318698490707, "detailed_name": "void foo(T Value)", "qual_name_offset": 5, "short_name": "foo", + "spell": "39:6-39:9|39:1-39:21|2|-1", + "bases": [], + "vars": [17826688417349629938], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "39:6-39:9|0|1|2|-1", - "extent": "39:1-39:21|0|1|0|-1", - "bases": [], "derived": [], - "vars": [17826688417349629938], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 18107614608385228556, "detailed_name": "void vector::clear()", "qual_name_offset": 5, "short_name": "clear", - "kind": 6, - "storage": 0, - "declarations": ["13:8-13:13|13:3-13:15|7440942986741176606|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["13:8-13:13|13:3-13:15|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [13914496963221806870], "uses": [] }, { @@ -122,84 +126,84 @@ OUTPUT: "detailed_name": "template class function {}", "qual_name_offset": 46, "short_name": "function", - "kind": 5, - "declarations": [], - "spell": "5:7-5:15|0|1|2|-1", - "extent": "4:1-5:30|0|1|0|-1", - "alias_of": 0, + "spell": "5:7-5:15|4:1-5:30|2|-1", "bases": [15019211479263750068], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [2933643612409209903], - "uses": ["7:1-7:9|0|1|4|-1"] + "uses": ["7:1-7:9|4|-1"] }, { "usr": 1663022413889915338, "detailed_name": "template<> class vector> {}", "qual_name_offset": 17, "short_name": "vector", - "kind": 5, - "declarations": [], - "spell": "26:7-26:13|0|1|2|-1", - "extent": "25:1-28:2|0|1|0|-1", - "alias_of": 0, + "spell": "26:7-26:13|25:1-28:2|2|-1", "bases": [7440942986741176606], - "derived": [], - "types": [], "funcs": [6113470698424012876], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [15931696253641284761], - "uses": ["26:7-26:13|0|1|4|-1", "33:1-33:7|0|1|4|-1"] + "uses": ["26:7-26:13|4|-1", "33:1-33:7|4|-1"] }, { "usr": 5760043510674081814, "detailed_name": "struct Z1 {}", "qual_name_offset": 7, "short_name": "Z1", - "kind": 23, - "declarations": [], - "spell": "19:8-19:10|0|1|2|-1", - "extent": "19:1-19:13|0|1|0|-1", - "alias_of": 0, + "spell": "19:8-19:10|19:1-19:13|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["21:23-21:25|0|1|4|-1", "32:8-32:10|0|1|4|-1"] + "uses": ["21:23-21:25|4|-1", "32:8-32:10|4|-1"] }, { "usr": 7440942986741176606, "detailed_name": "class vector {}", "qual_name_offset": 6, "short_name": "vector", - "kind": 5, - "declarations": [], - "spell": "12:7-12:13|0|1|2|-1", - "extent": "12:1-14:2|0|1|0|-1", - "alias_of": 0, + "spell": "12:7-12:13|12:1-14:2|2|-1", "bases": [], - "derived": [16155717907537731864, 1663022413889915338], - "types": [], "funcs": [18107614608385228556], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [16155717907537731864, 1663022413889915338], "instances": [5792869548777559988], - "uses": ["21:16-21:22|0|1|4|-1", "30:1-30:7|0|1|4|-1", "32:1-32:7|0|1|4|-1"] + "uses": ["17:7-17:13|4|-1", "21:16-21:22|4|-1", "30:1-30:7|4|-1", "32:1-32:7|4|-1"] }, { "usr": 9201299975592934124, "detailed_name": "enum Enum {}", "qual_name_offset": 5, "short_name": "Enum", - "kind": 10, - "declarations": [], - "spell": "35:6-35:10|0|1|2|-1", - "extent": "35:1-37:2|0|1|0|-1", - "alias_of": 0, + "spell": "35:6-35:10|35:1-37:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -207,33 +211,33 @@ OUTPUT: "detailed_name": "struct Z2 {}", "qual_name_offset": 7, "short_name": "Z2", - "kind": 23, - "declarations": [], - "spell": "23:8-23:10|0|1|2|-1", - "extent": "23:1-23:13|0|1|0|-1", - "alias_of": 0, + "spell": "23:8-23:10|23:1-23:13|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["26:14-26:16|0|1|4|-1", "33:8-33:10|0|1|4|-1"] + "uses": ["26:14-26:16|4|-1", "33:8-33:10|4|-1"] }, { "usr": 14111105212951082474, "detailed_name": "T", "qual_name_offset": 0, "short_name": "T", - "kind": 26, - "declarations": [], - "spell": "38:20-38:21|17498190318698490707|3|2|-1", - "extent": "38:11-38:21|17498190318698490707|3|0|-1", - "alias_of": 0, + "spell": "38:20-38:21|38:11-38:21|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 5, + "declarations": [], + "derived": [], "instances": [17826688417349629938], "uses": [] }, { @@ -241,29 +245,31 @@ OUTPUT: "detailed_name": "class function", "qual_name_offset": 6, "short_name": "function", - "kind": 5, - "declarations": ["2:7-2:15|2:1-2:15|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [218068462278884837], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["2:7-2:15|2:1-2:15|1|-1"], + "derived": [218068462278884837], "instances": [], - "uses": [] + "uses": ["5:7-5:15|4|-1"] }, { "usr": 15440970074034693939, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [3566687051827176322], "uses": [] }, { @@ -271,145 +277,146 @@ OUTPUT: "detailed_name": "class allocator", "qual_name_offset": 6, "short_name": "allocator", - "kind": 5, - "declarations": ["9:28-9:37|9:22-9:37|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["9:28-9:37|9:22-9:37|1|-1"], + "derived": [], "instances": [], - "uses": [] + "uses": ["11:39-11:48|4|-1"] }, { "usr": 16155717907537731864, "detailed_name": "template class vector> {}", "qual_name_offset": 28, "short_name": "vector", - "kind": 5, - "declarations": [], - "spell": "17:7-17:13|0|1|2|-1", - "extent": "16:1-17:20|0|1|0|-1", - "alias_of": 0, + "spell": "17:7-17:13|16:1-17:20|2|-1", "bases": [7440942986741176606], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [86949563628772958], - "uses": ["31:1-31:7|0|1|4|-1"] + "uses": ["31:1-31:7|4|-1"] }], "usr2var": [{ "usr": 86949563628772958, "detailed_name": "vector vip", "qual_name_offset": 14, "short_name": "vip", - "declarations": [], - "spell": "31:14-31:17|0|1|2|-1", - "extent": "31:1-31:17|0|1|0|-1", + "spell": "31:14-31:17|31:1-31:17|2|-1", "type": 16155717907537731864, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 2933643612409209903, "detailed_name": "function f", "qual_name_offset": 21, "short_name": "f", - "declarations": [], - "spell": "7:21-7:22|0|1|2|-1", - "extent": "7:1-7:22|0|1|0|-1", + "spell": "7:21-7:22|7:1-7:22|2|-1", "type": 218068462278884837, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 3566687051827176322, "detailed_name": "vector vz1", "qual_name_offset": 11, "short_name": "vz1", - "declarations": [], - "spell": "32:12-32:15|0|1|2|-1", - "extent": "32:1-32:15|0|1|0|-1", + "spell": "32:12-32:15|32:1-32:15|2|-1", "type": 15440970074034693939, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 4917621020431490070, "detailed_name": "Enum1", "qual_name_offset": 0, "short_name": "Enum1", "hover": "Enum1 = 1", - "declarations": [], - "spell": "36:10-36:15|9201299975592934124|2|1026|-1", - "extent": "36:10-36:15|9201299975592934124|2|0|-1", + "spell": "36:10-36:15|36:10-36:15|1026|-1", "type": 0, - "uses": [], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 5792869548777559988, "detailed_name": "vector vc", "qual_name_offset": 13, "short_name": "vc", - "declarations": [], - "spell": "30:14-30:16|0|1|2|-1", - "extent": "30:1-30:16|0|1|0|-1", + "spell": "30:14-30:16|30:1-30:16|2|-1", "type": 7440942986741176606, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 13914496963221806870, "detailed_name": "static const int kOnst", "qual_name_offset": 17, "short_name": "kOnst", "hover": "static const int kOnst = 7", - "declarations": [], - "spell": "41:18-41:23|0|1|2|-1", - "extent": "41:1-41:27|0|1|0|-1", + "spell": "41:18-41:23|41:1-41:27|2|-1", "type": 53, - "uses": ["43:27-43:32|0|1|12|-1"], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": ["43:27-43:32|12|-1"] }, { "usr": 15477793821005285152, "detailed_name": "Enum0", "qual_name_offset": 0, "short_name": "Enum0", "hover": "Enum0 = 0", - "declarations": [], - "spell": "36:3-36:8|9201299975592934124|2|1026|-1", - "extent": "36:3-36:8|9201299975592934124|2|0|-1", + "spell": "36:3-36:8|36:3-36:8|1026|-1", "type": 0, - "uses": ["43:20-43:25|0|1|4|-1"], "kind": 22, - "storage": 0 + "parent_kind": 10, + "storage": 0, + "declarations": [], + "uses": ["43:20-43:25|4|-1"] }, { "usr": 15931696253641284761, "detailed_name": "vector vz2", "qual_name_offset": 11, "short_name": "vz2", - "declarations": [], - "spell": "33:12-33:15|0|1|2|-1", - "extent": "33:1-33:15|0|1|0|-1", + "spell": "33:12-33:15|33:1-33:15|2|-1", "type": 1663022413889915338, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 17826688417349629938, "detailed_name": "T Value", "qual_name_offset": 2, "short_name": "Value", - "declarations": [], - "spell": "39:12-39:17|17498190318698490707|3|1026|-1", - "extent": "39:10-39:17|17498190318698490707|3|0|-1", + "spell": "39:12-39:17|39:10-39:17|1026|-1", "type": 14111105212951082474, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/specialized_func_definition.cc b/index_tests/templates/specialized_func_definition.cc index 1397ba80..c57b35ff 100644 --- a/index_tests/templates/specialized_func_definition.cc +++ b/index_tests/templates/specialized_func_definition.cc @@ -27,62 +27,63 @@ OUTPUT: "detailed_name": "void Template::Foo()", "qual_name_offset": 5, "short_name": "Foo", + "spell": "10:22-10:25|9:1-10:30|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 6, + "parent_kind": 5, "storage": 0, "declarations": [], - "spell": "10:22-10:25|17649312483543982122|2|1026|-1", - "extent": "9:1-10:30|17649312483543982122|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 11994188353303124840, "detailed_name": "void Template::Foo()", "qual_name_offset": 5, "short_name": "Foo", - "kind": 6, - "storage": 0, - "declarations": ["3:8-3:11|3:3-3:13|17107291254533526269|2|1025|-1"], - "spell": "7:19-7:22|17107291254533526269|2|1026|-1", - "extent": "6:1-7:24|17107291254533526269|2|0|-1", + "spell": "7:19-7:22|6:1-7:24|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["3:8-3:11|3:3-3:13|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 17107291254533526269, "detailed_name": "class Template {}", "qual_name_offset": 6, "short_name": "Template", - "kind": 5, - "declarations": [], - "spell": "2:7-2:15|0|1|2|-1", - "extent": "2:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:15|2:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [11994188353303124840], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:6-7:14|0|1|4|-1", "10:6-10:14|0|1|4|-1"] + "uses": ["7:6-7:14|4|-1", "10:6-10:14|4|-1"] }, { "usr": 17649312483543982122, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [6995843774014807426], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/templates/template_class_func_usage_folded_into_one.cc b/index_tests/templates/template_class_func_usage_folded_into_one.cc index 2297d996..6efb299e 100644 --- a/index_tests/templates/template_class_func_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_func_usage_folded_into_one.cc @@ -18,30 +18,31 @@ OUTPUT: "detailed_name": "static int Foo::foo()", "qual_name_offset": 11, "short_name": "foo", + "spell": "3:14-3:17|3:3-5:4|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 254, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "3:14-3:17|10528472276654770367|2|1026|-1", - "extent": "3:3-5:4|10528472276654770367|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["8:19-8:22|0|1|36|-1", "9:20-9:23|0|1|36|-1"], - "callees": [] + "uses": ["8:19-8:22|36|-1", "9:20-9:23|36|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16721564935990383768, 12028309045033782423], "uses": [] }, { @@ -49,18 +50,18 @@ OUTPUT: "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "2:8-2:11|0|1|2|-1", - "extent": "2:1-6:2|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:11|2:1-6:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [8340731781048851399], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["8:9-8:12|0|1|4|-1", "9:9-9:12|0|1|4|-1"] + "uses": ["8:9-8:12|4|-1", "9:9-9:12|4|-1"] }], "usr2var": [{ "usr": 12028309045033782423, @@ -68,26 +69,26 @@ OUTPUT: "qual_name_offset": 4, "short_name": "b", "hover": "int b = Foo::foo()", - "declarations": [], - "spell": "9:5-9:6|0|1|2|-1", - "extent": "9:1-9:25|0|1|0|-1", + "spell": "9:5-9:6|9:1-9:25|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", "hover": "int a = Foo::foo()", - "declarations": [], - "spell": "8:5-8:6|0|1|2|-1", - "extent": "8:1-8:24|0|1|0|-1", + "spell": "8:5-8:6|8:1-8:24|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/template_class_template_func_usage_folded_into_one.cc b/index_tests/templates/template_class_template_func_usage_folded_into_one.cc index 3fcb3672..c364718f 100644 --- a/index_tests/templates/template_class_template_func_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_template_func_usage_folded_into_one.cc @@ -19,30 +19,31 @@ OUTPUT: "detailed_name": "static int Foo::foo()", "qual_name_offset": 11, "short_name": "foo", + "spell": "4:14-4:17|4:3-6:4|1026|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 254, + "parent_kind": 23, "storage": 0, "declarations": [], - "spell": "4:14-4:17|10528472276654770367|2|1026|-1", - "extent": "4:3-6:4|10528472276654770367|2|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["9:19-9:22|0|1|36|-1", "10:20-10:23|0|1|36|-1"], - "callees": [] + "uses": ["9:19-9:22|36|-1", "10:20-10:23|36|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16721564935990383768, 12028309045033782423], "uses": [] }, { @@ -50,18 +51,18 @@ OUTPUT: "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "2:8-2:11|0|1|2|-1", - "extent": "2:1-7:2|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:11|2:1-7:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [9034026360701857235], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["9:9-9:12|0|1|4|-1", "10:9-10:12|0|1|4|-1"] + "uses": ["9:9-9:12|4|-1", "10:9-10:12|4|-1"] }], "usr2var": [{ "usr": 12028309045033782423, @@ -69,26 +70,26 @@ OUTPUT: "qual_name_offset": 4, "short_name": "b", "hover": "int b = Foo::foo()", - "declarations": [], - "spell": "10:5-10:6|0|1|2|-1", - "extent": "10:1-10:33|0|1|0|-1", + "spell": "10:5-10:6|10:1-10:33|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", "hover": "int a = Foo::foo()", - "declarations": [], - "spell": "9:5-9:6|0|1|2|-1", - "extent": "9:1-9:31|0|1|0|-1", + "spell": "9:5-9:6|9:1-9:31|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/template_class_type_usage_folded_into_one.cc b/index_tests/templates/template_class_type_usage_folded_into_one.cc index 09bc2e7c..b15eb530 100644 --- a/index_tests/templates/template_class_type_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_type_usage_folded_into_one.cc @@ -38,94 +38,94 @@ OUTPUT: "detailed_name": "enum A {}", "qual_name_offset": 5, "short_name": "A", - "kind": 10, - "declarations": [], - "spell": "1:6-1:7|0|1|2|-1", - "extent": "1:1-1:10|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:7|1:1-1:10|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["9:5-9:6|0|1|4|-1"] + "uses": ["9:5-9:6|4|-1"] }, { "usr": 10528472276654770367, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "5:8-5:11|0|1|2|-1", - "extent": "5:1-7:2|0|1|0|-1", - "alias_of": 0, + "spell": "5:8-5:11|5:1-7:2|2|-1", "bases": [], - "derived": [], - "types": [13938528237873543349], "funcs": [], + "types": [13938528237873543349], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["9:1-9:4|0|1|4|-1", "10:1-10:4|0|1|4|-1"] + "uses": ["9:1-9:4|4|-1", "10:1-10:4|4|-1"] }, { "usr": 13892793056005362145, "detailed_name": "enum B {}", "qual_name_offset": 5, "short_name": "B", - "kind": 10, - "declarations": [], - "spell": "2:6-2:7|0|1|2|-1", - "extent": "2:1-2:10|0|1|0|-1", - "alias_of": 0, + "spell": "2:6-2:7|2:1-2:10|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["10:5-10:6|0|1|4|-1"] + "uses": ["10:5-10:6|4|-1"] }, { "usr": 13938528237873543349, "detailed_name": "struct Foo::Inner {}", "qual_name_offset": 7, "short_name": "Inner", - "kind": 23, - "declarations": [], - "spell": "6:10-6:15|10528472276654770367|2|1026|-1", - "extent": "6:3-6:18|10528472276654770367|2|0|-1", - "alias_of": 0, + "spell": "6:10-6:15|6:3-6:18|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 23, + "declarations": [], + "derived": [], "instances": [16721564935990383768, 12028309045033782423], - "uses": ["9:9-9:14|0|1|4|-1", "10:9-10:14|0|1|4|-1"] + "uses": ["9:9-9:14|4|-1", "10:9-10:14|4|-1"] }], "usr2var": [{ "usr": 12028309045033782423, "detailed_name": "Foo::Inner b", "qual_name_offset": 14, "short_name": "b", - "declarations": [], - "spell": "10:15-10:16|0|1|2|-1", - "extent": "10:1-10:16|0|1|0|-1", + "spell": "10:15-10:16|10:1-10:16|2|-1", "type": 13938528237873543349, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "Foo::Inner a", "qual_name_offset": 14, "short_name": "a", - "declarations": [], - "spell": "9:15-9:16|0|1|2|-1", - "extent": "9:1-9:16|0|1|0|-1", + "spell": "9:15-9:16|9:1-9:16|2|-1", "type": 13938528237873543349, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/template_class_var_usage_folded_into_one.cc b/index_tests/templates/template_class_var_usage_folded_into_one.cc index 23d2ed6a..8f8f0cd4 100644 --- a/index_tests/templates/template_class_var_usage_folded_into_one.cc +++ b/index_tests/templates/template_class_var_usage_folded_into_one.cc @@ -17,14 +17,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [13545144895171991916, 16721564935990383768, 12028309045033782423], "uses": [] }, { @@ -32,18 +33,18 @@ OUTPUT: "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "2:8-2:11|0|1|2|-1", - "extent": "2:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:11|2:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["6:9-6:12|0|1|4|-1", "7:9-7:12|0|1|4|-1"] + "uses": ["6:9-6:12|4|-1", "7:9-7:12|4|-1"] }], "usr2var": [{ "usr": 12028309045033782423, @@ -51,37 +52,38 @@ OUTPUT: "qual_name_offset": 4, "short_name": "b", "hover": "int b = Foo::var", - "declarations": [], - "spell": "7:5-7:6|0|1|2|-1", - "extent": "7:1-7:23|0|1|0|-1", + "spell": "7:5-7:6|7:1-7:23|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 13545144895171991916, "detailed_name": "static constexpr int Foo::var", "qual_name_offset": 21, "short_name": "var", "hover": "static constexpr int Foo::var = 3", - "declarations": ["3:24-3:27|3:3-3:31|10528472276654770367|2|1025|-1"], "type": 53, - "uses": ["6:19-6:22|0|1|12|-1", "7:20-7:23|0|1|12|-1"], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": ["3:24-3:27|3:3-3:31|1025|-1"], + "uses": ["6:19-6:22|12|-1", "7:20-7:23|12|-1"] }, { "usr": 16721564935990383768, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", "hover": "int a = Foo::var", - "declarations": [], - "spell": "6:5-6:6|0|1|2|-1", - "extent": "6:1-6:22|0|1|0|-1", + "spell": "6:5-6:6|6:1-6:22|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/template_func_usage_folded_into_one.cc b/index_tests/templates/template_func_usage_folded_into_one.cc index c9329711..9c253894 100644 --- a/index_tests/templates/template_func_usage_folded_into_one.cc +++ b/index_tests/templates/template_func_usage_folded_into_one.cc @@ -19,30 +19,31 @@ OUTPUT: "detailed_name": "static int foo()", "qual_name_offset": 11, "short_name": "foo", + "spell": "2:12-2:15|2:1-4:2|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "2:12-2:15|0|1|2|-1", - "extent": "2:1-4:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["6:9-6:12|0|1|36|-1", "7:9-7:12|0|1|36|-1"], - "callees": [] + "uses": ["6:9-6:12|36|-1", "7:9-7:12|36|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16721564935990383768, 12028309045033782423], "uses": [] }], @@ -52,26 +53,26 @@ OUTPUT: "qual_name_offset": 4, "short_name": "b", "hover": "int b = foo()", - "declarations": [], - "spell": "7:5-7:6|0|1|2|-1", - "extent": "7:1-7:20|0|1|0|-1", + "spell": "7:5-7:6|7:1-7:20|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", "hover": "int a = foo()", - "declarations": [], - "spell": "6:5-6:6|0|1|2|-1", - "extent": "6:1-6:19|0|1|0|-1", + "spell": "6:5-6:6|6:1-6:19|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/template_type_usage_folded_into_one.cc b/index_tests/templates/template_type_usage_folded_into_one.cc index fb719179..05dfa00e 100644 --- a/index_tests/templates/template_type_usage_folded_into_one.cc +++ b/index_tests/templates/template_type_usage_folded_into_one.cc @@ -15,43 +15,43 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "2:7-2:10|0|1|2|-1", - "extent": "2:1-2:13|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:10|2:1-2:13|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16721564935990383768, 12028309045033782423], - "uses": ["4:1-4:4|0|1|4|-1", "5:1-5:4|0|1|4|-1"] + "uses": ["4:1-4:4|4|-1", "5:1-5:4|4|-1"] }], "usr2var": [{ "usr": 12028309045033782423, "detailed_name": "Foo b", "qual_name_offset": 10, "short_name": "b", - "declarations": [], - "spell": "5:11-5:12|0|1|2|-1", - "extent": "5:1-5:12|0|1|0|-1", + "spell": "5:11-5:12|5:1-5:12|2|-1", "type": 10528472276654770367, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "Foo a", "qual_name_offset": 9, "short_name": "a", - "declarations": [], - "spell": "4:10-4:11|0|1|2|-1", - "extent": "4:1-4:11|0|1|0|-1", + "spell": "4:10-4:11|4:1-4:11|2|-1", "type": 10528472276654770367, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/templates/template_var_usage_folded_into_one.cc b/index_tests/templates/template_var_usage_folded_into_one.cc index 44489203..7359e0dd 100644 --- a/index_tests/templates/template_var_usage_folded_into_one.cc +++ b/index_tests/templates/template_var_usage_folded_into_one.cc @@ -41,33 +41,33 @@ OUTPUT: "detailed_name": "enum A {}", "qual_name_offset": 5, "short_name": "A", - "kind": 10, - "declarations": [], - "spell": "1:6-1:7|0|1|2|-1", - "extent": "1:1-1:10|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:7|1:1-1:10|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16721564935990383768], - "uses": ["7:1-7:2|0|1|4|-1", "7:11-7:12|0|1|4|-1"] + "uses": ["7:1-7:2|4|-1", "7:11-7:12|4|-1"] }, { "usr": 11919899838872947844, "detailed_name": "T", "qual_name_offset": 0, "short_name": "T", - "kind": 26, - "declarations": [], - "spell": "4:19-4:20|0|1|2|-1", - "extent": "4:10-4:20|0|1|0|-1", - "alias_of": 0, + "spell": "4:19-4:20|4:10-4:20|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 5, + "declarations": [], + "derived": [], "instances": [8096973118640070624], "uses": [] }, { @@ -75,18 +75,18 @@ OUTPUT: "detailed_name": "enum B {}", "qual_name_offset": 5, "short_name": "B", - "kind": 10, - "declarations": [], - "spell": "2:6-2:7|0|1|2|-1", - "extent": "2:1-2:10|0|1|0|-1", - "alias_of": 0, + "spell": "2:6-2:7|2:1-2:10|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [12028309045033782423], - "uses": ["8:1-8:2|0|1|4|-1", "8:11-8:12|0|1|4|-1"] + "uses": ["8:1-8:2|4|-1", "8:11-8:12|4|-1"] }], "usr2var": [{ "usr": 8096973118640070624, @@ -94,39 +94,39 @@ OUTPUT: "qual_name_offset": 2, "short_name": "var", "hover": "T var = T()", - "declarations": [], - "spell": "5:3-5:6|0|1|2|-1", - "extent": "5:1-5:12|0|1|0|-1", + "spell": "5:3-5:6|5:1-5:12|2|-1", "type": 11919899838872947844, - "uses": ["7:7-7:10|0|1|12|-1", "8:7-8:10|0|1|12|-1"], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": ["7:7-7:10|12|-1", "8:7-8:10|12|-1"] }, { "usr": 12028309045033782423, "detailed_name": "B b", "qual_name_offset": 2, "short_name": "b", "hover": "B b = var", - "declarations": [], - "spell": "8:3-8:4|0|1|2|-1", - "extent": "8:1-8:13|0|1|0|-1", + "spell": "8:3-8:4|8:1-8:13|2|-1", "type": 13892793056005362145, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16721564935990383768, "detailed_name": "A a", "qual_name_offset": 2, "short_name": "a", "hover": "A a = var", - "declarations": [], - "spell": "7:3-7:4|0|1|2|-1", - "extent": "7:1-7:13|0|1|0|-1", + "spell": "7:3-7:4|7:1-7:13|2|-1", "type": 6697181287623958829, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/types/anonymous_struct.cc b/index_tests/types/anonymous_struct.cc index 9d88a8bf..baa5c2dc 100644 --- a/index_tests/types/anonymous_struct.cc +++ b/index_tests/types/anonymous_struct.cc @@ -14,14 +14,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [3348817847649945564, 4821094820988543895, 15292551660437765731], "uses": [] }, { @@ -29,15 +30,10 @@ OUTPUT: "detailed_name": "anon struct", "qual_name_offset": 0, "short_name": "anon struct", - "kind": 23, - "declarations": [], - "spell": "2:3-2:9|17937907487590875128|2|1026|-1", - "extent": "2:3-2:28|17937907487590875128|2|0|-1", - "alias_of": 0, + "spell": "2:3-2:9|2:3-2:28|1026|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 3348817847649945564, "R": 0 @@ -48,6 +44,11 @@ OUTPUT: "L": 15292551660437765731, "R": 64 }], + "alias_of": 0, + "kind": 23, + "parent_kind": 5, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -55,15 +56,10 @@ OUTPUT: "detailed_name": "union vector3 {}", "qual_name_offset": 6, "short_name": "vector3", - "kind": 5, - "declarations": [], - "spell": "1:7-1:14|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:14|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [1428566502523368801], "funcs": [], + "types": [1428566502523368801], "vars": [{ "L": 1963212417280098348, "R": 0 @@ -77,6 +73,11 @@ OUTPUT: "L": 15292551660437765731, "R": 64 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -85,49 +86,49 @@ OUTPUT: "detailed_name": "float vector3::v[3]", "qual_name_offset": 6, "short_name": "v", - "declarations": [], - "spell": "3:9-3:10|17937907487590875128|2|1026|-1", - "extent": "3:3-3:13|17937907487590875128|2|0|-1", + "spell": "3:9-3:10|3:3-3:13|1026|-1", "type": 0, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 3348817847649945564, "detailed_name": "float vector3::(anon struct)::x", "qual_name_offset": 6, "short_name": "x", - "declarations": [], - "spell": "2:18-2:19|1428566502523368801|2|1026|-1", - "extent": "2:12-2:19|1428566502523368801|2|0|-1", + "spell": "2:18-2:19|2:12-2:19|1026|-1", "type": 82, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 4821094820988543895, "detailed_name": "float vector3::(anon struct)::y", "qual_name_offset": 6, "short_name": "y", - "declarations": [], - "spell": "2:21-2:22|1428566502523368801|2|1026|-1", - "extent": "2:12-2:22|1428566502523368801|2|0|-1", + "spell": "2:21-2:22|2:12-2:22|1026|-1", "type": 82, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15292551660437765731, "detailed_name": "float vector3::(anon struct)::z", "qual_name_offset": 6, "short_name": "z", - "declarations": [], - "spell": "2:24-2:25|1428566502523368801|2|1026|-1", - "extent": "2:12-2:25|1428566502523368801|2|0|-1", + "spell": "2:24-2:25|2:12-2:25|1026|-1", "type": 82, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/types/typedefs.cc b/index_tests/types/typedefs.cc index 17d3fcbd..4a2844b7 100644 --- a/index_tests/types/typedefs.cc +++ b/index_tests/types/typedefs.cc @@ -11,32 +11,33 @@ OUTPUT: "detailed_name": "static int g(const int *, const int *)", "qual_name_offset": 11, "short_name": "g", - "kind": 12, - "storage": 0, - "declarations": ["2:13-2:14|2:1-2:14|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:13-2:14|2:1-2:14|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 10383876566159302459, "detailed_name": "typedef int (func)(const int *, const int *)", "qual_name_offset": 12, "short_name": "func", - "kind": 252, - "declarations": [], - "spell": "1:14-1:18|0|1|2|-1", - "extent": "1:1-1:47|0|1|0|-1", - "alias_of": 0, + "spell": "1:14-1:18|1:1-1:47|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["2:8-2:12|0|1|4|-1"] + "uses": ["2:8-2:12|4|-1"] }], "usr2var": [] } diff --git a/index_tests/unions/union_decl.cc b/index_tests/unions/union_decl.cc index 7861f8ff..313c201e 100644 --- a/index_tests/unions/union_decl.cc +++ b/index_tests/unions/union_decl.cc @@ -14,14 +14,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [8804696910588009104], "uses": [] }, { @@ -29,14 +30,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [9529311430721959843], "uses": [] }, { @@ -44,15 +46,10 @@ OUTPUT: "detailed_name": "union Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 9529311430721959843, "R": 0 @@ -60,6 +57,11 @@ OUTPUT: "L": 8804696910588009104, "R": 0 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -68,25 +70,25 @@ OUTPUT: "detailed_name": "bool Foo::b", "qual_name_offset": 5, "short_name": "b", - "declarations": [], - "spell": "3:8-3:9|8501689086387244262|2|1026|-1", - "extent": "3:3-3:9|8501689086387244262|2|0|-1", + "spell": "3:8-3:9|3:3-3:9|1026|-1", "type": 37, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 9529311430721959843, "detailed_name": "int Foo::a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "2:7-2:8|8501689086387244262|2|1026|-1", - "extent": "2:3-2:8|8501689086387244262|2|0|-1", + "spell": "2:7-2:8|2:3-2:8|1026|-1", "type": 53, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/unions/union_usage.cc b/index_tests/unions/union_usage.cc index 248f5975..57bb2ebf 100644 --- a/index_tests/unions/union_usage.cc +++ b/index_tests/unions/union_usage.cc @@ -21,30 +21,31 @@ OUTPUT: "detailed_name": "void act(Foo *)", "qual_name_offset": 5, "short_name": "act", + "spell": "8:6-8:9|8:1-10:2|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "8:6-8:9|0|1|2|-1", - "extent": "8:1-10:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 37, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [8804696910588009104], "uses": [] }, { @@ -52,14 +53,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [9529311430721959843], "uses": [] }, { @@ -67,15 +69,10 @@ OUTPUT: "detailed_name": "union Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-4:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 9529311430721959843, "R": 0 @@ -83,45 +80,50 @@ OUTPUT: "L": 8804696910588009104, "R": 0 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [2933643612409209903], - "uses": ["6:1-6:4|0|1|4|-1", "8:10-8:13|0|1|4|-1"] + "uses": ["6:1-6:4|4|-1", "8:10-8:13|4|-1"] }], "usr2var": [{ "usr": 2933643612409209903, "detailed_name": "Foo f", "qual_name_offset": 4, "short_name": "f", - "declarations": [], - "spell": "6:5-6:6|0|1|2|-1", - "extent": "6:1-6:6|0|1|0|-1", + "spell": "6:5-6:6|6:1-6:6|2|-1", "type": 8501689086387244262, - "uses": ["9:3-9:4|13982179977217945200|3|4|-1"], "kind": 13, - "storage": 0 + "parent_kind": 0, + "storage": 0, + "declarations": [], + "uses": ["9:3-9:4|4|-1"] }, { "usr": 8804696910588009104, "detailed_name": "bool Foo::b : 3", "qual_name_offset": 5, "short_name": "b", - "declarations": [], - "spell": "3:8-3:9|8501689086387244262|2|1026|-1", - "extent": "3:3-3:13|8501689086387244262|2|0|-1", + "spell": "3:8-3:9|3:3-3:13|1026|-1", "type": 37, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 9529311430721959843, "detailed_name": "int Foo::a : 5", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "2:7-2:8|8501689086387244262|2|1026|-1", - "extent": "2:3-2:12|8501689086387244262|2|0|-1", + "spell": "2:7-2:8|2:3-2:12|1026|-1", "type": 53, - "uses": ["9:5-9:6|13982179977217945200|3|20|-1"], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": ["9:5-9:6|20|-1"] }] } */ diff --git a/index_tests/usage/func_called_from_constructor.cc b/index_tests/usage/func_called_from_constructor.cc index 53c43669..d002eb45 100644 --- a/index_tests/usage/func_called_from_constructor.cc +++ b/index_tests/usage/func_called_from_constructor.cc @@ -18,49 +18,49 @@ OUTPUT: "detailed_name": "void called()", "qual_name_offset": 5, "short_name": "called", + "spell": "1:6-1:12|1:1-1:17|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:12|0|1|2|-1", - "extent": "1:1-1:17|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["8:3-8:9|3385168158331140247|3|16420|-1"], - "callees": [] + "uses": ["8:3-8:9|16420|-1"] }, { "usr": 3385168158331140247, "detailed_name": "Foo::Foo()", "qual_name_offset": 0, "short_name": "Foo", - "kind": 9, - "storage": 0, - "declarations": ["4:3-4:6|4:3-4:8|15041163540773201510|2|1025|-1"], - "spell": "7:6-7:9|15041163540773201510|2|1026|-1", - "extent": "7:1-9:2|15041163540773201510|2|0|-1", + "spell": "7:6-7:9|7:1-9:2|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": ["8:3-8:9|468307235068920063|3|16420"] + "callees": ["8:3-8:9|468307235068920063|3|16420"], + "kind": 9, + "parent_kind": 23, + "storage": 0, + "declarations": ["4:3-4:6|4:3-4:8|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "3:8-3:11|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "3:8-3:11|3:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [3385168158331140247], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["4:3-4:6|15041163540773201510|2|4|-1", "7:1-7:4|0|1|4|-1", "7:6-7:9|15041163540773201510|2|4|-1"] + "uses": ["4:3-4:6|4|-1", "7:1-7:4|4|-1", "7:6-7:9|4|-1"] }], "usr2var": [] } diff --git a/index_tests/usage/func_called_from_macro_argument.cc b/index_tests/usage/func_called_from_macro_argument.cc index 868db9e8..2c7f4305 100644 --- a/index_tests/usage/func_called_from_macro_argument.cc +++ b/index_tests/usage/func_called_from_macro_argument.cc @@ -16,29 +16,30 @@ OUTPUT: "detailed_name": "bool called(bool a, bool b)", "qual_name_offset": 5, "short_name": "called", - "kind": 12, - "storage": 0, - "declarations": ["3:6-3:12|3:1-3:28|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["6:14-6:20|11404881820527069090|3|16420|-1", "6:14-6:20|0|1|64|0"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:6-3:12|3:1-3:28|1|-1"], + "derived": [], + "uses": ["6:14-6:20|16420|-1", "6:14-6:20|64|0"] }, { "usr": 11404881820527069090, "detailed_name": "void caller()", "qual_name_offset": 5, "short_name": "caller", + "spell": "5:6-5:12|5:1-7:2|2|-1", + "bases": [], + "vars": [], + "callees": ["6:14-6:20|3787803219955606747|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:12|0|1|2|-1", - "extent": "5:1-7:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["6:14-6:20|3787803219955606747|3|16420"] + "uses": [] }], "usr2type": [], "usr2var": [{ @@ -47,13 +48,13 @@ OUTPUT: "qual_name_offset": 0, "short_name": "MACRO_CALL", "hover": "#define MACRO_CALL(e) e", - "declarations": [], - "spell": "1:9-1:19|0|1|2|-1", - "extent": "1:9-1:24|0|1|0|-1", + "spell": "1:9-1:19|1:9-1:24|2|-1", "type": 0, - "uses": ["6:3-6:13|0|1|64|-1"], "kind": 255, - "storage": 0 + "parent_kind": 1, + "storage": 0, + "declarations": [], + "uses": ["6:3-6:13|64|-1"] }] } */ \ No newline at end of file diff --git a/index_tests/usage/func_called_from_template.cc b/index_tests/usage/func_called_from_template.cc index 0d223bec..9ff9b66c 100644 --- a/index_tests/usage/func_called_from_template.cc +++ b/index_tests/usage/func_called_from_template.cc @@ -21,57 +21,59 @@ OUTPUT: "detailed_name": "void called()", "qual_name_offset": 5, "short_name": "called", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:12|1:1-1:14|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["5:3-5:9|10177235824697315808|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:12|1:1-1:14|1|-1"], + "derived": [], + "uses": ["5:3-5:9|16420|-1"] }, { "usr": 2459767597003442547, "detailed_name": "", "qual_name_offset": 0, "short_name": "", + "bases": [], + "vars": [], + "callees": ["5:3-5:9|468307235068920063|3|16420"], "kind": 0, + "parent_kind": 0, "storage": 0, "declarations": [], - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["5:3-5:9|468307235068920063|3|16420"] + "uses": [] }, { "usr": 4259594751088586730, "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "8:6-8:9|8:1-10:2|2|-1", + "bases": [], + "vars": [], + "callees": ["9:3-9:9|10177235824697315808|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "8:6-8:9|0|1|2|-1", - "extent": "8:1-10:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["9:3-9:9|10177235824697315808|3|16420"] + "uses": [] }, { "usr": 10177235824697315808, "detailed_name": "void caller()", "qual_name_offset": 5, "short_name": "caller", + "spell": "4:6-4:12|4:1-6:2|2|-1", + "bases": [], + "vars": [], + "callees": ["5:3-5:9|468307235068920063|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "4:6-4:12|0|1|2|-1", - "extent": "4:1-6:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["9:3-9:9|4259594751088586730|3|16420|-1"], - "callees": ["5:3-5:9|468307235068920063|3|16420"] + "uses": ["9:3-9:9|16420|-1"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/func_called_implicit_ctor.cc b/index_tests/usage/func_called_implicit_ctor.cc index 63a13f2b..771ab3ce 100644 --- a/index_tests/usage/func_called_implicit_ctor.cc +++ b/index_tests/usage/func_called_implicit_ctor.cc @@ -18,62 +18,63 @@ OUTPUT: "detailed_name": "int called()", "qual_name_offset": 4, "short_name": "called", + "spell": "5:5-5:11|5:1-5:27|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:5-5:11|0|1|2|-1", - "extent": "5:1-5:27|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["8:10-8:16|11404881820527069090|3|16420|-1"], - "callees": [] + "uses": ["8:10-8:16|16420|-1"] }, { "usr": 10544127002917214589, "detailed_name": "Wrapper::Wrapper(int i)", "qual_name_offset": 0, "short_name": "Wrapper", - "kind": 9, - "storage": 0, - "declarations": ["2:3-2:10|2:3-2:17|13611487872560323389|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["8:10-8:16|11404881820527069090|3|16676|-1"], - "callees": [] + "callees": [], + "kind": 9, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:3-2:10|2:3-2:17|1025|-1"], + "derived": [], + "uses": ["8:10-8:16|16676|-1"] }, { "usr": 11404881820527069090, "detailed_name": "Wrapper caller()", "qual_name_offset": 8, "short_name": "caller", + "spell": "7:9-7:15|7:1-9:2|2|-1", + "bases": [], + "vars": [], + "callees": ["8:10-8:16|10544127002917214589|3|16676", "8:10-8:16|468307235068920063|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "7:9-7:15|0|1|2|-1", - "extent": "7:1-9:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["8:10-8:16|10544127002917214589|3|16676", "8:10-8:16|468307235068920063|3|16420"] + "uses": [] }], "usr2type": [{ "usr": 13611487872560323389, "detailed_name": "struct Wrapper {}", "qual_name_offset": 7, "short_name": "Wrapper", - "kind": 23, - "declarations": [], - "spell": "1:8-1:15|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:15|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [10544127002917214589], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["2:3-2:10|13611487872560323389|2|4|-1", "7:1-7:8|0|1|4|-1"] + "uses": ["2:3-2:10|4|-1", "7:1-7:8|4|-1"] }], "usr2var": [] } diff --git a/index_tests/usage/func_usage_addr_func.cc b/index_tests/usage/func_usage_addr_func.cc index 9d4efdb6..b0c5fb4f 100644 --- a/index_tests/usage/func_usage_addr_func.cc +++ b/index_tests/usage/func_usage_addr_func.cc @@ -17,46 +17,46 @@ OUTPUT: "detailed_name": "void used()", "qual_name_offset": 5, "short_name": "used", + "spell": "3:6-3:10|3:1-3:15|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:10|0|1|2|-1", - "extent": "3:1-3:15|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["6:18-6:22|9376923949268137283|3|132|-1", "7:12-7:16|9376923949268137283|3|132|-1"], - "callees": [] + "uses": ["6:18-6:22|132|-1", "7:12-7:16|132|-1"] }, { "usr": 9376923949268137283, "detailed_name": "void user()", "qual_name_offset": 5, "short_name": "user", + "spell": "5:6-5:10|5:1-8:2|2|-1", + "bases": [], + "vars": [16088407831770615719], + "callees": ["6:18-6:22|5264867802674151787|3|132", "6:18-6:22|5264867802674151787|3|132", "7:3-7:10|12924914488846929470|3|16420", "7:12-7:16|5264867802674151787|3|132"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:10|0|1|2|-1", - "extent": "5:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [16088407831770615719], - "uses": [], - "callees": ["6:18-6:22|5264867802674151787|3|132", "6:18-6:22|5264867802674151787|3|132", "7:3-7:10|12924914488846929470|3|16420", "7:12-7:16|5264867802674151787|3|132"] + "uses": [] }, { "usr": 12924914488846929470, "detailed_name": "void consume(void (*)())", "qual_name_offset": 5, "short_name": "consume", + "spell": "1:6-1:13|1:1-1:28|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:13|0|1|2|-1", - "extent": "1:1-1:28|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["7:3-7:10|9376923949268137283|3|16420|-1"], - "callees": [] + "uses": ["7:3-7:10|16420|-1"] }], "usr2type": [], "usr2var": [{ @@ -65,13 +65,13 @@ OUTPUT: "qual_name_offset": 7, "short_name": "x", "hover": "void (*x)() = &used", - "declarations": [], - "spell": "6:10-6:11|9376923949268137283|3|2|-1", - "extent": "6:3-6:22|9376923949268137283|3|0|-1", + "spell": "6:10-6:11|6:3-6:22|2|-1", "type": 0, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/func_usage_addr_method.cc b/index_tests/usage/func_usage_addr_method.cc index e8242960..3e0582da 100644 --- a/index_tests/usage/func_usage_addr_method.cc +++ b/index_tests/usage/func_usage_addr_method.cc @@ -17,47 +17,48 @@ OUTPUT: "detailed_name": "void user()", "qual_name_offset": 5, "short_name": "user", + "spell": "5:6-5:10|5:1-7:2|2|-1", + "bases": [], + "vars": [4636142131003982569], + "callees": ["6:18-6:22|18417145003926999463|3|132", "6:18-6:22|18417145003926999463|3|132"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:10|0|1|2|-1", - "extent": "5:1-7:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [4636142131003982569], - "uses": [], - "callees": ["6:18-6:22|18417145003926999463|3|132", "6:18-6:22|18417145003926999463|3|132"] + "uses": [] }, { "usr": 18417145003926999463, "detailed_name": "void Foo::Used()", "qual_name_offset": 5, "short_name": "Used", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:12|2:3-2:14|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["6:18-6:22|9376923949268137283|3|132|-1"], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:8-2:12|2:3-2:14|1025|-1"], + "derived": [], + "uses": ["6:18-6:22|132|-1"] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "1:8-1:11|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:11|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [18417145003926999463], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["6:13-6:16|9376923949268137283|3|4|-1"] + "uses": ["6:13-6:16|4|-1"] }], "usr2var": [{ "usr": 4636142131003982569, @@ -65,13 +66,13 @@ OUTPUT: "qual_name_offset": 16, "short_name": "x", "hover": "void (Foo::*)() x = &Foo::Used", - "declarations": [], - "spell": "6:8-6:9|9376923949268137283|3|2|-1", - "extent": "6:3-6:22|9376923949268137283|3|0|-1", + "spell": "6:8-6:9|6:3-6:22|2|-1", "type": 0, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/func_usage_call_func.cc b/index_tests/usage/func_usage_call_func.cc index 0ec91f0a..29841134 100644 --- a/index_tests/usage/func_usage_call_func.cc +++ b/index_tests/usage/func_usage_call_func.cc @@ -13,31 +13,31 @@ OUTPUT: "detailed_name": "void called()", "qual_name_offset": 5, "short_name": "called", + "spell": "1:6-1:12|1:1-1:17|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:12|0|1|2|-1", - "extent": "1:1-1:17|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["3:3-3:9|11404881820527069090|3|16420|-1"], - "callees": [] + "uses": ["3:3-3:9|16420|-1"] }, { "usr": 11404881820527069090, "detailed_name": "void caller()", "qual_name_offset": 5, "short_name": "caller", + "spell": "2:6-2:12|2:1-4:2|2|-1", + "bases": [], + "vars": [], + "callees": ["3:3-3:9|468307235068920063|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "2:6-2:12|0|1|2|-1", - "extent": "2:1-4:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["3:3-3:9|468307235068920063|3|16420"] + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/func_usage_call_method.cc b/index_tests/usage/func_usage_call_method.cc index 726f13fd..6e86be51 100644 --- a/index_tests/usage/func_usage_call_method.cc +++ b/index_tests/usage/func_usage_call_method.cc @@ -17,47 +17,48 @@ OUTPUT: "detailed_name": "void user()", "qual_name_offset": 5, "short_name": "user", + "spell": "5:6-5:10|5:1-8:2|2|-1", + "bases": [], + "vars": [14045150712868309451], + "callees": ["7:6-7:10|18417145003926999463|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:10|0|1|2|-1", - "extent": "5:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [14045150712868309451], - "uses": [], - "callees": ["7:6-7:10|18417145003926999463|3|16420"] + "uses": [] }, { "usr": 18417145003926999463, "detailed_name": "void Foo::Used()", "qual_name_offset": 5, "short_name": "Used", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:12|2:3-2:14|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["7:6-7:10|9376923949268137283|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:8-2:12|2:3-2:14|1025|-1"], + "derived": [], + "uses": ["7:6-7:10|16420|-1"] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "1:8-1:11|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:11|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [18417145003926999463], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [14045150712868309451], - "uses": ["6:3-6:6|9376923949268137283|3|4|-1"] + "uses": ["6:3-6:6|4|-1"] }], "usr2var": [{ "usr": 14045150712868309451, @@ -65,13 +66,13 @@ OUTPUT: "qual_name_offset": 5, "short_name": "f", "hover": "Foo *f = nullptr", - "declarations": [], - "spell": "6:8-6:9|9376923949268137283|3|2|-1", - "extent": "6:3-6:19|9376923949268137283|3|0|-1", + "spell": "6:8-6:9|6:3-6:19|2|-1", "type": 15041163540773201510, - "uses": ["7:3-7:4|9376923949268137283|3|12|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["7:3-7:4|12|-1"] }] } */ diff --git a/index_tests/usage/func_usage_class_inline_var_def.cc b/index_tests/usage/func_usage_class_inline_var_def.cc index 6872016b..f62581ea 100644 --- a/index_tests/usage/func_usage_class_inline_var_def.cc +++ b/index_tests/usage/func_usage_class_inline_var_def.cc @@ -16,30 +16,31 @@ OUTPUT: "detailed_name": "static int helper()", "qual_name_offset": 11, "short_name": "helper", + "spell": "1:12-1:18|1:1-3:2|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:12-1:18|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["6:11-6:17|15041163540773201510|2|36|-1"], - "callees": [] + "uses": ["6:11-6:17|36|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [4220150017963593039], "uses": [] }, { @@ -47,19 +48,19 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "5:7-5:10|0|1|2|-1", - "extent": "5:1-7:2|0|1|0|-1", - "alias_of": 0, + "spell": "5:7-5:10|5:1-7:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 4220150017963593039, "R": 0 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -69,13 +70,13 @@ OUTPUT: "qual_name_offset": 4, "short_name": "x", "hover": "int Foo::x = helper()", - "declarations": [], - "spell": "6:7-6:8|15041163540773201510|2|1026|-1", - "extent": "6:3-6:19|15041163540773201510|2|0|-1", + "spell": "6:7-6:8|6:3-6:19|1026|-1", "type": 53, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/func_usage_forward_decl_func.cc b/index_tests/usage/func_usage_forward_decl_func.cc index 1e7cef98..06a1e767 100644 --- a/index_tests/usage/func_usage_forward_decl_func.cc +++ b/index_tests/usage/func_usage_forward_decl_func.cc @@ -13,29 +13,30 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:9|1:1-1:11|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["4:3-4:6|6767773193109753523|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:9|1:1-1:11|1|-1"], + "derived": [], + "uses": ["4:3-4:6|16420|-1"] }, { "usr": 6767773193109753523, "detailed_name": "void usage()", "qual_name_offset": 5, "short_name": "usage", + "spell": "3:6-3:11|3:1-5:2|2|-1", + "bases": [], + "vars": [], + "callees": ["4:3-4:6|4259594751088586730|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:11|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["4:3-4:6|4259594751088586730|3|16420"] + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/func_usage_forward_decl_method.cc b/index_tests/usage/func_usage_forward_decl_method.cc index 9fdfb1ed..7da093ea 100644 --- a/index_tests/usage/func_usage_forward_decl_method.cc +++ b/index_tests/usage/func_usage_forward_decl_method.cc @@ -16,47 +16,48 @@ OUTPUT: "detailed_name": "void usage()", "qual_name_offset": 5, "short_name": "usage", + "spell": "5:6-5:11|5:1-8:2|2|-1", + "bases": [], + "vars": [16229832321010999607], + "callees": ["7:6-7:9|17922201480358737771|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:11|0|1|2|-1", - "extent": "5:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [16229832321010999607], - "uses": [], - "callees": ["7:6-7:9|17922201480358737771|3|16420"] + "uses": [] }, { "usr": 17922201480358737771, "detailed_name": "void Foo::foo()", "qual_name_offset": 5, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:11|2:3-2:13|15041163540773201510|2|1025|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["7:6-7:9|6767773193109753523|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:8-2:11|2:3-2:13|1025|-1"], + "derived": [], + "uses": ["7:6-7:9|16420|-1"] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "1:8-1:11|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:11|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [17922201480358737771], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16229832321010999607], - "uses": ["6:3-6:6|6767773193109753523|3|4|-1"] + "uses": ["6:3-6:6|4|-1"] }], "usr2var": [{ "usr": 16229832321010999607, @@ -64,13 +65,13 @@ OUTPUT: "qual_name_offset": 5, "short_name": "f", "hover": "Foo *f = nullptr", - "declarations": [], - "spell": "6:8-6:9|6767773193109753523|3|2|-1", - "extent": "6:3-6:19|6767773193109753523|3|0|-1", + "spell": "6:8-6:9|6:3-6:19|2|-1", "type": 15041163540773201510, - "uses": ["7:3-7:4|6767773193109753523|3|12|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["7:3-7:4|12|-1"] }] } */ diff --git a/index_tests/usage/func_usage_template_func.cc b/index_tests/usage/func_usage_template_func.cc index 72e6e670..6a812a46 100644 --- a/index_tests/usage/func_usage_template_func.cc +++ b/index_tests/usage/func_usage_template_func.cc @@ -16,29 +16,30 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "4:6-4:9|4:1-7:2|2|-1", + "bases": [], + "vars": [], + "callees": ["5:3-5:9|10585861037135727329|3|16420", "6:3-6:9|10585861037135727329|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "4:6-4:9|0|1|2|-1", - "extent": "4:1-7:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["5:3-5:9|10585861037135727329|3|16420", "6:3-6:9|10585861037135727329|3|16420"] + "uses": [] }, { "usr": 10585861037135727329, "detailed_name": "void accept(T)", "qual_name_offset": 5, "short_name": "accept", - "kind": 12, - "storage": 0, - "declarations": ["2:6-2:12|2:1-2:15|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["5:3-5:9|4259594751088586730|3|16420|-1", "6:3-6:9|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["2:6-2:12|2:1-2:15|1|-1"], + "derived": [], + "uses": ["5:3-5:9|16420|-1", "6:3-6:9|16420|-1"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/type_usage_as_template_parameter.cc b/index_tests/usage/type_usage_as_template_parameter.cc index 169d5ad4..f13a593f 100644 --- a/index_tests/usage/type_usage_as_template_parameter.cc +++ b/index_tests/usage/type_usage_as_template_parameter.cc @@ -20,88 +20,88 @@ OUTPUT: "detailed_name": "unique_ptr *return_type()", "qual_name_offset": 15, "short_name": "return_type", + "spell": "9:16-9:27|9:1-12:2|2|-1", + "bases": [], + "vars": [3364438781074774169], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "9:16-9:27|0|1|2|-1", - "extent": "9:1-12:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [3364438781074774169], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 3286534761799572592, "detailed_name": "class unique_ptr {}", "qual_name_offset": 6, "short_name": "unique_ptr", - "kind": 5, - "declarations": [], - "spell": "2:7-2:17|0|1|2|-1", - "extent": "2:1-2:20|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:17|2:1-2:20|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [12857919739649552168, 18075066956054788088, 3364438781074774169], - "uses": ["6:8-6:18|0|1|4|-1", "7:8-7:18|0|1|4|-1", "9:1-9:11|0|1|4|-1", "10:3-10:13|16359708726068806331|3|4|-1"] + "uses": ["6:8-6:18|4|-1", "7:8-7:18|4|-1", "9:1-9:11|4|-1", "10:3-10:13|4|-1"] }, { "usr": 4750332761459066907, "detailed_name": "struct S {}", "qual_name_offset": 7, "short_name": "S", - "kind": 23, - "declarations": [], - "spell": "4:8-4:9|0|1|2|-1", - "extent": "4:1-4:12|0|1|0|-1", - "alias_of": 0, + "spell": "4:8-4:9|4:1-4:12|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:19-7:20|0|1|4|-1", "9:12-9:13|0|1|4|-1", "10:14-10:15|16359708726068806331|3|4|-1"] + "uses": ["7:19-7:20|4|-1", "9:12-9:13|4|-1", "10:14-10:15|4|-1"] }], "usr2var": [{ "usr": 3364438781074774169, "detailed_name": "unique_ptr *local", "qual_name_offset": 15, "short_name": "local", - "declarations": [], - "spell": "10:18-10:23|16359708726068806331|3|2|-1", - "extent": "10:3-10:23|16359708726068806331|3|0|-1", + "spell": "10:18-10:23|10:3-10:23|2|-1", "type": 3286534761799572592, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 12857919739649552168, "detailed_name": "static unique_ptr f0", "qual_name_offset": 24, "short_name": "f0", - "declarations": [], - "spell": "6:25-6:27|0|1|2|-1", - "extent": "6:1-6:27|0|1|0|-1", + "spell": "6:25-6:27|6:1-6:27|2|-1", "type": 3286534761799572592, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": [] }, { "usr": 18075066956054788088, "detailed_name": "static unique_ptr f1", "qual_name_offset": 21, "short_name": "f1", - "declarations": [], - "spell": "7:22-7:24|0|1|2|-1", - "extent": "7:1-7:24|0|1|0|-1", + "spell": "7:22-7:24|7:1-7:24|2|-1", "type": 3286534761799572592, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_as_template_parameter_complex.cc b/index_tests/usage/type_usage_as_template_parameter_complex.cc index 3ed6d40d..4dedd131 100644 --- a/index_tests/usage/type_usage_as_template_parameter_complex.cc +++ b/index_tests/usage/type_usage_as_template_parameter_complex.cc @@ -88,147 +88,151 @@ OUTPUT: "detailed_name": "unique_ptr, S2> *as_return_type(unique_ptr *)", "qual_name_offset": 36, "short_name": "as_return_type", + "spell": "33:37-33:51|33:1-33:92|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "33:37-33:51|0|1|2|-1", - "extent": "33:1-33:92|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 13067214284561914253, "detailed_name": "void no_return_type(int)", "qual_name_offset": 5, "short_name": "no_return_type", + "spell": "40:6-40:20|40:1-40:28|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "40:6-40:20|0|1|2|-1", - "extent": "40:1-40:28|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 17922201480358737771, "detailed_name": "unique_ptr *Foo::foo()", "qual_name_offset": 20, "short_name": "foo", - "kind": 6, - "storage": 0, - "declarations": ["65:23-65:26|65:3-65:28|15041163540773201510|2|1025|-1"], - "spell": "79:26-79:29|15041163540773201510|2|1026|-1", - "extent": "79:1-79:51|15041163540773201510|2|0|-1", + "spell": "79:26-79:29|79:1-79:51|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["65:23-65:26|65:3-65:28|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 18320186404467436976, "detailed_name": "void empty()", "qual_name_offset": 5, "short_name": "empty", + "spell": "53:6-53:11|53:1-55:2|2|-1", + "bases": [], + "vars": [500112618220246], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "53:6-53:11|0|1|2|-1", - "extent": "53:1-55:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [500112618220246], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 4310164820010458371, "detailed_name": "struct S1", "qual_name_offset": 7, "short_name": "S1", - "kind": 23, - "declarations": ["4:8-4:10|4:1-4:10|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["4:8-4:10|4:1-4:10|1|-1"], + "derived": [], "instances": [], - "uses": ["15:30-15:32|0|1|4|-1", "33:23-33:25|0|1|4|-1", "33:63-33:65|0|1|4|-1", "54:25-54:27|18320186404467436976|3|4|-1", "65:14-65:16|15041163540773201510|2|4|-1", "79:12-79:14|0|1|4|-1"] + "uses": ["15:30-15:32|4|-1", "33:23-33:25|4|-1", "33:63-33:65|4|-1", "54:25-54:27|4|-1", "65:14-65:16|4|-1", "79:12-79:14|4|-1"] }, { "usr": 12728490517004312484, "detailed_name": "struct S2", "qual_name_offset": 7, "short_name": "S2", - "kind": 23, - "declarations": ["5:8-5:10|5:1-5:10|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["5:8-5:10|5:1-5:10|1|-1"], + "derived": [], "instances": [], - "uses": ["15:34-15:36|0|1|4|-1", "15:39-15:41|0|1|4|-1", "33:27-33:29|0|1|4|-1", "33:32-33:34|0|1|4|-1", "33:67-33:69|0|1|4|-1", "54:29-54:31|18320186404467436976|3|4|-1", "54:34-54:36|18320186404467436976|3|4|-1", "65:18-65:20|15041163540773201510|2|4|-1", "79:16-79:18|0|1|4|-1"] + "uses": ["15:34-15:36|4|-1", "15:39-15:41|4|-1", "33:27-33:29|4|-1", "33:32-33:34|4|-1", "33:67-33:69|4|-1", "54:29-54:31|4|-1", "54:34-54:36|4|-1", "65:18-65:20|4|-1", "79:16-79:18|4|-1"] }, { "usr": 14209198335088845323, "detailed_name": "class unique_ptr", "qual_name_offset": 6, "short_name": "unique_ptr", - "kind": 5, - "declarations": ["2:7-2:17|2:1-2:17|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["2:7-2:17|2:1-2:17|1|-1"], + "derived": [], "instances": [2933643612409209903, 500112618220246], - "uses": ["15:8-15:18|0|1|4|-1", "15:19-15:29|0|1|4|-1", "33:1-33:11|0|1|4|-1", "33:12-33:22|0|1|4|-1", "33:52-33:62|0|1|4|-1", "54:3-54:13|18320186404467436976|3|4|-1", "54:14-54:24|18320186404467436976|3|4|-1", "65:3-65:13|15041163540773201510|2|4|-1", "79:1-79:11|0|1|4|-1"] + "uses": ["15:8-15:18|4|-1", "15:19-15:29|4|-1", "33:1-33:11|4|-1", "33:12-33:22|4|-1", "33:52-33:62|4|-1", "54:3-54:13|4|-1", "54:14-54:24|4|-1", "65:3-65:13|4|-1", "79:1-79:11|4|-1"] }, { "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "64:7-64:10|0|1|2|-1", - "extent": "64:1-66:2|0|1|0|-1", - "alias_of": 0, + "spell": "64:7-64:10|64:1-66:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [17922201480358737771], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["79:21-79:24|0|1|4|-1"] + "uses": ["79:21-79:24|4|-1"] }], "usr2var": [{ "usr": 500112618220246, "detailed_name": "unique_ptr, S2> *local", "qual_name_offset": 36, "short_name": "local", - "declarations": [], - "spell": "54:39-54:44|18320186404467436976|3|2|-1", - "extent": "54:3-54:44|18320186404467436976|3|0|-1", + "spell": "54:39-54:44|54:3-54:44|2|-1", "type": 14209198335088845323, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 2933643612409209903, "detailed_name": "extern unique_ptr, S2> f", "qual_name_offset": 42, "short_name": "f", - "declarations": ["15:43-15:44|15:1-15:44|0|1|1|-1"], "type": 14209198335088845323, - "uses": [], "kind": 13, - "storage": 1 + "parent_kind": 0, + "storage": 1, + "declarations": ["15:43-15:44|15:1-15:44|1|-1"], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_as_template_parameter_simple.cc b/index_tests/usage/type_usage_as_template_parameter_simple.cc index 9f7c8da2..75c9d63e 100644 --- a/index_tests/usage/type_usage_as_template_parameter_simple.cc +++ b/index_tests/usage/type_usage_as_template_parameter_simple.cc @@ -16,46 +16,47 @@ OUTPUT: "detailed_name": "class unique_ptr {}", "qual_name_offset": 6, "short_name": "unique_ptr", - "kind": 5, - "declarations": [], - "spell": "2:7-2:17|0|1|2|-1", - "extent": "2:1-2:20|0|1|0|-1", - "alias_of": 0, + "spell": "2:7-2:17|2:1-2:20|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [3398408600781120939], - "uses": ["6:8-6:18|0|1|4|-1"] + "uses": ["6:8-6:18|4|-1"] }, { "usr": 4750332761459066907, "detailed_name": "struct S", "qual_name_offset": 7, "short_name": "S", - "kind": 23, - "declarations": ["4:8-4:9|4:1-4:9|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["4:8-4:9|4:1-4:9|1|-1"], + "derived": [], "instances": [], - "uses": ["6:19-6:20|0|1|4|-1"] + "uses": ["6:19-6:20|4|-1"] }], "usr2var": [{ "usr": 3398408600781120939, "detailed_name": "static unique_ptr foo", "qual_name_offset": 21, "short_name": "foo", - "declarations": [], - "spell": "6:22-6:25|0|1|2|-1", - "extent": "6:1-6:25|0|1|0|-1", + "spell": "6:22-6:25|6:1-6:25|2|-1", "type": 3286534761799572592, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_extern.cc b/index_tests/usage/type_usage_declare_extern.cc index 4d09cd85..afe6962f 100644 --- a/index_tests/usage/type_usage_declare_extern.cc +++ b/index_tests/usage/type_usage_declare_extern.cc @@ -12,29 +12,30 @@ OUTPUT: "detailed_name": "struct T {}", "qual_name_offset": 7, "short_name": "T", - "kind": 23, - "declarations": [], - "spell": "1:8-1:9|0|1|2|-1", - "extent": "1:1-1:12|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:9|1:1-1:12|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [1346710425945444872], - "uses": ["3:8-3:9|0|1|4|-1"] + "uses": ["3:8-3:9|4|-1"] }], "usr2var": [{ "usr": 1346710425945444872, "detailed_name": "extern T t", "qual_name_offset": 9, "short_name": "t", - "declarations": ["3:10-3:11|3:1-3:11|0|1|1|-1"], "type": 5673439900521455039, - "uses": [], "kind": 13, - "storage": 1 + "parent_kind": 0, + "storage": 1, + "declarations": ["3:10-3:11|3:1-3:11|1|-1"], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_field.cc b/index_tests/usage/type_usage_declare_field.cc index 09cae9e5..fe6f1afb 100644 --- a/index_tests/usage/type_usage_declare_field.cc +++ b/index_tests/usage/type_usage_declare_field.cc @@ -17,47 +17,43 @@ OUTPUT: "detailed_name": "struct ImplementedType {}", "qual_name_offset": 7, "short_name": "ImplementedType", - "kind": 23, - "declarations": [], - "spell": "2:8-2:23|0|1|2|-1", - "extent": "2:1-2:26|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:23|2:1-2:26|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [14727441168849658842], - "uses": ["6:3-6:18|15041163540773201510|2|4|-1"] + "uses": ["6:3-6:18|4|-1"] }, { "usr": 13749354388332789217, "detailed_name": "struct ForwardType", "qual_name_offset": 7, "short_name": "ForwardType", - "kind": 23, - "declarations": ["1:8-1:19|1:1-1:19|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:19|1:1-1:19|1|-1"], + "derived": [], "instances": [14314859014962085433], - "uses": ["5:3-5:14|15041163540773201510|2|4|-1"] + "uses": ["5:3-5:14|4|-1"] }, { "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "4:8-4:11|0|1|2|-1", - "extent": "4:1-7:2|0|1|0|-1", - "alias_of": 0, + "spell": "4:8-4:11|4:1-7:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 14314859014962085433, "R": 0 @@ -65,6 +61,11 @@ OUTPUT: "L": 14727441168849658842, "R": 64 }], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -73,25 +74,25 @@ OUTPUT: "detailed_name": "ForwardType *Foo::a", "qual_name_offset": 13, "short_name": "a", - "declarations": [], - "spell": "5:16-5:17|15041163540773201510|2|1026|-1", - "extent": "5:3-5:17|15041163540773201510|2|0|-1", + "spell": "5:16-5:17|5:3-5:17|1026|-1", "type": 13749354388332789217, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 14727441168849658842, "detailed_name": "ImplementedType Foo::b", "qual_name_offset": 16, "short_name": "b", - "declarations": [], - "spell": "6:19-6:20|15041163540773201510|2|1026|-1", - "extent": "6:3-6:20|15041163540773201510|2|0|-1", + "spell": "6:19-6:20|6:3-6:20|1026|-1", "type": 8508299082070213750, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_local.cc b/index_tests/usage/type_usage_declare_local.cc index 39fd917d..82415f55 100644 --- a/index_tests/usage/type_usage_declare_local.cc +++ b/index_tests/usage/type_usage_declare_local.cc @@ -16,74 +16,75 @@ OUTPUT: "detailed_name": "void Foo()", "qual_name_offset": 5, "short_name": "Foo", + "spell": "4:6-4:9|4:1-7:2|2|-1", + "bases": [], + "vars": [16374832544037266261, 2580122838476012357], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "4:6-4:9|0|1|2|-1", - "extent": "4:1-7:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [16374832544037266261, 2580122838476012357], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 8508299082070213750, "detailed_name": "struct ImplementedType {}", "qual_name_offset": 7, "short_name": "ImplementedType", - "kind": 23, - "declarations": [], - "spell": "2:8-2:23|0|1|2|-1", - "extent": "2:1-2:26|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:23|2:1-2:26|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [2580122838476012357], - "uses": ["6:3-6:18|4654328188330986029|3|4|-1"] + "uses": ["6:3-6:18|4|-1"] }, { "usr": 13749354388332789217, "detailed_name": "struct ForwardType", "qual_name_offset": 7, "short_name": "ForwardType", - "kind": 23, - "declarations": ["1:8-1:19|1:1-1:19|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:19|1:1-1:19|1|-1"], + "derived": [], "instances": [16374832544037266261], - "uses": ["5:3-5:14|4654328188330986029|3|4|-1"] + "uses": ["5:3-5:14|4|-1"] }], "usr2var": [{ "usr": 2580122838476012357, "detailed_name": "ImplementedType b", "qual_name_offset": 16, "short_name": "b", - "declarations": [], - "spell": "6:19-6:20|4654328188330986029|3|2|-1", - "extent": "6:3-6:20|4654328188330986029|3|0|-1", + "spell": "6:19-6:20|6:3-6:20|2|-1", "type": 8508299082070213750, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 16374832544037266261, "detailed_name": "ForwardType *a", "qual_name_offset": 13, "short_name": "a", - "declarations": [], - "spell": "5:16-5:17|4654328188330986029|3|2|-1", - "extent": "5:3-5:17|4654328188330986029|3|0|-1", + "spell": "5:16-5:17|5:3-5:17|2|-1", "type": 13749354388332789217, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_param.cc b/index_tests/usage/type_usage_declare_param.cc index 1570ef02..ae7c0006 100644 --- a/index_tests/usage/type_usage_declare_param.cc +++ b/index_tests/usage/type_usage_declare_param.cc @@ -13,74 +13,75 @@ OUTPUT: "detailed_name": "void foo(ForwardType *f, ImplementedType a)", "qual_name_offset": 5, "short_name": "foo", + "spell": "4:6-4:9|4:1-4:47|2|-1", + "bases": [], + "vars": [13058491096576226774, 11055777568039014776], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "4:6-4:9|0|1|2|-1", - "extent": "4:1-4:47|0|1|0|-1", - "bases": [], "derived": [], - "vars": [13058491096576226774, 11055777568039014776], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 8508299082070213750, "detailed_name": "struct ImplementedType {}", "qual_name_offset": 7, "short_name": "ImplementedType", - "kind": 23, - "declarations": [], - "spell": "2:8-2:23|0|1|2|-1", - "extent": "2:1-2:26|0|1|0|-1", - "alias_of": 0, + "spell": "2:8-2:23|2:1-2:26|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [11055777568039014776], - "uses": ["4:26-4:41|0|1|4|-1"] + "uses": ["4:26-4:41|4|-1"] }, { "usr": 13749354388332789217, "detailed_name": "struct ForwardType", "qual_name_offset": 7, "short_name": "ForwardType", - "kind": 23, - "declarations": ["1:8-1:19|1:1-1:19|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:19|1:1-1:19|1|-1"], + "derived": [], "instances": [13058491096576226774], - "uses": ["4:10-4:21|0|1|4|-1"] + "uses": ["4:10-4:21|4|-1"] }], "usr2var": [{ "usr": 11055777568039014776, "detailed_name": "ImplementedType a", "qual_name_offset": 16, "short_name": "a", - "declarations": [], - "spell": "4:42-4:43|1699390678058422036|3|1026|-1", - "extent": "4:26-4:43|1699390678058422036|3|0|-1", + "spell": "4:42-4:43|4:26-4:43|1026|-1", "type": 8508299082070213750, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 13058491096576226774, "detailed_name": "ForwardType *f", "qual_name_offset": 13, "short_name": "f", - "declarations": [], - "spell": "4:23-4:24|1699390678058422036|3|1026|-1", - "extent": "4:10-4:24|1699390678058422036|3|0|-1", + "spell": "4:23-4:24|4:10-4:24|1026|-1", "type": 13749354388332789217, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_param_prototype.cc b/index_tests/usage/type_usage_declare_param_prototype.cc index 3f205c9d..7c33416a 100644 --- a/index_tests/usage/type_usage_declare_param_prototype.cc +++ b/index_tests/usage/type_usage_declare_param_prototype.cc @@ -18,45 +18,46 @@ OUTPUT: "detailed_name": "void foo(Foo *f, Foo *)", "qual_name_offset": 5, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["3:6-3:9|3:1-3:23|0|1|1|-1"], - "spell": "4:6-4:9|0|1|2|-1", - "extent": "4:1-4:26|0|1|0|-1", + "spell": "4:6-4:9|4:1-4:26|2|-1", "bases": [], - "derived": [], "vars": [13823260660189154978], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:6-3:9|3:1-3:23|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": ["1:8-1:11|1:1-1:11|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:11|1:1-1:11|1|-1"], + "derived": [], "instances": [13823260660189154978], - "uses": ["3:10-3:13|0|1|4|-1", "3:18-3:21|0|1|4|-1", "4:10-4:13|0|1|4|-1", "4:18-4:21|0|1|4|-1"] + "uses": ["3:10-3:13|4|-1", "3:18-3:21|4|-1", "4:10-4:13|4|-1", "4:18-4:21|4|-1"] }], "usr2var": [{ "usr": 13823260660189154978, "detailed_name": "Foo *f", "qual_name_offset": 5, "short_name": "f", - "declarations": [], - "spell": "4:15-4:16|8908726657907936744|3|1026|-1", - "extent": "4:10-4:16|8908726657907936744|3|0|-1", + "spell": "4:15-4:16|4:10-4:16|1026|-1", "type": 15041163540773201510, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_param_unnamed.cc b/index_tests/usage/type_usage_declare_param_unnamed.cc index f50fab00..29208739 100644 --- a/index_tests/usage/type_usage_declare_param_unnamed.cc +++ b/index_tests/usage/type_usage_declare_param_unnamed.cc @@ -10,32 +10,33 @@ OUTPUT: "detailed_name": "void foo(ForwardType *)", "qual_name_offset": 5, "short_name": "foo", + "spell": "2:6-2:9|2:1-2:26|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "2:6-2:9|0|1|2|-1", - "extent": "2:1-2:26|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 13749354388332789217, "detailed_name": "struct ForwardType", "qual_name_offset": 7, "short_name": "ForwardType", - "kind": 23, - "declarations": ["1:8-1:19|1:1-1:19|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:19|1:1-1:19|1|-1"], + "derived": [], "instances": [], - "uses": ["2:10-2:21|0|1|4|-1"] + "uses": ["2:10-2:21|4|-1"] }], "usr2var": [] } diff --git a/index_tests/usage/type_usage_declare_qualifiers.cc b/index_tests/usage/type_usage_declare_qualifiers.cc index ec1f4d9c..b6131373 100644 --- a/index_tests/usage/type_usage_declare_qualifiers.cc +++ b/index_tests/usage/type_usage_declare_qualifiers.cc @@ -16,108 +16,108 @@ OUTPUT: "detailed_name": "void foo(Type &a0, const Type &a1)", "qual_name_offset": 5, "short_name": "foo", + "spell": "3:6-3:9|3:1-8:2|2|-1", + "bases": [], + "vars": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 13487927231218873822, "detailed_name": "struct Type {}", "qual_name_offset": 7, "short_name": "Type", - "kind": 23, - "declarations": [], - "spell": "1:8-1:12|0|1|2|-1", - "extent": "1:1-1:15|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:12|1:1-1:15|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646], - "uses": ["3:10-3:14|0|1|4|-1", "3:26-3:30|0|1|4|-1", "4:3-4:7|16858540520096802573|3|4|-1", "5:3-5:7|16858540520096802573|3|4|-1", "6:9-6:13|16858540520096802573|3|4|-1", "7:9-7:13|16858540520096802573|3|4|-1"] + "uses": ["3:10-3:14|4|-1", "3:26-3:30|4|-1", "4:3-4:7|4|-1", "5:3-5:7|4|-1", "6:9-6:13|4|-1", "7:9-7:13|4|-1"] }], "usr2var": [{ "usr": 5004072032239834773, "detailed_name": "const Type *a4", "qual_name_offset": 12, "short_name": "a4", - "declarations": [], - "spell": "6:15-6:17|16858540520096802573|3|2|-1", - "extent": "6:3-6:17|16858540520096802573|3|0|-1", + "spell": "6:15-6:17|6:3-6:17|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 6081981442495435784, "detailed_name": "Type *a3", "qual_name_offset": 6, "short_name": "a3", - "declarations": [], - "spell": "5:9-5:11|16858540520096802573|3|2|-1", - "extent": "5:3-5:11|16858540520096802573|3|0|-1", + "spell": "5:9-5:11|5:3-5:11|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 7997456978847868736, "detailed_name": "Type &a0", "qual_name_offset": 6, "short_name": "a0", - "declarations": [], - "spell": "3:16-3:18|16858540520096802573|3|1026|-1", - "extent": "3:10-3:18|16858540520096802573|3|0|-1", + "spell": "3:16-3:18|3:10-3:18|1026|-1", "type": 13487927231218873822, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 14939253431683105646, "detailed_name": "const Type *const a5", "qual_name_offset": 18, "short_name": "a5", "hover": "const Type *const a5 = nullptr", - "declarations": [], - "spell": "7:21-7:23|16858540520096802573|3|2|-1", - "extent": "7:3-7:33|16858540520096802573|3|0|-1", + "spell": "7:21-7:23|7:3-7:33|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 15429032129697337561, "detailed_name": "Type a2", "qual_name_offset": 5, "short_name": "a2", - "declarations": [], - "spell": "4:8-4:10|16858540520096802573|3|2|-1", - "extent": "4:3-4:10|16858540520096802573|3|0|-1", + "spell": "4:8-4:10|4:3-4:10|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 17228576662112939520, "detailed_name": "const Type &a1", "qual_name_offset": 12, "short_name": "a1", - "declarations": [], - "spell": "3:32-3:34|16858540520096802573|3|1026|-1", - "extent": "3:20-3:34|16858540520096802573|3|0|-1", + "spell": "3:32-3:34|3:20-3:34|1026|-1", "type": 13487927231218873822, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_declare_static.cc b/index_tests/usage/type_usage_declare_static.cc index ccff19e2..3957ceb2 100644 --- a/index_tests/usage/type_usage_declare_static.cc +++ b/index_tests/usage/type_usage_declare_static.cc @@ -11,31 +11,31 @@ OUTPUT: "detailed_name": "struct Type {}", "qual_name_offset": 7, "short_name": "Type", - "kind": 23, - "declarations": [], - "spell": "1:8-1:12|0|1|2|-1", - "extent": "1:1-1:15|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:12|1:1-1:15|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [6601831367240627080], - "uses": ["2:8-2:12|0|1|4|-1"] + "uses": ["2:8-2:12|4|-1"] }], "usr2var": [{ "usr": 6601831367240627080, "detailed_name": "static Type t", "qual_name_offset": 12, "short_name": "t", - "declarations": [], - "spell": "2:13-2:14|0|1|2|-1", - "extent": "2:1-2:14|0|1|0|-1", + "spell": "2:13-2:14|2:1-2:14|2|-1", "type": 13487927231218873822, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/type_usage_on_return_type.cc b/index_tests/usage/type_usage_on_return_type.cc index 7a07f973..cb6ef08e 100644 --- a/index_tests/usage/type_usage_on_return_type.cc +++ b/index_tests/usage/type_usage_on_return_type.cc @@ -27,107 +27,109 @@ OUTPUT: "detailed_name": "void Foo::Empty()", "qual_name_offset": 5, "short_name": "Empty", - "kind": 6, - "storage": 0, - "declarations": ["9:8-9:13|9:3-9:15|15041163540773201510|2|1025|-1"], - "spell": "13:11-13:16|15041163540773201510|2|1026|-1", - "extent": "13:1-13:21|15041163540773201510|2|0|-1", + "spell": "13:11-13:16|13:1-13:21|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["9:8-9:13|9:3-9:15|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 4259594751088586730, "detailed_name": "Type *foo()", "qual_name_offset": 6, "short_name": "foo", - "kind": 12, - "storage": 0, - "declarations": ["3:7-3:10|3:1-3:12|0|1|1|-1", "4:7-4:10|4:1-4:12|0|1|1|-1"], - "spell": "5:7-5:10|0|1|2|-1", - "extent": "5:1-5:32|0|1|0|-1", + "spell": "5:7-5:10|5:1-5:32|2|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:7-3:10|3:1-3:12|1|-1", "4:7-4:10|4:1-4:12|1|-1"], + "derived": [], + "uses": [] }, { "usr": 7746867874366499515, "detailed_name": "extern const Type &external()", "qual_name_offset": 19, "short_name": "external", - "kind": 12, - "storage": 0, - "declarations": ["15:20-15:28|15:1-15:30|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["15:20-15:28|15:1-15:30|1|-1"], + "derived": [], + "uses": [] }, { "usr": 13402221340333431092, "detailed_name": "Type *Foo::Get(int)", "qual_name_offset": 6, "short_name": "Get", - "kind": 6, - "storage": 0, - "declarations": ["8:9-8:12|8:3-8:17|15041163540773201510|2|1025|-1"], - "spell": "12:12-12:15|15041163540773201510|2|1026|-1", - "extent": "12:1-12:40|15041163540773201510|2|0|-1", + "spell": "12:12-12:15|12:1-12:40|1026|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["8:9-8:12|8:3-8:17|1025|-1"], + "derived": [], + "uses": [] }, { "usr": 18408440185620243373, "detailed_name": "static Type *bar()", "qual_name_offset": 13, "short_name": "bar", - "kind": 12, - "storage": 0, - "declarations": ["17:14-17:17|17:1-17:19|0|1|1|-1"], - "spell": "18:14-18:17|0|1|2|-1", - "extent": "18:1-18:39|0|1|0|-1", + "spell": "18:14-18:17|18:1-18:39|2|-1", "bases": [], - "derived": [], "vars": [], - "uses": [], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["17:14-17:17|17:1-17:19|1|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 13487927231218873822, "detailed_name": "struct Type", "qual_name_offset": 7, "short_name": "Type", - "kind": 23, - "declarations": ["1:8-1:12|1:1-1:12|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:12|1:1-1:12|1|-1"], + "derived": [], "instances": [], - "uses": ["3:1-3:5|0|1|4|-1", "4:1-4:5|0|1|4|-1", "5:1-5:5|0|1|4|-1", "8:3-8:7|15041163540773201510|2|4|-1", "12:1-12:5|0|1|4|-1", "15:14-15:18|0|1|4|-1", "17:8-17:12|0|1|4|-1", "18:8-18:12|0|1|4|-1"] + "uses": ["3:1-3:5|4|-1", "4:1-4:5|4|-1", "5:1-5:5|4|-1", "8:3-8:7|4|-1", "12:1-12:5|4|-1", "15:14-15:18|4|-1", "17:8-17:12|4|-1", "18:8-18:12|4|-1"] }, { "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "7:7-7:10|0|1|2|-1", - "extent": "7:1-10:2|0|1|0|-1", - "alias_of": 0, + "spell": "7:7-7:10|7:1-10:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [13402221340333431092, 4240751906910175539], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["12:7-12:10|0|1|4|-1", "13:6-13:9|0|1|4|-1"] + "uses": ["12:7-12:10|4|-1", "13:6-13:9|4|-1"] }], "usr2var": [] } diff --git a/index_tests/usage/type_usage_typedef_and_using.cc b/index_tests/usage/type_usage_typedef_and_using.cc index 65ca72f3..58c82325 100644 --- a/index_tests/usage/type_usage_typedef_and_using.cc +++ b/index_tests/usage/type_usage_typedef_and_using.cc @@ -19,94 +19,94 @@ OUTPUT: "detailed_name": "void accept1(Foo1 *)", "qual_name_offset": 5, "short_name": "accept1", + "spell": "8:6-8:13|8:1-8:23|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "8:6-8:13|0|1|2|-1", - "extent": "8:1-8:23|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 9119341505144503905, "detailed_name": "void accept(Foo *)", "qual_name_offset": 5, "short_name": "accept", + "spell": "7:6-7:12|7:1-7:21|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "7:6-7:12|0|1|2|-1", - "extent": "7:1-7:21|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 10523262907746124479, "detailed_name": "void accept2(Foo2 *)", "qual_name_offset": 5, "short_name": "accept2", + "spell": "9:6-9:13|9:1-9:23|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "9:6-9:13|0|1|2|-1", - "extent": "9:1-9:23|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }, { "usr": 14986366321326974406, "detailed_name": "void accept3(Foo3 *)", "qual_name_offset": 5, "short_name": "accept3", + "spell": "10:6-10:13|10:1-10:23|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "10:6-10:13|0|1|2|-1", - "extent": "10:1-10:23|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 1544499294580512394, "detailed_name": "using Foo1 = Foo *", "qual_name_offset": 6, "short_name": "Foo1", - "kind": 252, - "declarations": [], - "spell": "2:7-2:11|0|1|2|-1", - "extent": "2:1-2:18|0|1|0|-1", - "alias_of": 15041163540773201510, + "spell": "2:7-2:11|2:1-2:18|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 15041163540773201510, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["4:14-4:18|0|1|4|-1", "8:14-8:18|0|1|4|-1"] + "uses": ["4:14-4:18|4|-1", "8:14-8:18|4|-1"] }, { "usr": 2638219001294786365, "detailed_name": "using Foo4 = int", "qual_name_offset": 6, "short_name": "Foo4", - "kind": 252, - "declarations": [], - "spell": "5:7-5:11|0|1|2|-1", - "extent": "5:1-5:17|0|1|0|-1", - "alias_of": 0, + "spell": "5:7-5:11|5:1-5:17|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }, { @@ -114,50 +114,51 @@ OUTPUT: "detailed_name": "struct Foo", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": ["1:8-1:11|1:1-1:11|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:11|1:1-1:11|1|-1"], + "derived": [], "instances": [], - "uses": ["2:14-2:17|0|1|4|-1", "3:9-3:12|0|1|4|-1", "7:13-7:16|0|1|4|-1"] + "uses": ["2:14-2:17|4|-1", "3:9-3:12|4|-1", "7:13-7:16|4|-1"] }, { "usr": 15466821155413653804, "detailed_name": "typedef Foo Foo2", "qual_name_offset": 12, "short_name": "Foo2", - "kind": 252, - "declarations": [], - "spell": "3:13-3:17|0|1|2|-1", - "extent": "3:1-3:17|0|1|0|-1", - "alias_of": 15041163540773201510, + "spell": "3:13-3:17|3:1-3:17|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 15041163540773201510, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["9:14-9:18|0|1|4|-1"] + "uses": ["9:14-9:18|4|-1"] }, { "usr": 17897026942631673064, "detailed_name": "using Foo3 = Foo1", "qual_name_offset": 6, "short_name": "Foo3", - "kind": 252, - "declarations": [], - "spell": "4:7-4:11|0|1|2|-1", - "extent": "4:1-4:18|0|1|0|-1", - "alias_of": 1544499294580512394, + "spell": "4:7-4:11|4:1-4:18|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 1544499294580512394, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["10:14-10:18|0|1|4|-1"] + "uses": ["10:14-10:18|4|-1"] }], "usr2var": [] } diff --git a/index_tests/usage/type_usage_typedef_and_using_template.cc b/index_tests/usage/type_usage_typedef_and_using_template.cc index 3c742067..00848483 100644 --- a/index_tests/usage/type_usage_typedef_and_using_template.cc +++ b/index_tests/usage/type_usage_typedef_and_using_template.cc @@ -15,48 +15,49 @@ OUTPUT: "detailed_name": "using Foo1 = Foo", "qual_name_offset": 6, "short_name": "Foo1", - "kind": 252, - "declarations": [], - "spell": "4:7-4:11|0|1|2|-1", - "extent": "4:1-4:22|0|1|0|-1", - "alias_of": 10528472276654770367, + "spell": "4:7-4:11|4:1-4:22|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 10528472276654770367, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["5:13-5:17|0|1|4|-1"] + "uses": ["5:13-5:17|4|-1"] }, { "usr": 10528472276654770367, "detailed_name": "struct Foo", "qual_name_offset": 7, "short_name": "Foo", - "kind": 5, - "declarations": ["2:8-2:11|2:1-2:11|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": ["2:8-2:11|2:1-2:11|1|-1"], + "derived": [], "instances": [], - "uses": ["4:14-4:17|0|1|4|-1", "5:9-5:12|0|1|4|-1"] + "uses": ["4:14-4:17|4|-1", "5:9-5:12|4|-1"] }, { "usr": 15933698173231330933, "detailed_name": "typedef Foo Foo2", "qual_name_offset": 18, "short_name": "Foo2", - "kind": 252, - "declarations": [], - "spell": "5:19-5:23|0|1|2|-1", - "extent": "5:1-5:23|0|1|0|-1", - "alias_of": 10528472276654770367, + "spell": "5:19-5:23|5:1-5:23|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 10528472276654770367, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], diff --git a/index_tests/usage/type_usage_various.cc b/index_tests/usage/type_usage_various.cc index 5baaf0f8..d3c8959a 100644 --- a/index_tests/usage/type_usage_various.cc +++ b/index_tests/usage/type_usage_various.cc @@ -19,57 +19,58 @@ OUTPUT: "detailed_name": "Foo *Foo::make()", "qual_name_offset": 5, "short_name": "make", - "kind": 6, - "storage": 0, - "declarations": ["2:8-2:12|2:3-2:14|15041163540773201510|2|1025|-1"], - "spell": "5:11-5:15|15041163540773201510|2|1026|-1", - "extent": "5:1-8:2|15041163540773201510|2|0|-1", + "spell": "5:11-5:15|5:1-8:2|1026|-1", "bases": [], - "derived": [], "vars": [16380484338511689669], - "uses": [], - "callees": [] + "callees": [], + "kind": 6, + "parent_kind": 5, + "storage": 0, + "declarations": ["2:8-2:12|2:3-2:14|1025|-1"], + "derived": [], + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [9488177941273031343], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16380484338511689669, 14455976355866885943], - "uses": ["2:3-2:6|15041163540773201510|2|4|-1", "5:1-5:4|0|1|4|-1", "5:6-5:9|0|1|4|-1", "6:3-6:6|9488177941273031343|3|4|-1", "10:8-10:11|0|1|4|-1"] + "uses": ["2:3-2:6|4|-1", "5:1-5:4|4|-1", "5:6-5:9|4|-1", "6:3-6:6|4|-1", "10:8-10:11|4|-1"] }], "usr2var": [{ "usr": 14455976355866885943, "detailed_name": "extern Foo foo", "qual_name_offset": 11, "short_name": "foo", - "declarations": ["10:12-10:15|10:1-10:15|0|1|1|-1"], "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 1 + "parent_kind": 0, + "storage": 1, + "declarations": ["10:12-10:15|10:1-10:15|1|-1"], + "uses": [] }, { "usr": 16380484338511689669, "detailed_name": "Foo f", "qual_name_offset": 4, "short_name": "f", - "declarations": [], - "spell": "6:7-6:8|9488177941273031343|3|2|-1", - "extent": "6:3-6:8|9488177941273031343|3|0|-1", + "spell": "6:7-6:8|6:3-6:8|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 6, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/usage/usage_inside_of_call.cc b/index_tests/usage/usage_inside_of_call.cc index 39ef7456..44d65416 100644 --- a/index_tests/usage/usage_inside_of_call.cc +++ b/index_tests/usage/usage_inside_of_call.cc @@ -24,56 +24,59 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "12:6-12:9|12:1-15:2|2|-1", + "bases": [], + "vars": [8039186520399841081], + "callees": ["14:3-14:9|18319417758892371313|3|16420", "14:14-14:17|11404602816585117695|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "12:6-12:9|0|1|2|-1", - "extent": "12:1-15:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [8039186520399841081], - "uses": [], - "callees": ["14:3-14:9|18319417758892371313|3|16420", "14:14-14:17|11404602816585117695|3|16420"] + "uses": [] }, { "usr": 11404602816585117695, "detailed_name": "int gen()", "qual_name_offset": 4, "short_name": "gen", - "kind": 12, - "storage": 0, - "declarations": ["3:5-3:8|3:1-3:10|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["14:14-14:17|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["3:5-3:8|3:1-3:10|1|-1"], + "derived": [], + "uses": ["14:14-14:17|16420|-1"] }, { "usr": 18319417758892371313, "detailed_name": "void called(int a)", "qual_name_offset": 5, "short_name": "called", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:12|1:1-1:19|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["14:3-14:9|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:12|1:1-1:19|1|-1"], + "derived": [], + "uses": ["14:3-14:9|16420|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [11489549839875479478, 9648311402855509901, 11489549839875479478, 8039186520399841081], "uses": [] }, { @@ -81,21 +84,21 @@ OUTPUT: "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "5:8-5:11|0|1|2|-1", - "extent": "5:1-8:2|0|1|0|-1", - "alias_of": 0, + "spell": "5:8-5:11|5:1-8:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 9648311402855509901, "R": 0 }], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["10:5-10:8|0|1|4|-1", "14:22-14:25|4259594751088586730|3|4|-1", "14:40-14:43|4259594751088586730|3|4|-1"] + "uses": ["10:5-10:8|4|-1", "14:22-14:25|4|-1", "14:40-14:43|4|-1"] }], "usr2var": [{ "usr": 8039186520399841081, @@ -103,37 +106,37 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "hover": "int a = 5", - "declarations": [], - "spell": "13:7-13:8|4259594751088586730|3|2|-1", - "extent": "13:3-13:12|4259594751088586730|3|0|-1", + "spell": "13:7-13:8|13:3-13:12|2|-1", "type": 53, - "uses": ["14:10-14:11|4259594751088586730|3|12|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["14:10-14:11|12|-1"] }, { "usr": 9648311402855509901, "detailed_name": "int Foo::field_var", "qual_name_offset": 4, "short_name": "field_var", - "declarations": [], - "spell": "7:7-7:16|15041163540773201510|2|1026|-1", - "extent": "7:3-7:16|15041163540773201510|2|0|-1", + "spell": "7:7-7:16|7:3-7:16|1026|-1", "type": 53, - "uses": ["14:28-14:37|4259594751088586730|3|12|-1"], "kind": 8, - "storage": 0 + "parent_kind": 23, + "storage": 0, + "declarations": [], + "uses": ["14:28-14:37|12|-1"] }, { "usr": 11489549839875479478, "detailed_name": "static int Foo::static_var", "qual_name_offset": 11, "short_name": "static_var", - "declarations": ["6:14-6:24|6:3-6:24|15041163540773201510|2|1025|-1"], - "spell": "10:10-10:20|15041163540773201510|2|1026|-1", - "extent": "10:1-10:24|15041163540773201510|2|0|-1", + "spell": "10:10-10:20|10:1-10:24|1026|-1", "type": 53, - "uses": ["14:45-14:55|4259594751088586730|3|12|-1"], "kind": 13, - "storage": 2 + "parent_kind": 23, + "storage": 2, + "declarations": ["6:14-6:24|6:3-6:24|1025|-1"], + "uses": ["14:45-14:55|12|-1"] }] } */ diff --git a/index_tests/usage/usage_inside_of_call_simple.cc b/index_tests/usage/usage_inside_of_call_simple.cc index db2c738e..c2320556 100644 --- a/index_tests/usage/usage_inside_of_call_simple.cc +++ b/index_tests/usage/usage_inside_of_call_simple.cc @@ -16,44 +16,45 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "5:6-5:9|5:1-7:2|2|-1", + "bases": [], + "vars": [], + "callees": ["6:3-6:9|18319417758892371313|3|16420", "6:10-6:13|11404602816585117695|3|16420", "6:18-6:21|11404602816585117695|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "5:6-5:9|0|1|2|-1", - "extent": "5:1-7:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["6:3-6:9|18319417758892371313|3|16420", "6:10-6:13|11404602816585117695|3|16420", "6:18-6:21|11404602816585117695|3|16420"] + "uses": [] }, { "usr": 11404602816585117695, "detailed_name": "int gen()", "qual_name_offset": 4, "short_name": "gen", + "spell": "3:5-3:8|3:1-3:24|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:5-3:8|0|1|2|-1", - "extent": "3:1-3:24|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["6:10-6:13|4259594751088586730|3|16420|-1", "6:18-6:21|4259594751088586730|3|16420|-1"], - "callees": [] + "uses": ["6:10-6:13|16420|-1", "6:18-6:21|16420|-1"] }, { "usr": 18319417758892371313, "detailed_name": "void called(int a)", "qual_name_offset": 5, "short_name": "called", - "kind": 12, - "storage": 0, - "declarations": ["1:6-1:12|1:1-1:19|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["6:3-6:9|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["1:6-1:12|1:1-1:19|1|-1"], + "derived": [], + "uses": ["6:3-6:9|16420|-1"] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/usage/var_usage_call_function.cc b/index_tests/usage/var_usage_call_function.cc index e28d0954..1b867cea 100644 --- a/index_tests/usage/var_usage_call_function.cc +++ b/index_tests/usage/var_usage_call_function.cc @@ -17,31 +17,31 @@ OUTPUT: "detailed_name": "void called()", "qual_name_offset": 5, "short_name": "called", + "spell": "1:6-1:12|1:1-1:17|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:12|0|1|2|-1", - "extent": "1:1-1:17|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": ["4:13-4:19|11404881820527069090|3|132|-1", "7:3-7:9|11404881820527069090|3|16420|-1"], - "callees": [] + "uses": ["4:13-4:19|132|-1", "7:3-7:9|16420|-1"] }, { "usr": 11404881820527069090, "detailed_name": "void caller()", "qual_name_offset": 5, "short_name": "caller", + "spell": "3:6-3:12|3:1-8:2|2|-1", + "bases": [], + "vars": [9121974011454213596], + "callees": ["4:13-4:19|468307235068920063|3|132", "4:13-4:19|468307235068920063|3|132", "7:3-7:9|468307235068920063|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:12|0|1|2|-1", - "extent": "3:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [9121974011454213596], - "uses": [], - "callees": ["4:13-4:19|468307235068920063|3|132", "4:13-4:19|468307235068920063|3|132", "7:3-7:9|468307235068920063|3|16420"] + "uses": [] }], "usr2type": [], "usr2var": [{ @@ -50,13 +50,13 @@ OUTPUT: "qual_name_offset": 5, "short_name": "x", "hover": "auto x = &called", - "declarations": [], - "spell": "4:8-4:9|11404881820527069090|3|2|-1", - "extent": "4:3-4:19|11404881820527069090|3|0|-1", + "spell": "4:8-4:9|4:3-4:19|2|-1", "type": 0, - "uses": ["5:3-5:4|11404881820527069090|3|16428|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["5:3-5:4|16428|-1"] }] } */ diff --git a/index_tests/usage/var_usage_class_member.cc b/index_tests/usage/var_usage_class_member.cc index 1a25fe9f..9f230cd5 100644 --- a/index_tests/usage/var_usage_class_member.cc +++ b/index_tests/usage/var_usage_class_member.cc @@ -27,56 +27,59 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "10:6-10:9|10:1-18:2|2|-1", + "bases": [], + "vars": [14669930844300034456], + "callees": ["14:3-14:9|17175780305784503374|3|16420", "15:3-15:9|17175780305784503374|3|16420", "16:3-16:9|12086644540399881766|3|16420", "17:3-17:9|17175780305784503374|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "10:6-10:9|0|1|2|-1", - "extent": "10:1-18:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [14669930844300034456], - "uses": [], - "callees": ["14:3-14:9|17175780305784503374|3|16420", "15:3-15:9|17175780305784503374|3|16420", "16:3-16:9|12086644540399881766|3|16420", "17:3-17:9|17175780305784503374|3|16420"] + "uses": [] }, { "usr": 12086644540399881766, "detailed_name": "void accept(int *)", "qual_name_offset": 5, "short_name": "accept", - "kind": 12, - "storage": 0, - "declarations": ["8:6-8:12|8:1-8:18|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["16:3-16:9|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["8:6-8:12|8:1-8:18|1|-1"], + "derived": [], + "uses": ["16:3-16:9|16420|-1"] }, { "usr": 17175780305784503374, "detailed_name": "void accept(int)", "qual_name_offset": 5, "short_name": "accept", - "kind": 12, - "storage": 0, - "declarations": ["7:6-7:12|7:1-7:17|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["14:3-14:9|4259594751088586730|3|16420|-1", "15:3-15:9|4259594751088586730|3|16420|-1", "17:3-17:9|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["7:6-7:12|7:1-7:17|1|-1"], + "derived": [], + "uses": ["14:3-14:9|16420|-1", "15:3-15:9|16420|-1", "17:3-17:9|16420|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [4220150017963593039, 3873837747174060388], "uses": [] }, { @@ -84,15 +87,10 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 4220150017963593039, "R": 0 @@ -100,45 +98,50 @@ OUTPUT: "L": 3873837747174060388, "R": 32 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [14669930844300034456], - "uses": ["11:3-11:6|4259594751088586730|3|4|-1"] + "uses": ["11:3-11:6|4|-1"] }], "usr2var": [{ "usr": 3873837747174060388, "detailed_name": "int Foo::y", "qual_name_offset": 4, "short_name": "y", - "declarations": [], - "spell": "4:7-4:8|15041163540773201510|2|1026|-1", - "extent": "4:3-4:8|15041163540773201510|2|0|-1", + "spell": "4:7-4:8|4:3-4:8|1026|-1", "type": 53, - "uses": ["17:12-17:13|4259594751088586730|3|12|-1"], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": ["17:12-17:13|12|-1"] }, { "usr": 4220150017963593039, "detailed_name": "int Foo::x", "qual_name_offset": 4, "short_name": "x", - "declarations": [], - "spell": "3:7-3:8|15041163540773201510|2|1026|-1", - "extent": "3:3-3:8|15041163540773201510|2|0|-1", + "spell": "3:7-3:8|3:3-3:8|1026|-1", "type": 53, - "uses": ["12:5-12:6|4259594751088586730|3|20|-1", "13:5-13:6|4259594751088586730|3|4|-1", "14:12-14:13|4259594751088586730|3|12|-1", "15:12-15:13|4259594751088586730|3|12|-1", "16:13-16:14|4259594751088586730|3|132|-1"], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": ["12:5-12:6|20|-1", "13:5-13:6|4|-1", "14:12-14:13|12|-1", "15:12-15:13|12|-1", "16:13-16:14|132|-1"] }, { "usr": 14669930844300034456, "detailed_name": "Foo f", "qual_name_offset": 4, "short_name": "f", - "declarations": [], - "spell": "11:7-11:8|4259594751088586730|3|2|-1", - "extent": "11:3-11:8|4259594751088586730|3|0|-1", + "spell": "11:7-11:8|11:3-11:8|2|-1", "type": 15041163540773201510, - "uses": ["12:3-12:4|4259594751088586730|3|4|-1", "13:3-13:4|4259594751088586730|3|4|-1", "14:10-14:11|4259594751088586730|3|4|-1", "15:10-15:11|4259594751088586730|3|4|-1", "16:11-16:12|4259594751088586730|3|4|-1", "17:10-17:11|4259594751088586730|3|4|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["12:3-12:4|4|-1", "13:3-13:4|4|-1", "14:10-14:11|4|-1", "15:10-15:11|4|-1", "16:11-16:12|4|-1", "17:10-17:11|4|-1"] }] } */ diff --git a/index_tests/usage/var_usage_class_member_static.cc b/index_tests/usage/var_usage_class_member_static.cc index 8c21456f..9c8e4d57 100644 --- a/index_tests/usage/var_usage_class_member_static.cc +++ b/index_tests/usage/var_usage_class_member_static.cc @@ -18,43 +18,45 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "7:6-7:9|7:1-9:2|2|-1", + "bases": [], + "vars": [], + "callees": ["8:3-8:9|17175780305784503374|3|16420"], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "7:6-7:9|0|1|2|-1", - "extent": "7:1-9:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": ["8:3-8:9|17175780305784503374|3|16420"] + "uses": [] }, { "usr": 17175780305784503374, "detailed_name": "void accept(int)", "qual_name_offset": 5, "short_name": "accept", - "kind": 12, - "storage": 0, - "declarations": ["5:6-5:12|5:1-5:17|0|1|1|-1"], "bases": [], - "derived": [], "vars": [], - "uses": ["8:3-8:9|4259594751088586730|3|16420|-1"], - "callees": [] + "callees": [], + "kind": 12, + "parent_kind": 0, + "storage": 0, + "declarations": ["5:6-5:12|5:1-5:17|1|-1"], + "derived": [], + "uses": ["8:3-8:9|16420|-1"] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [8599782646965457351], "uses": [] }, { @@ -62,29 +64,30 @@ OUTPUT: "detailed_name": "struct Foo {}", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": [], - "spell": "1:8-1:11|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:11|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["8:10-8:13|4259594751088586730|3|4|-1"] + "uses": ["8:10-8:13|4|-1"] }], "usr2var": [{ "usr": 8599782646965457351, "detailed_name": "static int Foo::x", "qual_name_offset": 11, "short_name": "x", - "declarations": ["2:14-2:15|2:3-2:15|15041163540773201510|2|1025|-1"], "type": 53, - "uses": ["8:15-8:16|4259594751088586730|3|12|-1"], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": ["2:14-2:15|2:3-2:15|1025|-1"], + "uses": ["8:15-8:16|12|-1"] }] } */ diff --git a/index_tests/usage/var_usage_cstyle_cast.cc b/index_tests/usage/var_usage_cstyle_cast.cc index dd3fe708..e041ffba 100644 --- a/index_tests/usage/var_usage_cstyle_cast.cc +++ b/index_tests/usage/var_usage_cstyle_cast.cc @@ -18,35 +18,35 @@ OUTPUT: "detailed_name": "enum VarType {}", "qual_name_offset": 5, "short_name": "VarType", - "kind": 10, - "declarations": [], - "spell": "1:6-1:13|0|1|2|-1", - "extent": "1:1-1:16|0|1|0|-1", - "alias_of": 0, + "spell": "1:6-1:13|1:1-1:16|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 10, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [7057400933868440116, 7057400933868440116], - "uses": ["4:20-4:27|10028537921178202800|2|4|-1", "4:42-4:49|10028537921178202800|2|4|-1", "7:7-7:14|0|1|4|-1"] + "uses": ["4:20-4:27|4|-1", "4:42-4:49|4|-1", "7:7-7:14|4|-1"] }, { "usr": 10028537921178202800, "detailed_name": "struct Holder {}", "qual_name_offset": 7, "short_name": "Holder", - "kind": 23, - "declarations": [], - "spell": "3:8-3:14|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "alias_of": 0, + "spell": "3:8-3:14|3:1-5:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["7:15-7:21|0|1|4|-1"] + "uses": ["7:15-7:21|4|-1"] }], "usr2var": [{ "usr": 7057400933868440116, @@ -54,13 +54,13 @@ OUTPUT: "qual_name_offset": 25, "short_name": "static_var", "hover": "static constexpr VarType Holder::static_var = (VarType)0x0", - "declarations": ["4:28-4:38|4:3-4:53|10028537921178202800|2|1025|-1"], - "spell": "7:23-7:33|10028537921178202800|2|1026|-1", - "extent": "7:1-7:33|10028537921178202800|2|0|-1", + "spell": "7:23-7:33|7:1-7:33|1026|-1", "type": 5792006888140599735, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 23, + "storage": 2, + "declarations": ["4:28-4:38|4:3-4:53|1025|-1"], + "uses": [] }] } */ diff --git a/index_tests/usage/var_usage_extern.cc b/index_tests/usage/var_usage_extern.cc index 0d3469e6..14cb93e7 100644 --- a/index_tests/usage/var_usage_extern.cc +++ b/index_tests/usage/var_usage_extern.cc @@ -13,30 +13,31 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "3:6-3:9|3:1-5:2|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [16721564935990383768], "uses": [] }], @@ -45,11 +46,12 @@ OUTPUT: "detailed_name": "extern int a", "qual_name_offset": 11, "short_name": "a", - "declarations": ["1:12-1:13|1:1-1:13|0|1|1|-1"], "type": 53, - "uses": ["4:3-4:4|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 1 + "parent_kind": 0, + "storage": 1, + "declarations": ["1:12-1:13|1:1-1:13|1|-1"], + "uses": ["4:3-4:4|20|-1"] }] } */ diff --git a/index_tests/usage/var_usage_func_parameter.cc b/index_tests/usage/var_usage_func_parameter.cc index 2a5e0867..069c7262 100644 --- a/index_tests/usage/var_usage_func_parameter.cc +++ b/index_tests/usage/var_usage_func_parameter.cc @@ -11,30 +11,31 @@ OUTPUT: "detailed_name": "void foo(int a)", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-3:2|2|-1", + "bases": [], + "vars": [10063793875496522529], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [10063793875496522529], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [10063793875496522529], "uses": [] }], @@ -43,13 +44,13 @@ OUTPUT: "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "1:14-1:15|11998306017310352355|3|1026|-1", - "extent": "1:10-1:15|11998306017310352355|3|0|-1", + "spell": "1:14-1:15|1:10-1:15|1026|-1", "type": 53, - "uses": ["2:3-2:4|11998306017310352355|3|4|-1"], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["2:3-2:4|4|-1"] }] } */ diff --git a/index_tests/usage/var_usage_local.cc b/index_tests/usage/var_usage_local.cc index b4ed3842..577d810c 100644 --- a/index_tests/usage/var_usage_local.cc +++ b/index_tests/usage/var_usage_local.cc @@ -12,30 +12,31 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-4:2|2|-1", + "bases": [], + "vars": [14014650769929566957], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-4:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [14014650769929566957], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [14014650769929566957], "uses": [] }], @@ -44,13 +45,13 @@ OUTPUT: "detailed_name": "int x", "qual_name_offset": 4, "short_name": "x", - "declarations": [], - "spell": "2:7-2:8|4259594751088586730|3|2|-1", - "extent": "2:3-2:8|4259594751088586730|3|0|-1", + "spell": "2:7-2:8|2:3-2:8|2|-1", "type": 53, - "uses": ["3:3-3:4|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["3:3-3:4|20|-1"] }] } */ diff --git a/index_tests/usage/var_usage_shadowed_local.cc b/index_tests/usage/var_usage_shadowed_local.cc index 2aaf27be..efe2d460 100644 --- a/index_tests/usage/var_usage_shadowed_local.cc +++ b/index_tests/usage/var_usage_shadowed_local.cc @@ -17,30 +17,31 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-9:2|2|-1", + "bases": [], + "vars": [13311055950748663970, 14036425367303419504], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-9:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [13311055950748663970, 14036425367303419504], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [13311055950748663970, 14036425367303419504], "uses": [] }], @@ -49,25 +50,25 @@ OUTPUT: "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "2:7-2:8|4259594751088586730|3|2|-1", - "extent": "2:3-2:8|4259594751088586730|3|0|-1", + "spell": "2:7-2:8|2:3-2:8|2|-1", "type": 53, - "uses": ["3:3-3:4|4259594751088586730|3|20|-1", "8:3-8:4|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["3:3-3:4|20|-1", "8:3-8:4|20|-1"] }, { "usr": 14036425367303419504, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "5:9-5:10|4259594751088586730|3|2|-1", - "extent": "5:5-5:10|4259594751088586730|3|0|-1", + "spell": "5:9-5:10|5:5-5:10|2|-1", "type": 53, - "uses": ["6:5-6:6|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["6:5-6:6|20|-1"] }] } */ diff --git a/index_tests/usage/var_usage_shadowed_parameter.cc b/index_tests/usage/var_usage_shadowed_parameter.cc index 801f3a75..dfa4a6ca 100644 --- a/index_tests/usage/var_usage_shadowed_parameter.cc +++ b/index_tests/usage/var_usage_shadowed_parameter.cc @@ -17,30 +17,31 @@ OUTPUT: "detailed_name": "void foo(int a)", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-8:2|2|-1", + "bases": [], + "vars": [11608231465452906059, 6997229590862003559], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-8:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [11608231465452906059, 6997229590862003559], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [11608231465452906059, 6997229590862003559], "uses": [] }], @@ -49,25 +50,25 @@ OUTPUT: "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "4:9-4:10|11998306017310352355|3|2|-1", - "extent": "4:5-4:10|11998306017310352355|3|0|-1", + "spell": "4:9-4:10|4:5-4:10|2|-1", "type": 53, - "uses": ["5:5-5:6|11998306017310352355|3|20|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["5:5-5:6|20|-1"] }, { "usr": 11608231465452906059, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "1:14-1:15|11998306017310352355|3|1026|-1", - "extent": "1:10-1:15|11998306017310352355|3|0|-1", + "spell": "1:14-1:15|1:10-1:15|1026|-1", "type": 53, - "uses": ["2:3-2:4|11998306017310352355|3|20|-1", "7:3-7:4|11998306017310352355|3|20|-1"], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["2:3-2:4|20|-1", "7:3-7:4|20|-1"] }] } */ diff --git a/index_tests/usage/var_usage_static.cc b/index_tests/usage/var_usage_static.cc index 396f3ded..705fddff 100644 --- a/index_tests/usage/var_usage_static.cc +++ b/index_tests/usage/var_usage_static.cc @@ -14,30 +14,31 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "3:6-3:9|3:1-5:2|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [11823161916242867318], "uses": [] }], @@ -46,13 +47,13 @@ OUTPUT: "detailed_name": "static int a", "qual_name_offset": 11, "short_name": "a", - "declarations": [], - "spell": "1:12-1:13|0|1|2|-1", - "extent": "1:1-1:13|0|1|0|-1", + "spell": "1:12-1:13|1:1-1:13|2|-1", "type": 53, - "uses": ["4:3-4:4|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": ["4:3-4:4|20|-1"] }] } */ diff --git a/index_tests/vars/class_member.cc b/index_tests/vars/class_member.cc index 7bb7bc97..9b62aec7 100644 --- a/index_tests/vars/class_member.cc +++ b/index_tests/vars/class_member.cc @@ -12,34 +12,34 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [{ "L": 13799811842374292251, "R": 0 }], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [13799811842374292251], - "uses": ["2:3-2:6|15041163540773201510|2|4|-1"] + "uses": ["2:3-2:6|4|-1"] }], "usr2var": [{ "usr": 13799811842374292251, "detailed_name": "Foo *Foo::member", "qual_name_offset": 5, "short_name": "member", - "declarations": [], - "spell": "2:8-2:14|15041163540773201510|2|1026|-1", - "extent": "2:3-2:14|15041163540773201510|2|0|-1", + "spell": "2:8-2:14|2:3-2:14|1026|-1", "type": 15041163540773201510, - "uses": [], "kind": 8, - "storage": 0 + "parent_kind": 5, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/vars/class_static_member.cc b/index_tests/vars/class_static_member.cc index 86e09041..3c67ac6e 100644 --- a/index_tests/vars/class_static_member.cc +++ b/index_tests/vars/class_static_member.cc @@ -14,31 +14,31 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [5844987037615239736, 5844987037615239736], - "uses": ["2:10-2:13|15041163540773201510|2|4|-1", "4:1-4:4|0|1|4|-1", "4:6-4:9|0|1|4|-1"] + "uses": ["2:10-2:13|4|-1", "4:1-4:4|4|-1", "4:6-4:9|4|-1"] }], "usr2var": [{ "usr": 5844987037615239736, "detailed_name": "static Foo *Foo::member", "qual_name_offset": 12, "short_name": "member", - "declarations": ["2:15-2:21|2:3-2:21|15041163540773201510|2|1025|-1"], - "spell": "4:11-4:17|15041163540773201510|2|1026|-1", - "extent": "4:1-4:27|15041163540773201510|2|0|-1", + "spell": "4:11-4:17|4:1-4:27|1026|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 5, + "storage": 2, + "declarations": ["2:15-2:21|2:3-2:21|1025|-1"], + "uses": [] }] } */ diff --git a/index_tests/vars/class_static_member_decl_only.cc b/index_tests/vars/class_static_member_decl_only.cc index d01c6220..c0a3172a 100644 --- a/index_tests/vars/class_static_member_decl_only.cc +++ b/index_tests/vars/class_static_member_decl_only.cc @@ -12,14 +12,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [5844987037615239736], "uses": [] }, { @@ -27,16 +28,16 @@ OUTPUT: "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-3:2|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], "uses": [] }], @@ -45,11 +46,12 @@ OUTPUT: "detailed_name": "static int Foo::member", "qual_name_offset": 11, "short_name": "member", - "declarations": ["2:14-2:20|2:3-2:20|15041163540773201510|2|1025|-1"], "type": 53, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": ["2:14-2:20|2:3-2:20|1025|-1"], + "uses": [] }] } */ diff --git a/index_tests/vars/deduce_auto_type.cc b/index_tests/vars/deduce_auto_type.cc index f76c0460..a86eb701 100644 --- a/index_tests/vars/deduce_auto_type.cc +++ b/index_tests/vars/deduce_auto_type.cc @@ -14,34 +14,34 @@ OUTPUT: "detailed_name": "void f()", "qual_name_offset": 5, "short_name": "f", + "spell": "2:6-2:7|2:1-5:2|2|-1", + "bases": [], + "vars": [10601729374837386290, 18422884837902130475], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "2:6-2:7|0|1|2|-1", - "extent": "2:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [10601729374837386290, 18422884837902130475], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", - "kind": 5, - "declarations": [], - "spell": "1:7-1:10|0|1|2|-1", - "extent": "1:1-1:13|0|1|0|-1", - "alias_of": 0, + "spell": "1:7-1:10|1:1-1:13|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 5, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [10601729374837386290, 18422884837902130475], - "uses": ["3:16-3:19|880549676430489861|3|4|-1", "4:17-4:20|880549676430489861|3|4|-1"] + "uses": ["3:16-3:19|4|-1", "4:17-4:20|4|-1"] }], "usr2var": [{ "usr": 10601729374837386290, @@ -49,26 +49,26 @@ OUTPUT: "qual_name_offset": 5, "short_name": "x", "hover": "auto x = new Foo()", - "declarations": [], - "spell": "3:8-3:9|880549676430489861|3|2|-1", - "extent": "3:3-3:21|880549676430489861|3|0|-1", + "spell": "3:8-3:9|3:3-3:21|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 18422884837902130475, "detailed_name": "Foo *y", "qual_name_offset": 5, "short_name": "y", "hover": "Foo *y = new Foo()", - "declarations": [], - "spell": "4:9-4:10|880549676430489861|3|2|-1", - "extent": "4:3-4:22|880549676430489861|3|0|-1", + "spell": "4:9-4:10|4:3-4:22|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/vars/function_local.cc b/index_tests/vars/function_local.cc index 66b96573..70a985ba 100644 --- a/index_tests/vars/function_local.cc +++ b/index_tests/vars/function_local.cc @@ -14,45 +14,46 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "3:6-3:9|3:1-5:2|2|-1", + "bases": [], + "vars": [13198746475679542317], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [13198746475679542317], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": ["1:8-1:11|1:1-1:11|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:11|1:1-1:11|1|-1"], + "derived": [], "instances": [13198746475679542317], - "uses": ["4:3-4:6|4259594751088586730|3|4|-1"] + "uses": ["4:3-4:6|4|-1"] }], "usr2var": [{ "usr": 13198746475679542317, "detailed_name": "Foo *a", "qual_name_offset": 5, "short_name": "a", - "declarations": [], - "spell": "4:8-4:9|4259594751088586730|3|2|-1", - "extent": "4:3-4:9|4259594751088586730|3|0|-1", + "spell": "4:8-4:9|4:3-4:9|2|-1", "type": 15041163540773201510, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/vars/function_param.cc b/index_tests/vars/function_param.cc index a9c8683f..751fbd65 100644 --- a/index_tests/vars/function_param.cc +++ b/index_tests/vars/function_param.cc @@ -12,57 +12,58 @@ OUTPUT: "detailed_name": "void foo(Foo *p0, Foo *p1)", "qual_name_offset": 5, "short_name": "foo", + "spell": "3:6-3:9|3:1-3:30|2|-1", + "bases": [], + "vars": [8730439006497971620, 2525014371090380500], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-3:30|0|1|0|-1", - "bases": [], "derived": [], - "vars": [8730439006497971620, 2525014371090380500], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 15041163540773201510, "detailed_name": "struct Foo", "qual_name_offset": 7, "short_name": "Foo", - "kind": 23, - "declarations": ["1:8-1:11|1:1-1:11|0|1|1|-1"], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": ["1:8-1:11|1:1-1:11|1|-1"], + "derived": [], "instances": [8730439006497971620, 2525014371090380500], - "uses": ["3:10-3:13|0|1|4|-1", "3:19-3:22|0|1|4|-1"] + "uses": ["3:10-3:13|4|-1", "3:19-3:22|4|-1"] }], "usr2var": [{ "usr": 2525014371090380500, "detailed_name": "Foo *p1", "qual_name_offset": 5, "short_name": "p1", - "declarations": [], - "spell": "3:24-3:26|8908726657907936744|3|1026|-1", - "extent": "3:19-3:26|8908726657907936744|3|0|-1", + "spell": "3:24-3:26|3:19-3:26|1026|-1", "type": 15041163540773201510, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 8730439006497971620, "detailed_name": "Foo *p0", "qual_name_offset": 5, "short_name": "p0", - "declarations": [], - "spell": "3:15-3:17|8908726657907936744|3|1026|-1", - "extent": "3:10-3:17|8908726657907936744|3|0|-1", + "spell": "3:15-3:17|3:10-3:17|1026|-1", "type": 15041163540773201510, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/vars/function_param_unnamed.cc b/index_tests/vars/function_param_unnamed.cc index 48b4f60b..bd8c9d84 100644 --- a/index_tests/vars/function_param_unnamed.cc +++ b/index_tests/vars/function_param_unnamed.cc @@ -9,16 +9,16 @@ OUTPUT: "detailed_name": "void foo(int, int)", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-1:22|2|-1", + "bases": [], + "vars": [], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-1:22|0|1|0|-1", - "bases": [], "derived": [], - "vars": [], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [], "usr2var": [] diff --git a/index_tests/vars/function_shadow_local.cc b/index_tests/vars/function_shadow_local.cc index d6ffa4ef..0ccc91e3 100644 --- a/index_tests/vars/function_shadow_local.cc +++ b/index_tests/vars/function_shadow_local.cc @@ -17,30 +17,31 @@ OUTPUT: "detailed_name": "void foo()", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-9:2|2|-1", + "bases": [], + "vars": [1894874819807168345, 4508045017817092115], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-9:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [1894874819807168345, 4508045017817092115], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [1894874819807168345, 4508045017817092115], "uses": [] }], @@ -49,25 +50,25 @@ OUTPUT: "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "2:7-2:8|4259594751088586730|3|2|-1", - "extent": "2:3-2:8|4259594751088586730|3|0|-1", + "spell": "2:7-2:8|2:3-2:8|2|-1", "type": 53, - "uses": ["3:3-3:4|4259594751088586730|3|20|-1", "8:3-8:4|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["3:3-3:4|20|-1", "8:3-8:4|20|-1"] }, { "usr": 4508045017817092115, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", - "declarations": [], - "spell": "5:9-5:10|4259594751088586730|3|2|-1", - "extent": "5:5-5:10|4259594751088586730|3|0|-1", + "spell": "5:9-5:10|5:5-5:10|2|-1", "type": 53, - "uses": ["6:5-6:6|4259594751088586730|3|20|-1"], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["6:5-6:6|20|-1"] }] } */ diff --git a/index_tests/vars/function_shadow_param.cc b/index_tests/vars/function_shadow_param.cc index 9ef35ec9..80f8d4f1 100644 --- a/index_tests/vars/function_shadow_param.cc +++ b/index_tests/vars/function_shadow_param.cc @@ -11,30 +11,31 @@ OUTPUT: "detailed_name": "void foo(int p)", "qual_name_offset": 5, "short_name": "foo", + "spell": "1:6-1:9|1:1-3:2|2|-1", + "bases": [], + "vars": [5875271969926422921, 11404600766177939811], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "1:6-1:9|0|1|2|-1", - "extent": "1:1-3:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [5875271969926422921, 11404600766177939811], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 53, "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [5875271969926422921, 11404600766177939811], "uses": [] }], @@ -43,26 +44,26 @@ OUTPUT: "detailed_name": "int p", "qual_name_offset": 4, "short_name": "p", - "declarations": [], - "spell": "1:14-1:15|11998306017310352355|3|1026|-1", - "extent": "1:10-1:15|11998306017310352355|3|0|-1", + "spell": "1:14-1:15|1:10-1:15|1026|-1", "type": 53, - "uses": [], "kind": 253, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }, { "usr": 11404600766177939811, "detailed_name": "int p", "qual_name_offset": 4, "short_name": "p", "hover": "int p = 0", - "declarations": [], - "spell": "2:9-2:10|11998306017310352355|3|2|-1", - "extent": "2:5-2:14|11998306017310352355|3|0|-1", + "spell": "2:9-2:10|2:5-2:14|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/vars/global_variable.cc b/index_tests/vars/global_variable.cc index 0f563a73..3ce2d119 100644 --- a/index_tests/vars/global_variable.cc +++ b/index_tests/vars/global_variable.cc @@ -10,14 +10,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [6834525061342585382], "uses": [] }], @@ -27,13 +28,13 @@ OUTPUT: "qual_name_offset": 11, "short_name": "global", "hover": "static int global = 0", - "declarations": [], - "spell": "1:12-1:18|0|1|2|-1", - "extent": "1:1-1:22|0|1|0|-1", + "spell": "1:12-1:18|1:1-1:22|2|-1", "type": 53, - "uses": [], "kind": 13, - "storage": 2 + "parent_kind": 0, + "storage": 2, + "declarations": [], + "uses": [] }] } */ diff --git a/index_tests/vars/global_variable_decl_only.cc b/index_tests/vars/global_variable_decl_only.cc index 0ecf84a2..1ba9f2e4 100644 --- a/index_tests/vars/global_variable_decl_only.cc +++ b/index_tests/vars/global_variable_decl_only.cc @@ -10,14 +10,15 @@ OUTPUT: "detailed_name": "", "qual_name_offset": 0, "short_name": "", - "kind": 0, - "declarations": [], - "alias_of": 0, "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [9937941849651546906], "uses": [] }], @@ -26,11 +27,12 @@ OUTPUT: "detailed_name": "extern int global", "qual_name_offset": 11, "short_name": "global", - "declarations": ["1:12-1:18|1:1-1:18|0|1|1|-1"], "type": 53, - "uses": [], "kind": 13, - "storage": 1 + "parent_kind": 0, + "storage": 1, + "declarations": ["1:12-1:18|1:1-1:18|1|-1"], + "uses": [] }] } */ diff --git a/index_tests/vars/type_instance_on_using_type.cc b/index_tests/vars/type_instance_on_using_type.cc index b924afd5..ce3607eb 100644 --- a/index_tests/vars/type_instance_on_using_type.cc +++ b/index_tests/vars/type_instance_on_using_type.cc @@ -16,64 +16,64 @@ OUTPUT: "detailed_name": "void Foo()", "qual_name_offset": 5, "short_name": "Foo", + "spell": "3:6-3:9|3:1-5:2|2|-1", + "bases": [], + "vars": [6975456769752895964], + "callees": [], "kind": 12, + "parent_kind": 0, "storage": 0, "declarations": [], - "spell": "3:6-3:9|0|1|2|-1", - "extent": "3:1-5:2|0|1|0|-1", - "bases": [], "derived": [], - "vars": [6975456769752895964], - "uses": [], - "callees": [] + "uses": [] }], "usr2type": [{ "usr": 4750332761459066907, "detailed_name": "struct S {}", "qual_name_offset": 7, "short_name": "S", - "kind": 23, - "declarations": [], - "spell": "1:8-1:9|0|1|2|-1", - "extent": "1:1-1:12|0|1|0|-1", - "alias_of": 0, + "spell": "1:8-1:9|1:1-1:12|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 0, + "kind": 23, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [], - "uses": ["2:11-2:12|0|1|4|-1"] + "uses": ["2:11-2:12|4|-1"] }, { "usr": 7434820806199665424, "detailed_name": "using F = S", "qual_name_offset": 6, "short_name": "F", - "kind": 252, - "declarations": [], - "spell": "2:7-2:8|0|1|2|-1", - "extent": "2:1-2:12|0|1|0|-1", - "alias_of": 4750332761459066907, + "spell": "2:7-2:8|2:1-2:12|2|-1", "bases": [], - "derived": [], - "types": [], "funcs": [], + "types": [], "vars": [], + "alias_of": 4750332761459066907, + "kind": 252, + "parent_kind": 0, + "declarations": [], + "derived": [], "instances": [6975456769752895964], - "uses": ["4:3-4:4|4654328188330986029|3|4|-1"] + "uses": ["4:3-4:4|4|-1"] }], "usr2var": [{ "usr": 6975456769752895964, "detailed_name": "F a", "qual_name_offset": 2, "short_name": "a", - "declarations": [], - "spell": "4:5-4:6|4654328188330986029|3|2|-1", - "extent": "4:3-4:6|4654328188330986029|3|0|-1", + "spell": "4:5-4:6|4:3-4:6|2|-1", "type": 7434820806199665424, - "uses": [], "kind": 13, - "storage": 0 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] }] } */ diff --git a/src/message_handler.cc b/src/message_handler.cc index e1a56b27..465d21c2 100644 --- a/src/message_handler.cc +++ b/src/message_handler.cc @@ -128,9 +128,8 @@ void EmitSemanticHighlighting(DB *db, WorkingFile *wfile, QueryFile *file) { // Group symbols together. std::unordered_map grouped_symbols; - for (auto &sym_refcnt : file->symbol2refcnt) { - if (sym_refcnt.second <= 0) continue; - SymbolRef sym = sym_refcnt.first; + for (auto [sym, refcnt] : file->symbol2refcnt) { + if (refcnt <= 0) continue; std::string_view detailed_name; lsSymbolKind parent_kind = lsSymbolKind::Unknown; lsSymbolKind kind = lsSymbolKind::Unknown;