From e535fab581b5a65a92af51939629e4d619fb405a Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Mon, 11 Dec 2017 21:15:37 -0800 Subject: [PATCH] Do not elide vector in serialization --- src/serializer.h | 2 - tests/_empty_test.cc | 8 +- tests/class_forward_declaration.cc | 12 +- tests/constructors/constructor.cc | 16 ++- tests/constructors/destructor.cc | 23 +++- tests/constructors/implicit_constructor.cc | 16 ++- tests/constructors/invalid_reference.cc | 17 ++- tests/constructors/make_functions.cc | 121 ++++++++++++++++-- tests/declaration_vs_definition/class.cc | 12 +- .../declaration_vs_definition/class_member.cc | 8 ++ .../class_member_static.cc | 8 ++ tests/declaration_vs_definition/func.cc | 21 ++- .../func_associated_function_params.cc | 9 +- tests/declaration_vs_definition/method.cc | 37 +++++- tests/enums/enum_class_decl.cc | 8 ++ tests/enums/enum_decl.cc | 8 ++ tests/enums/enum_inherit.cc | 8 ++ tests/enums/enum_usage.cc | 7 + tests/foobar.cc | 25 ++++ tests/function_declaration.cc | 12 +- tests/function_declaration_definition.cc | 15 ++- tests/function_definition.cc | 13 +- tests/inheritance/class_inherit.cc | 16 ++- .../class_inherit_templated_parent.cc | 35 ++++- tests/inheritance/class_multiple_inherit.cc | 24 +++- tests/inheritance/function_override.cc | 28 +++- tests/inheritance/interface_pure_virtual.cc | 17 ++- tests/lambdas/lambda.cc | 20 ++- tests/macros/complex.cc | 15 ++- tests/macros/foo.cc | 14 +- tests/method_declaration.cc | 19 ++- tests/method_definition.cc | 19 ++- tests/method_inline_declaration.cc | 17 ++- tests/multi_file/funky_enum.cc | 22 +++- tests/multi_file/impl.cc | 51 +++++++- tests/multi_file/simple_impl.cc | 30 ++++- tests/multi_file/static.cc | 35 ++++- tests/namespaces/anonymous_function.cc | 15 ++- tests/namespaces/function_declaration.cc | 12 +- tests/namespaces/function_definition.cc | 13 +- tests/namespaces/method_declaration.cc | 19 ++- tests/namespaces/method_definition.cc | 19 ++- tests/namespaces/method_inline_declaration.cc | 17 ++- tests/namespaces/namespace_alias.cc | 10 +- tests/namespaces/namespace_reference.cc | 13 +- tests/operators/operator.cc | 35 ++++- tests/outline/outline.cc | 12 ++ tests/outline/outline2.cc | 22 +++- tests/outline/static_function_in_type.cc | 40 +++++- tests/preprocessor/include_guard.cc | 4 + tests/preprocessor/skipped.cc | 6 +- tests/stl.cc | 6 +- .../func_specialized_template_param.cc | 22 +++- .../implicit_variable_instantiation.cc | 13 ++ ...ass_template_func_usage_folded_into_one.cc | 13 +- ...ace_template_type_usage_folded_into_one.cc | 8 ++ .../templates/specialized_func_definition.cc | 22 +++- ...mplate_class_func_usage_folded_into_one.cc | 13 +- ...ass_template_func_usage_folded_into_one.cc | 13 +- ...mplate_class_type_usage_folded_into_one.cc | 25 ++++ ...emplate_class_var_usage_folded_into_one.cc | 9 ++ .../template_func_usage_folded_into_one.cc | 9 +- .../template_type_usage_folded_into_one.cc | 8 ++ .../template_var_usage_folded_into_one.cc | 20 +++ tests/types/anonymous_struct.cc | 13 ++ tests/unions/union_decl.cc | 8 ++ tests/unions/union_usage.cc | 13 +- tests/usage/func_called_from_constructor.cc | 22 +++- .../usage/func_called_from_macro_argument.cc | 12 +- tests/usage/func_called_from_template.cc | 21 ++- tests/usage/func_called_implicit_ctor.cc | 25 +++- tests/usage/func_usage_addr_func.cc | 19 ++- tests/usage/func_usage_addr_method.cc | 19 ++- tests/usage/func_usage_call_func.cc | 16 ++- tests/usage/func_usage_call_method.cc | 18 ++- .../usage/func_usage_class_inline_var_def.cc | 13 +- tests/usage/func_usage_forward_decl_func.cc | 18 ++- tests/usage/func_usage_forward_decl_method.cc | 18 ++- tests/usage/func_usage_template_func.cc | 15 ++- .../usage/type_usage_as_template_parameter.cc | 20 ++- ...ype_usage_as_template_parameter_complex.cc | 53 +++++++- ...type_usage_as_template_parameter_simple.cc | 14 ++ tests/usage/type_usage_declare_extern.cc | 8 ++ tests/usage/type_usage_declare_field.cc | 18 +++ tests/usage/type_usage_declare_local.cc | 19 ++- tests/usage/type_usage_declare_param.cc | 19 ++- .../type_usage_declare_param_prototype.cc | 13 +- .../usage/type_usage_declare_param_unnamed.cc | 18 ++- tests/usage/type_usage_declare_qualifiers.cc | 14 +- tests/usage/type_usage_declare_static.cc | 8 ++ tests/usage/type_usage_on_return_type.cc | 61 +++++++-- tests/usage/type_usage_typedef_and_using.cc | 63 ++++++++- .../type_usage_typedef_and_using_template.cc | 24 +++- tests/usage/type_usage_various.cc | 15 ++- tests/usage/usage_inside_of_call.cc | 24 +++- tests/usage/usage_inside_of_call_simple.cc | 21 ++- tests/usage/var_usage_call_function.cc | 13 +- tests/usage/var_usage_class_member.cc | 20 ++- tests/usage/var_usage_class_member_static.cc | 17 ++- tests/usage/var_usage_cstyle_cast.cc | 13 ++ tests/usage/var_usage_extern.cc | 10 +- tests/usage/var_usage_func_parameter.cc | 10 +- tests/usage/var_usage_local.cc | 10 +- tests/usage/var_usage_shadowed_local.cc | 10 +- tests/usage/var_usage_shadowed_parameter.cc | 10 +- tests/usage/var_usage_static.cc | 10 +- tests/vars/class_member.cc | 7 + tests/vars/class_static_member.cc | 7 + tests/vars/class_static_member_decl_only.cc | 9 ++ tests/vars/deduce_auto_type.cc | 14 +- tests/vars/function_local.cc | 14 +- tests/vars/function_param.cc | 14 +- tests/vars/function_param_unnamed.cc | 13 +- tests/vars/function_shadow_local.cc | 10 +- tests/vars/function_shadow_param.cc | 10 +- tests/vars/global_variable.cc | 4 + tests/vars/global_variable_decl_only.cc | 4 + tests/vars/type_instance_on_using_type.cc | 20 ++- 118 files changed, 1898 insertions(+), 199 deletions(-) diff --git a/src/serializer.h b/src/serializer.h index 9406f8cf..98f13729 100644 --- a/src/serializer.h +++ b/src/serializer.h @@ -138,8 +138,6 @@ void ReflectMember(Writer& visitor, const char* name, T& value) { } template void ReflectMember(Writer& visitor, const char* name, std::vector& values) { - if (values.empty()) - return; visitor.Key(name); visitor.StartArray(); for (auto& value : values) diff --git a/tests/_empty_test.cc b/tests/_empty_test.cc index 228b2674..237e1553 100644 --- a/tests/_empty_test.cc +++ b/tests/_empty_test.cc @@ -1,4 +1,10 @@ /* OUTPUT: -{} +{ + "includes": [], + "skipped_by_preprocessor": [], + "types": [], + "funcs": [], + "vars": [] +} */ diff --git a/tests/class_forward_declaration.cc b/tests/class_forward_declaration.cc index b669f4e9..3c66a1f8 100644 --- a/tests/class_forward_declaration.cc +++ b/tests/class_forward_declaration.cc @@ -6,6 +6,8 @@ class Foo; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -13,7 +15,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "3:7-3:10", "definition_extent": "3:1-3:13", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:7-1:10", "2:7-2:10", "3:7-3:10", "4:7-4:10"] - }] + }], + "funcs": [], + "vars": [] } */ diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc index 19caa84b..16576195 100644 --- a/tests/constructors/constructor.cc +++ b/tests/constructors/constructor.cc @@ -11,6 +11,8 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -18,7 +20,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], "instances": [0, 1], "uses": ["1:7-1:10", "3:3-3:6", "7:3-7:6", "8:3-8:6", "8:17-8:20"] }], @@ -28,18 +34,26 @@ OUTPUT: "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", "detailed_name": "void Foo::Foo()", + "declarations": [], "definition_spelling": "3:3-3:6", "definition_extent": "3:3-3:11", "declaring_type": 0, - "callers": ["~1@7:7-7:8", "1@8:17-8:20"] + "derived": [], + "locals": [], + "callers": ["~1@7:7-7:8", "1@8:17-8:20"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "6:6-6:9", "definition_extent": "6:1-9:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["~0@7:7-7:8", "0@8:17-8:20"] }], "vars": [{ diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc index 7613ec14..981f2134 100644 --- a/tests/constructors/destructor.cc +++ b/tests/constructors/destructor.cc @@ -16,6 +16,8 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -23,7 +25,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0, 1], + "vars": [], "instances": [0], "uses": ["1:7-1:10", "3:3-3:6", "4:4-4:7", "8:3-8:6"] }], @@ -33,27 +39,40 @@ OUTPUT: "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", "detailed_name": "void Foo::Foo()", + "declarations": [], "definition_spelling": "3:3-3:6", "definition_extent": "3:3-3:11", "declaring_type": 0, - "callers": ["~2@8:7-8:8"] + "derived": [], + "locals": [], + "callers": ["~2@8:7-8:8"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@S@Foo@F@~Foo#", "short_name": "~Foo", "detailed_name": "void Foo::~Foo() noexcept", + "declarations": [], "definition_spelling": "4:3-4:7", "definition_extent": "4:3-4:12", - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["~0@8:7-8:8"] }], "vars": [{ diff --git a/tests/constructors/implicit_constructor.cc b/tests/constructors/implicit_constructor.cc index 09e9f950..28f09c98 100644 --- a/tests/constructors/implicit_constructor.cc +++ b/tests/constructors/implicit_constructor.cc @@ -10,6 +10,8 @@ void Make() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Type", @@ -17,7 +19,11 @@ OUTPUT: "detailed_name": "Type", "definition_spelling": "1:8-1:12", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], "instances": [0], "uses": ["1:8-1:12", "2:3-2:7", "6:3-6:7"] }], @@ -27,18 +33,26 @@ OUTPUT: "usr": "c:@S@Type@F@Type#", "short_name": "Type", "detailed_name": "void Type::Type()", + "declarations": [], "definition_spelling": "2:3-2:7", "definition_extent": "2:3-2:12", "declaring_type": 0, - "callers": ["~1@6:8-6:11"] + "derived": [], + "locals": [], + "callers": ["~1@6:8-6:11"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@Make#", "short_name": "Make", "detailed_name": "void Make()", + "declarations": [], "definition_spelling": "5:6-5:10", "definition_extent": "5:1-8:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["~0@6:8-6:11"] }], "vars": [{ diff --git a/tests/constructors/invalid_reference.cc b/tests/constructors/invalid_reference.cc index ff29e6fb..0d1b0f62 100644 --- a/tests/constructors/invalid_reference.cc +++ b/tests/constructors/invalid_reference.cc @@ -6,6 +6,8 @@ Foo::Foo() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -13,7 +15,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-1:14", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:8-1:11", "4:6-4:9", "4:1-4:4"] }], "funcs": [{ @@ -22,9 +29,15 @@ OUTPUT: "usr": "c:@S@Foo@FT@>1#TFoo#v#", "short_name": "Foo", "detailed_name": "void Foo::Foo()", + "declarations": [], "definition_spelling": "4:6-4:9", "definition_extent": "4:1-4:11", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/constructors/make_functions.cc b/tests/constructors/make_functions.cc index 58e5f274..a4fe7899 100644 --- a/tests/constructors/make_functions.cc +++ b/tests/constructors/make_functions.cc @@ -26,6 +26,8 @@ void caller22() { /* OUTPUT: make_functions.h { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Bar", @@ -33,6 +35,12 @@ OUTPUT: make_functions.h "detailed_name": "Bar", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-1:14", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:8-1:11", "7:17-7:20", "8:15-8:18"] }, { "id": 1, @@ -41,7 +49,12 @@ OUTPUT: make_functions.h "detailed_name": "Foobar", "definition_spelling": "3:7-3:13", "definition_extent": "3:1-9:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0, 1, 2, 3], + "vars": [], + "instances": [], "uses": ["3:7-3:13", "5:3-5:9", "6:3-6:9", "7:3-7:9", "8:3-8:9"] }], "funcs": [{ @@ -50,37 +63,58 @@ OUTPUT: make_functions.h "usr": "c:@S@Foobar@F@Foobar#", "short_name": "Foobar", "detailed_name": "void Foobar::Foobar()", + "declarations": [], "definition_spelling": "5:3-5:9", "definition_extent": "5:3-5:14", - "declaring_type": 1 + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@S@Foobar@F@Foobar#I#", "short_name": "Foobar", "detailed_name": "void Foobar::Foobar(int)", + "declarations": [], "definition_spelling": "6:3-6:9", "definition_extent": "6:3-6:17", - "declaring_type": 1 + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@S@Foobar@F@Foobar#&&I#*$@S@Bar#*b#", "short_name": "Foobar", "detailed_name": "void Foobar::Foobar(int &&, Bar *, bool *)", + "declarations": [], "definition_spelling": "7:3-7:9", "definition_extent": "7:3-7:32", - "declaring_type": 1 + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 3, "is_operator": false, "usr": "c:@S@Foobar@F@Foobar#I#*$@S@Bar#*b#", "short_name": "Foobar", "detailed_name": "void Foobar::Foobar(int, Bar *, bool *)", + "declarations": [], "definition_spelling": "8:3-8:9", "definition_extent": "8:3-8:30", - "declaring_type": 1 - }] + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } OUTPUT: make_functions.cc { @@ -88,41 +122,78 @@ OUTPUT: make_functions.cc "line": 1, "resolved_path": "&make_functions.h" }], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:make_functions.cc@41", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:1-4:2"] }, { "id": 1, "usr": "c:make_functions.cc@53", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:15-4:19"] }, { "id": 2, "usr": "c:make_functions.cc@139", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["9:1-9:2"] }, { "id": 3, "usr": "c:make_functions.cc@151", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["9:16-9:20"] }, { "id": 4, "usr": "c:@S@Foobar", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["14:14-14:20", "15:14-15:20", "16:14-16:20", "17:15-17:21"] }, { "id": 5, "usr": "c:@S@Bar", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["16:29-16:32", "17:30-17:33"] }], "funcs": [{ @@ -131,26 +202,38 @@ OUTPUT: make_functions.cc "usr": "c:@FT@>2#T#pTMakeUnique#P&&t0.1#*t0.0#", "short_name": "MakeUnique", "detailed_name": "T *MakeUnique(Args &&...)", + "declarations": [], "definition_spelling": "4:4-4:14", "definition_extent": "4:1-6:2", - "callers": ["2@14:3-14:13", "2@15:3-15:13", "2@16:3-16:13"] + "derived": [], + "locals": [], + "callers": ["2@14:3-14:13", "2@15:3-15:13", "2@16:3-16:13"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@FT@>2#T#pTmaKE_NoRefs#Pt0.1#*t0.0#", "short_name": "maKE_NoRefs", "detailed_name": "T *maKE_NoRefs(Args...)", + "declarations": [], "definition_spelling": "9:4-9:15", "definition_extent": "9:1-11:2", - "callers": ["2@17:3-17:14"] + "derived": [], + "locals": [], + "callers": ["2@17:3-17:14"], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@caller22#", "short_name": "caller22", "detailed_name": "void caller22()", + "declarations": [], "definition_spelling": "13:6-13:14", "definition_extent": "13:1-18:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@14:3-14:13", "0@15:3-15:13", "0@16:3-16:13", "1@17:3-17:14"] }, { "id": 3, @@ -158,28 +241,44 @@ OUTPUT: make_functions.cc "usr": "c:@S@Foobar@F@Foobar#", "short_name": "", "detailed_name": "", - "callers": ["~-1@14:3-14:13"] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["~-1@14:3-14:13"], + "callees": [] }, { "id": 4, "is_operator": false, "usr": "c:@S@Foobar@F@Foobar#I#", "short_name": "", "detailed_name": "", - "callers": ["~-1@15:3-15:13"] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["~-1@15:3-15:13"], + "callees": [] }, { "id": 5, "is_operator": false, "usr": "c:@S@Foobar@F@Foobar#&&I#*$@S@Bar#*b#", "short_name": "", "detailed_name": "", - "callers": ["~-1@16:3-16:13"] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["~-1@16:3-16:13"], + "callees": [] }, { "id": 6, "is_operator": false, "usr": "c:@S@Foobar@F@Foobar#I#*$@S@Bar#*b#", "short_name": "", "detailed_name": "", - "callers": ["~-1@17:3-17:14"] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["~-1@17:3-17:14"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/declaration_vs_definition/class.cc b/tests/declaration_vs_definition/class.cc index c7290937..2470c80d 100644 --- a/tests/declaration_vs_definition/class.cc +++ b/tests/declaration_vs_definition/class.cc @@ -8,6 +8,8 @@ class Foo; // for comments. OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -15,7 +17,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "3:7-3:10", "definition_extent": "3:1-3:13", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:7-1:10", "2:7-2:10", "3:7-3:10", "4:7-4:10"] - }] + }], + "funcs": [], + "vars": [] } */ diff --git a/tests/declaration_vs_definition/class_member.cc b/tests/declaration_vs_definition/class_member.cc index 50eea642..2c4e5845 100644 --- a/tests/declaration_vs_definition/class_member.cc +++ b/tests/declaration_vs_definition/class_member.cc @@ -5,6 +5,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -12,9 +14,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], + "instances": [], "uses": ["1:7-1:10"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Foo@FI@foo", diff --git a/tests/declaration_vs_definition/class_member_static.cc b/tests/declaration_vs_definition/class_member_static.cc index 0e7172da..77b92ee6 100644 --- a/tests/declaration_vs_definition/class_member_static.cc +++ b/tests/declaration_vs_definition/class_member_static.cc @@ -7,6 +7,8 @@ int Foo::foo; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -14,9 +16,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], + "instances": [], "uses": ["1:7-1:10", "5:5-5:8"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Foo@foo", diff --git a/tests/declaration_vs_definition/func.cc b/tests/declaration_vs_definition/func.cc index ac9bd556..00d55b22 100644 --- a/tests/declaration_vs_definition/func.cc +++ b/tests/declaration_vs_definition/func.cc @@ -7,6 +7,9 @@ void foo(); // Note: we always use the latest seen ("most local") definition/declaration. OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -16,18 +19,26 @@ OUTPUT: "declarations": [{ "spelling": "1:6-1:9", "extent": "1:1-1:11", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }, { "spelling": "2:6-2:9", "extent": "2:1-2:11", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }, { "spelling": "4:6-4:9", "extent": "4:1-4:11", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-3:14" - }] + "definition_extent": "3:1-3:14", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/declaration_vs_definition/func_associated_function_params.cc b/tests/declaration_vs_definition/func_associated_function_params.cc index 9763ba25..7b2f6b87 100644 --- a/tests/declaration_vs_definition/func_associated_function_params.cc +++ b/tests/declaration_vs_definition/func_associated_function_params.cc @@ -7,6 +7,9 @@ int foo(int a, int b) { return 0; } /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -30,7 +33,11 @@ OUTPUT: "param_spellings": ["4:13-4:16", "4:22-4:25"] }], "definition_spelling": "5:5-5:8", - "definition_extent": "5:1-5:36" + "definition_extent": "5:1-5:36", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/declaration_vs_definition/method.cc b/tests/declaration_vs_definition/method.cc index 04b9f572..f0a16391 100644 --- a/tests/declaration_vs_definition/method.cc +++ b/tests/declaration_vs_definition/method.cc @@ -9,6 +9,8 @@ void Foo::def() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -16,7 +18,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0, 1, 2], + "vars": [], + "instances": [], "uses": ["1:7-1:10", "7:6-7:9"] }], "funcs": [{ @@ -28,9 +35,14 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:16", "extent": "2:3-2:18", - "content": "void declonly()" + "content": "void declonly()", + "param_spellings": [] }], - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": false, @@ -40,9 +52,14 @@ OUTPUT: "declarations": [{ "spelling": "3:16-3:27", "extent": "3:3-3:33", - "content": "virtual void purevirtual() = 0" + "content": "virtual void purevirtual() = 0", + "param_spellings": [] }], - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": false, @@ -52,11 +69,17 @@ OUTPUT: "declarations": [{ "spelling": "4:8-4:11", "extent": "4:3-4:13", - "content": "void def()" + "content": "void def()", + "param_spellings": [] }], "definition_spelling": "7:11-7:14", "definition_extent": "7:1-7:19", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/enums/enum_class_decl.cc b/tests/enums/enum_class_decl.cc index 9ddc3010..8fd8cbdf 100644 --- a/tests/enums/enum_class_decl.cc +++ b/tests/enums/enum_class_decl.cc @@ -6,6 +6,8 @@ enum class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@Foo", @@ -13,9 +15,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:12-1:15", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], + "instances": [], "uses": ["1:12-1:15"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@E@Foo@A", diff --git a/tests/enums/enum_decl.cc b/tests/enums/enum_decl.cc index fce43617..5ff3ab69 100644 --- a/tests/enums/enum_decl.cc +++ b/tests/enums/enum_decl.cc @@ -6,6 +6,8 @@ enum Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@Foo", @@ -13,9 +15,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], + "instances": [], "uses": ["1:6-1:9"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@E@Foo@A", diff --git a/tests/enums/enum_inherit.cc b/tests/enums/enum_inherit.cc index a779fbeb..043a0211 100644 --- a/tests/enums/enum_inherit.cc +++ b/tests/enums/enum_inherit.cc @@ -6,6 +6,8 @@ enum Foo : int { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@Foo", @@ -13,9 +15,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], + "instances": [], "uses": ["1:6-1:9"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@E@Foo@A", diff --git a/tests/enums/enum_usage.cc b/tests/enums/enum_usage.cc index e69c85dd..8457326c 100644 --- a/tests/enums/enum_usage.cc +++ b/tests/enums/enum_usage.cc @@ -8,6 +8,8 @@ Foo x = Foo::A; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@Foo", @@ -15,10 +17,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:12-1:15", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], "instances": [2], "uses": ["1:12-1:15", "6:1-6:4", "6:9-6:12"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@E@Foo@A", diff --git a/tests/foobar.cc b/tests/foobar.cc index b2cb9f74..40dffd4e 100644 --- a/tests/foobar.cc +++ b/tests/foobar.cc @@ -11,6 +11,8 @@ Foo b; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@A", @@ -18,6 +20,12 @@ OUTPUT: "detailed_name": "A", "definition_spelling": "1:6-1:7", "definition_extent": "1:1-1:10", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:6-1:7", "9:5-9:6"] }, { "id": 1, @@ -26,6 +34,12 @@ OUTPUT: "detailed_name": "B", "definition_spelling": "2:6-2:7", "definition_extent": "2:1-2:10", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:6-2:7", "10:5-10:6"] }, { "id": 2, @@ -34,6 +48,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-7:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [1], "uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"] }, { @@ -43,9 +62,15 @@ OUTPUT: "detailed_name": "Foo::Inner", "definition_spelling": "6:10-6:15", "definition_extent": "6:3-6:18", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["6:10-6:15", "9:9-9:14"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@a", diff --git a/tests/function_declaration.cc b/tests/function_declaration.cc index 7a605d2f..22baacb8 100644 --- a/tests/function_declaration.cc +++ b/tests/function_declaration.cc @@ -3,6 +3,9 @@ void foo(int a, int b); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -14,7 +17,12 @@ OUTPUT: "extent": "1:1-1:23", "content": "void foo(int a, int b)", "param_spellings": ["1:14-1:15", "1:21-1:22"] - }] - }] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/function_declaration_definition.cc b/tests/function_declaration_definition.cc index 1ac38897..05703672 100644 --- a/tests/function_declaration_definition.cc +++ b/tests/function_declaration_definition.cc @@ -5,6 +5,9 @@ void foo() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -14,10 +17,16 @@ OUTPUT: "declarations": [{ "spelling": "1:6-1:9", "extent": "1:1-1:11", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-3:14" - }] + "definition_extent": "3:1-3:14", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/function_definition.cc b/tests/function_definition.cc index cf4fd675..e2d2746e 100644 --- a/tests/function_definition.cc +++ b/tests/function_definition.cc @@ -3,14 +3,23 @@ void foo() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-1:14" - }] + "definition_extent": "1:1-1:14", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/inheritance/class_inherit.cc b/tests/inheritance/class_inherit.cc index 64e710cf..79d3003a 100644 --- a/tests/inheritance/class_inherit.cc +++ b/tests/inheritance/class_inherit.cc @@ -4,6 +4,8 @@ class Derived : public Parent {}; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Parent", @@ -11,7 +13,12 @@ OUTPUT: "detailed_name": "Parent", "definition_spelling": "1:7-1:13", "definition_extent": "1:1-1:16", + "parents": [], "derived": [1], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:7-1:13", "2:24-2:30"] }, { "id": 1, @@ -21,7 +28,14 @@ OUTPUT: "definition_spelling": "2:7-2:14", "definition_extent": "2:1-2:33", "parents": [0], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:7-2:14"] - }] + }], + "funcs": [], + "vars": [] } */ diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc index 4569e9dd..97489b72 100644 --- a/tests/inheritance/class_inherit_templated_parent.cc +++ b/tests/inheritance/class_inherit_templated_parent.cc @@ -15,6 +15,8 @@ class Derived : Base1<3>, Base2, Derived1<4>, Derived2 {}; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#Ni@Base1", @@ -22,7 +24,12 @@ OUTPUT: "detailed_name": "Base1", "definition_spelling": "2:7-2:12", "definition_extent": "2:1-2:15", + "parents": [], "derived": [2, 5], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:7-2:12", "8:18-8:23", "13:17-13:22"] }, { "id": 1, @@ -31,7 +38,12 @@ OUTPUT: "detailed_name": "Base2", "definition_spelling": "5:7-5:12", "definition_extent": "5:1-5:15", + "parents": [], "derived": [3, 5], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:7-5:12", "11:18-11:23", "13:27-13:32"] }, { "id": 2, @@ -42,6 +54,10 @@ OUTPUT: "definition_extent": "8:1-8:29", "parents": [0], "derived": [5], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["8:7-8:15", "13:43-13:51"] }, { "id": 3, @@ -52,12 +68,22 @@ OUTPUT: "definition_extent": "11:1-11:29", "parents": [1], "derived": [5], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["11:7-11:15", "13:56-13:64"] }, { "id": 4, "usr": "c:class_inherit_templated_parent.cc@154", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["11:24-11:25"] }, { "id": 5, @@ -67,7 +93,14 @@ OUTPUT: "definition_spelling": "13:7-13:14", "definition_extent": "13:1-13:76", "parents": [0, 1, 2, 3], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["13:7-13:14", "13:33-13:40", "13:65-13:72"] - }] + }], + "funcs": [], + "vars": [] } */ diff --git a/tests/inheritance/class_multiple_inherit.cc b/tests/inheritance/class_multiple_inherit.cc index cb4d5e5e..b017c1a6 100644 --- a/tests/inheritance/class_multiple_inherit.cc +++ b/tests/inheritance/class_multiple_inherit.cc @@ -6,6 +6,8 @@ class Derived : public MiddleA, public MiddleB {}; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Root", @@ -13,7 +15,12 @@ OUTPUT: "detailed_name": "Root", "definition_spelling": "1:7-1:11", "definition_extent": "1:1-1:14", + "parents": [], "derived": [1, 2], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:7-1:11", "2:24-2:28", "3:24-3:28"] }, { "id": 1, @@ -24,6 +31,10 @@ OUTPUT: "definition_extent": "2:1-2:31", "parents": [0], "derived": [3], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:7-2:14", "4:24-4:31"] }, { "id": 2, @@ -34,6 +45,10 @@ OUTPUT: "definition_extent": "3:1-3:31", "parents": [0], "derived": [3], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["3:7-3:14", "4:40-4:47"] }, { "id": 3, @@ -43,7 +58,14 @@ OUTPUT: "definition_spelling": "4:7-4:14", "definition_extent": "4:1-4:50", "parents": [1, 2], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:7-4:14"] - }] + }], + "funcs": [], + "vars": [] } */ diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc index 0e85e6f1..ffe7ac29 100644 --- a/tests/inheritance/function_override.cc +++ b/tests/inheritance/function_override.cc @@ -8,6 +8,8 @@ class Derived : public Root { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Root", @@ -15,8 +17,12 @@ OUTPUT: "detailed_name": "Root", "definition_spelling": "1:7-1:11", "definition_extent": "1:1-3:2", + "parents": [], "derived": [1], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:7-1:11", "4:24-4:28"] }, { "id": 1, @@ -26,7 +32,11 @@ OUTPUT: "definition_spelling": "4:7-4:14", "definition_extent": "4:1-6:2", "parents": [0], + "derived": [], + "types": [], "funcs": [1], + "vars": [], + "instances": [], "uses": ["4:7-4:14"] }], "funcs": [{ @@ -38,20 +48,30 @@ OUTPUT: "declarations": [{ "spelling": "2:16-2:19", "extent": "2:3-2:21", - "content": "virtual void foo()" + "content": "virtual void foo()", + "param_spellings": [] }], "declaring_type": 0, - "derived": [1] + "derived": [1], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@S@Derived@F@foo#", "short_name": "foo", "detailed_name": "void Derived::foo()", + "declarations": [], "definition_spelling": "5:8-5:11", "definition_extent": "5:3-5:25", "declaring_type": 1, - "base": 0 - }] + "base": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc index 6fdcfbff..e1538179 100644 --- a/tests/inheritance/interface_pure_virtual.cc +++ b/tests/inheritance/interface_pure_virtual.cc @@ -5,6 +5,8 @@ class IFoo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@IFoo", @@ -12,7 +14,12 @@ OUTPUT: "detailed_name": "IFoo", "definition_spelling": "1:7-1:11", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:7-1:11"] }], "funcs": [{ @@ -21,9 +28,15 @@ OUTPUT: "usr": "c:@S@IFoo@F@foo#", "short_name": "foo", "detailed_name": "void IFoo::foo()", + "declarations": [], "definition_spelling": "2:16-2:19", "definition_extent": "2:3-2:28", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/lambdas/lambda.cc b/tests/lambdas/lambda.cc index 14799e8d..591374e8 100644 --- a/tests/lambdas/lambda.cc +++ b/tests/lambdas/lambda.cc @@ -14,12 +14,20 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:lambda.cc@47@F@foo#@Sa", "short_name": "", "detailed_name": "", - "instances": [1] + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [1], + "uses": [] }], "funcs": [{ "id": 0, @@ -27,8 +35,12 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "1:6-1:9", "definition_extent": "1:1-12:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["1@9:14-9:15", "1@10:14-10:15", "1@11:14-11:15"] }, { "id": 1, @@ -36,7 +48,11 @@ OUTPUT: "usr": "c:lambda.cc@57@F@foo#@Sa@F@operator()#I#1", "short_name": "", "detailed_name": "", - "callers": ["0@9:14-9:15", "0@10:14-10:15", "0@11:14-11:15"] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["0@9:14-9:15", "0@10:14-10:15", "0@11:14-11:15"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/macros/complex.cc b/tests/macros/complex.cc index d3e2a3ec..1a48103d 100644 --- a/tests/macros/complex.cc +++ b/tests/macros/complex.cc @@ -14,15 +14,22 @@ FOO(make1(), make2); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@make1#", "short_name": "make1", "detailed_name": "int make1()", + "declarations": [], "definition_spelling": "6:5-6:10", "definition_extent": "6:1-8:2", - "callers": ["1@12:5-12:10"] + "derived": [], + "locals": [], + "callers": ["1@12:5-12:10"], + "callees": [] }, { "id": 1, "is_operator": false, @@ -32,10 +39,14 @@ OUTPUT: "declarations": [{ "spelling": "12:1-12:20", "extent": "12:1-12:20", - "content": "int a();\n int a() { return aaa + bbb; }\n\n\n int make1() {\n return 3;\n }\n const int make2 = 5;\n\n\n FOO(make1(), make2)" + "content": "int a();\n int a() { return aaa + bbb; }\n\n\n int make1() {\n return 3;\n }\n const int make2 = 5;\n\n\n FOO(make1(), make2)", + "param_spellings": [] }], "definition_spelling": "12:1-12:20", "definition_extent": "12:1-12:20", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@12:5-12:10"] }], "vars": [{ diff --git a/tests/macros/foo.cc b/tests/macros/foo.cc index bc711a66..7c551804 100644 --- a/tests/macros/foo.cc +++ b/tests/macros/foo.cc @@ -10,6 +10,8 @@ int x = A; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -17,7 +19,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "4:8-4:11", "definition_extent": "4:1-6:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["4:8-4:11", "5:12-5:15"] }], "funcs": [{ @@ -26,9 +33,14 @@ OUTPUT: "usr": "c:@S@Foo@F@Foo#&&$@S@Foo#", "short_name": "Foo", "detailed_name": "void Foo::Foo(Foo &&)", + "declarations": [], "definition_spelling": "5:12-5:15", "definition_extent": "5:12-5:16", - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc index efe9013b..a74f5776 100644 --- a/tests/method_declaration.cc +++ b/tests/method_declaration.cc @@ -9,6 +9,8 @@ class Foo { OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -16,7 +18,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:7-1:10"] }], "funcs": [{ @@ -28,9 +35,15 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:11", "extent": "2:3-2:13", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/method_definition.cc b/tests/method_definition.cc index dd02f747..faeeb736 100644 --- a/tests/method_definition.cc +++ b/tests/method_definition.cc @@ -7,6 +7,8 @@ void Foo::foo() const {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -14,7 +16,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:7-1:10", "5:6-5:9"] }], "funcs": [{ @@ -26,11 +33,17 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:11", "extent": "2:3-2:19", - "content": "void foo() const" + "content": "void foo() const", + "param_spellings": [] }], "definition_spelling": "5:11-5:14", "definition_extent": "5:1-5:25", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/method_inline_declaration.cc b/tests/method_inline_declaration.cc index e9694479..9c2ad988 100644 --- a/tests/method_inline_declaration.cc +++ b/tests/method_inline_declaration.cc @@ -5,6 +5,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -12,7 +14,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:7-1:10"] }], "funcs": [{ @@ -21,9 +28,15 @@ OUTPUT: "usr": "c:@S@Foo@F@foo#", "short_name": "foo", "detailed_name": "void Foo::foo()", + "declarations": [], "definition_spelling": "2:8-2:11", "definition_extent": "2:3-2:16", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/multi_file/funky_enum.cc b/tests/multi_file/funky_enum.cc index ab54fee3..d5e6da87 100644 --- a/tests/multi_file/funky_enum.cc +++ b/tests/multi_file/funky_enum.cc @@ -8,13 +8,22 @@ enum Foo { OUTPUT: funky_enum.h { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@Foo", "short_name": "", "detailed_name": "", - "vars": [0, 1, 2] + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [0, 1, 2], + "instances": [], + "uses": [] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@E@Foo@A", @@ -59,6 +68,7 @@ OUTPUT: funky_enum.cc "line": 2, "resolved_path": "&funky_enum.h" }], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@Foo", @@ -66,7 +76,15 @@ OUTPUT: funky_enum.cc "detailed_name": "Foo", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:6-1:9"] - }] + }], + "funcs": [], + "vars": [] } */ \ No newline at end of file diff --git a/tests/multi_file/impl.cc b/tests/multi_file/impl.cc index 34b23679..246e9667 100644 --- a/tests/multi_file/impl.cc +++ b/tests/multi_file/impl.cc @@ -7,6 +7,8 @@ void Impl() { /* OUTPUT: header.h { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Base", @@ -14,7 +16,12 @@ OUTPUT: header.h "detailed_name": "Base", "definition_spelling": "3:8-3:12", "definition_extent": "3:1-3:15", + "parents": [], "derived": [1], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["3:8-3:12", "5:26-5:30"] }, { "id": 1, @@ -24,6 +31,11 @@ OUTPUT: header.h "definition_spelling": "5:8-5:23", "definition_extent": "5:1-5:33", "parents": [0], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:8-5:23", "7:14-7:29"] }, { "id": 2, @@ -33,6 +45,12 @@ OUTPUT: header.h "definition_spelling": "7:7-7:11", "definition_extent": "7:1-7:29", "alias_of": 1, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["7:7-7:11"] }, { "id": 3, @@ -41,6 +59,12 @@ OUTPUT: header.h "detailed_name": "Foo2", "definition_spelling": "13:8-13:12", "definition_extent": "13:1-13:15", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["13:8-13:12"] }, { "id": 4, @@ -49,7 +73,12 @@ OUTPUT: header.h "detailed_name": "Foo3", "definition_spelling": "15:6-15:10", "definition_extent": "15:1-15:22", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1, 2], + "instances": [], "uses": ["15:6-15:10"] }], "funcs": [{ @@ -58,8 +87,13 @@ OUTPUT: header.h "usr": "c:@FT@>1#TFoo1#v#", "short_name": "Foo1", "detailed_name": "void Foo1()", + "declarations": [], "definition_spelling": "10:6-10:10", - "definition_extent": "10:1-10:15" + "definition_extent": "10:1-10:15", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, @@ -125,14 +159,20 @@ OUTPUT: impl.cc "line": 1, "resolved_path": "&header.h" }], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@Impl#", "short_name": "Impl", "detailed_name": "void Impl()", + "declarations": [], "definition_spelling": "3:6-3:10", "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["1@4:3-4:7"] }, { "id": 1, @@ -140,7 +180,12 @@ OUTPUT: impl.cc "usr": "c:@FT@>1#TFoo1#v#", "short_name": "", "detailed_name": "", - "callers": ["0@4:3-4:7"] - }] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["0@4:3-4:7"], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/multi_file/simple_impl.cc b/tests/multi_file/simple_impl.cc index 050bb8d0..554553e7 100644 --- a/tests/multi_file/simple_impl.cc +++ b/tests/multi_file/simple_impl.cc @@ -7,6 +7,9 @@ void impl() { /* OUTPUT: simple_header.h { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -16,9 +19,15 @@ OUTPUT: simple_header.h "declarations": [{ "spelling": "3:6-3:12", "extent": "3:1-3:14", - "content": "void header()" - }] - }] + "content": "void header()", + "param_spellings": [] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } OUTPUT: simple_impl.cc { @@ -26,14 +35,20 @@ OUTPUT: simple_impl.cc "line": 1, "resolved_path": "&simple_header.h" }], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@impl#", "short_name": "impl", "detailed_name": "void impl()", + "declarations": [], "definition_spelling": "3:6-3:10", "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["1@4:3-4:9"] }, { "id": 1, @@ -41,7 +56,12 @@ OUTPUT: simple_impl.cc "usr": "c:@F@header#", "short_name": "", "detailed_name": "", - "callers": ["0@4:3-4:9"] - }] + "declarations": [], + "derived": [], + "locals": [], + "callers": ["0@4:3-4:9"], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/multi_file/static.cc b/tests/multi_file/static.cc index 3d9d905b..9e32ab03 100644 --- a/tests/multi_file/static.cc +++ b/tests/multi_file/static.cc @@ -5,6 +5,8 @@ void Buffer::CreateSharedBuffer() {} /* OUTPUT: static.h { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Buffer", @@ -12,7 +14,12 @@ OUTPUT: static.h "detailed_name": "Buffer", "definition_spelling": "3:8-3:14", "definition_extent": "3:1-5:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["3:8-3:14"] }], "funcs": [{ @@ -24,10 +31,16 @@ OUTPUT: static.h "declarations": [{ "spelling": "4:15-4:33", "extent": "4:3-4:35", - "content": "static void CreateSharedBuffer()" + "content": "static void CreateSharedBuffer()", + "param_spellings": [] }], - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } OUTPUT: static.cc { @@ -35,12 +48,18 @@ OUTPUT: static.cc "line": 1, "resolved_path": "&static.h" }], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Buffer", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["3:6-3:12"] }], "funcs": [{ @@ -49,9 +68,15 @@ OUTPUT: static.cc "usr": "c:@S@Buffer@F@CreateSharedBuffer#S", "short_name": "CreateSharedBuffer", "detailed_name": "void Buffer::CreateSharedBuffer()", + "declarations": [], "definition_spelling": "3:14-3:32", "definition_extent": "3:1-3:37", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ \ No newline at end of file diff --git a/tests/namespaces/anonymous_function.cc b/tests/namespaces/anonymous_function.cc index b708211e..35994ff2 100644 --- a/tests/namespaces/anonymous_function.cc +++ b/tests/namespaces/anonymous_function.cc @@ -5,6 +5,9 @@ void foo(); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -14,8 +17,14 @@ OUTPUT: "declarations": [{ "spelling": "2:6-2:9", "extent": "2:1-2:11", - "content": "void foo()" - }] - }] + "content": "void foo()", + "param_spellings": [] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/namespaces/function_declaration.cc b/tests/namespaces/function_declaration.cc index b759c320..42d0b569 100644 --- a/tests/namespaces/function_declaration.cc +++ b/tests/namespaces/function_declaration.cc @@ -5,6 +5,9 @@ void foo(int a, int b); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -16,7 +19,12 @@ OUTPUT: "extent": "2:1-2:23", "content": "void foo(int a, int b)", "param_spellings": ["2:14-2:15", "2:21-2:22"] - }] - }] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/namespaces/function_definition.cc b/tests/namespaces/function_definition.cc index 16679332..086bf022 100644 --- a/tests/namespaces/function_definition.cc +++ b/tests/namespaces/function_definition.cc @@ -5,14 +5,23 @@ void foo() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@N@hello@F@foo#", "short_name": "foo", "detailed_name": "void hello::foo()", + "declarations": [], "definition_spelling": "2:6-2:9", - "definition_extent": "2:1-2:14" - }] + "definition_extent": "2:1-2:14", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/namespaces/method_declaration.cc b/tests/namespaces/method_declaration.cc index bea7dbb0..3ef14136 100644 --- a/tests/namespaces/method_declaration.cc +++ b/tests/namespaces/method_declaration.cc @@ -7,6 +7,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@hello@S@Foo", @@ -14,7 +16,12 @@ OUTPUT: "detailed_name": "hello::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-4:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["2:7-2:10"] }], "funcs": [{ @@ -26,9 +33,15 @@ OUTPUT: "declarations": [{ "spelling": "3:8-3:11", "extent": "3:3-3:13", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/namespaces/method_definition.cc b/tests/namespaces/method_definition.cc index 5426999f..fd86f468 100644 --- a/tests/namespaces/method_definition.cc +++ b/tests/namespaces/method_definition.cc @@ -9,6 +9,8 @@ void Foo::foo() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@hello@S@Foo", @@ -16,7 +18,12 @@ OUTPUT: "detailed_name": "hello::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-4:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["2:7-2:10", "6:6-6:9"] }], "funcs": [{ @@ -28,11 +35,17 @@ OUTPUT: "declarations": [{ "spelling": "3:8-3:11", "extent": "3:3-3:13", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], "definition_spelling": "6:11-6:14", "definition_extent": "6:1-6:19", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/namespaces/method_inline_declaration.cc b/tests/namespaces/method_inline_declaration.cc index 03a9ba34..0f7417e6 100644 --- a/tests/namespaces/method_inline_declaration.cc +++ b/tests/namespaces/method_inline_declaration.cc @@ -7,6 +7,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@hello@S@Foo", @@ -14,7 +16,12 @@ OUTPUT: "detailed_name": "hello::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-4:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["2:7-2:10"] }], "funcs": [{ @@ -23,9 +30,15 @@ OUTPUT: "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", "detailed_name": "void hello::Foo::foo()", + "declarations": [], "definition_spelling": "3:8-3:11", "definition_extent": "3:3-3:16", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/namespaces/namespace_alias.cc b/tests/namespaces/namespace_alias.cc index 158a6a8f..37638d01 100644 --- a/tests/namespaces/namespace_alias.cc +++ b/tests/namespaces/namespace_alias.cc @@ -16,14 +16,22 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "11:6-11:9", - "definition_extent": "11:1-14:2" + "definition_extent": "11:1-14:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/namespaces/namespace_reference.cc b/tests/namespaces/namespace_reference.cc index a8bd4194..fa4a6db8 100644 --- a/tests/namespaces/namespace_reference.cc +++ b/tests/namespaces/namespace_reference.cc @@ -12,23 +12,34 @@ void Runner() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@N@ns@F@Accept#I#", "short_name": "Accept", "detailed_name": "void ns::Accept(int)", + "declarations": [], "definition_spelling": "3:8-3:14", "definition_extent": "3:3-3:24", - "callers": ["1@7:7-7:13", "1@9:3-9:9"] + "derived": [], + "locals": [], + "callers": ["1@7:7-7:13", "1@9:3-9:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@Runner#", "short_name": "Runner", "detailed_name": "void Runner()", + "declarations": [], "definition_spelling": "6:6-6:12", "definition_extent": "6:1-10:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@7:7-7:13", "0@9:3-9:9"] }], "vars": [{ diff --git a/tests/operators/operator.cc b/tests/operators/operator.cc index 13f424ac..4d6f287c 100644 --- a/tests/operators/operator.cc +++ b/tests/operators/operator.cc @@ -9,6 +9,8 @@ friend Foo &operator += (const Foo&, const Type&); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -16,7 +18,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0, 1, 2], + "vars": [], + "instances": [], "uses": ["1:7-1:10", "7:8-7:11", "7:32-7:35"] }], "funcs": [{ @@ -25,9 +32,14 @@ OUTPUT: "usr": "c:@S@Foo@F@operator()#I#", "short_name": "operator()", "detailed_name": "void Foo::operator()(int)", + "declarations": [], "definition_spelling": "2:8-2:18", "definition_extent": "2:3-2:27", - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": true, @@ -40,7 +52,11 @@ OUTPUT: "content": "void operator()(bool)", "param_spellings": ["3:23-3:23"] }], - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": true, @@ -53,7 +69,11 @@ OUTPUT: "content": "int operator()(int a, int b)", "param_spellings": ["4:22-4:23", "4:29-4:30"] }], - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 3, "is_operator": true, @@ -65,7 +85,12 @@ OUTPUT: "extent": "7:1-7:50", "content": "friend Foo &operator += (const Foo&, const Type&)", "param_spellings": ["7:36-7:36", "7:49-7:49"] - }] - }] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/outline/outline.cc b/tests/outline/outline.cc index efc36480..0132deb1 100644 --- a/tests/outline/outline.cc +++ b/tests/outline/outline.cc @@ -13,6 +13,7 @@ OUTPUT: "line": 1, "resolved_path": "&vector" }], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@MergeableUpdate", @@ -20,16 +21,27 @@ OUTPUT: "detailed_name": "MergeableUpdate", "definition_spelling": "3:8-3:23", "definition_extent": "3:1-7:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1, 2], + "instances": [], "uses": ["3:8-3:23"] }, { "id": 1, "usr": "c:@N@std@ST>2#T#T@vector", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [2], "uses": ["6:8-6:14"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@MergeableUpdate@FI@a", diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc index 23c78538..01992a98 100644 --- a/tests/outline/outline2.cc +++ b/tests/outline/outline2.cc @@ -21,6 +21,7 @@ OUTPUT: "line": 4, "resolved_path": "&vector" }], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@CompilationEntry", @@ -28,13 +29,23 @@ OUTPUT: "detailed_name": "CompilationEntry", "definition_spelling": "6:8-6:24", "definition_extent": "6:1-10:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1, 2], + "instances": [], "uses": ["6:8-6:24", "12:13-12:29"] }, { "id": 1, "usr": "c:@N@std@T@string", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["7:8-7:14", "8:8-8:14", "9:20-9:26"] }, { @@ -42,6 +53,11 @@ OUTPUT: "usr": "c:@N@std@ST>2#T#T@vector", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [2], "uses": ["9:8-9:14", "12:6-12:12"] }], @@ -56,7 +72,11 @@ OUTPUT: "extent": "12:1-12:104", "content": "std::vector LoadCompilationEntriesFromDirectory(const std::string& project_directory)", "param_spellings": ["12:86-12:103"] - }] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/outline/static_function_in_type.cc b/tests/outline/static_function_in_type.cc index 5ab03519..43ca5f8f 100644 --- a/tests/outline/static_function_in_type.cc +++ b/tests/outline/static_function_in_type.cc @@ -9,11 +9,19 @@ void Foo::Register(Manager* m) { /* OUTPUT: static_function_in_type.h { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@ns@S@Manager", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["3:7-3:14", "6:24-6:31"] }, { "id": 1, @@ -22,7 +30,12 @@ OUTPUT: static_function_in_type.h "detailed_name": "ns::Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-7:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["5:8-5:11"] }], "funcs": [{ @@ -37,8 +50,13 @@ OUTPUT: static_function_in_type.h "content": "static void Register(Manager*)", "param_spellings": ["6:32-6:32"] }], - "declaring_type": 1 - }] + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } OUTPUT: static_function_in_type.cc { @@ -46,18 +64,29 @@ OUTPUT: static_function_in_type.cc "line": 1, "resolved_path": "&static_function_in_type.h" }], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@ns@S@Foo", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["5:6-5:9"] }, { "id": 1, "usr": "c:@N@ns@S@Manager", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["5:20-5:27"] }], @@ -67,9 +96,14 @@ OUTPUT: static_function_in_type.cc "usr": "c:@N@ns@S@Foo@F@Register#*$@N@ns@S@Manager#S", "short_name": "Register", "detailed_name": "void ns::Foo::Register(ns::Manager *)", + "declarations": [], "definition_spelling": "5:11-5:19", "definition_extent": "5:1-6:2", - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/preprocessor/include_guard.cc b/tests/preprocessor/include_guard.cc index 7c0621b7..fcf69d64 100644 --- a/tests/preprocessor/include_guard.cc +++ b/tests/preprocessor/include_guard.cc @@ -6,6 +6,10 @@ /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], + "funcs": [], "vars": [{ "id": 0, "usr": "c:include_guard.cc@21@macro@FOO", diff --git a/tests/preprocessor/skipped.cc b/tests/preprocessor/skipped.cc index 3f618946..41cb3c34 100644 --- a/tests/preprocessor/skipped.cc +++ b/tests/preprocessor/skipped.cc @@ -16,6 +16,10 @@ void hello(); /* OUTPUT: { - "skipped_by_preprocessor": ["2:1-4:7", "6:1-10:7", "12:1-14:7"] + "includes": [], + "skipped_by_preprocessor": ["2:1-4:7", "6:1-10:7", "12:1-14:7"], + "types": [], + "funcs": [], + "vars": [] } */ diff --git a/tests/stl.cc b/tests/stl.cc index 5585fcbb..24aa021c 100644 --- a/tests/stl.cc +++ b/tests/stl.cc @@ -528,6 +528,10 @@ OUTPUT: }, { "line": 133, "resolved_path": "&filesystem" - }] + }], + "skipped_by_preprocessor": [], + "types": [], + "funcs": [], + "vars": [] } */ diff --git a/tests/templates/func_specialized_template_param.cc b/tests/templates/func_specialized_template_param.cc index 2ff411c6..e494a9c2 100644 --- a/tests/templates/func_specialized_template_param.cc +++ b/tests/templates/func_specialized_template_param.cc @@ -10,6 +10,8 @@ void Foo::Bar(Template&) {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Template", @@ -17,6 +19,12 @@ OUTPUT: "detailed_name": "Template", "definition_spelling": "2:7-2:15", "definition_extent": "2:1-2:18", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:7-2:15", "5:12-5:20", "8:15-8:23"] }, { "id": 1, @@ -25,7 +33,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "4:8-4:11", "definition_extent": "4:1-6:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["4:8-4:11", "8:6-8:9"] }], "funcs": [{ @@ -42,7 +55,12 @@ OUTPUT: }], "definition_spelling": "8:11-8:14", "definition_extent": "8:1-8:36", - "declaring_type": 1 - }] + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/templates/implicit_variable_instantiation.cc b/tests/templates/implicit_variable_instantiation.cc index 07e15f17..fbb36025 100644 --- a/tests/templates/implicit_variable_instantiation.cc +++ b/tests/templates/implicit_variable_instantiation.cc @@ -17,6 +17,8 @@ namespace ns { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@ns@E@VarType", @@ -24,6 +26,11 @@ OUTPUT: "detailed_name": "ns::VarType", "definition_spelling": "2:8-2:15", "definition_extent": "2:3-2:18", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["2:8-2:15", "6:22-6:29", "6:44-6:51", "10:18-10:25"] }, { @@ -33,9 +40,15 @@ OUTPUT: "detailed_name": "ns::Holder", "definition_spelling": "5:10-5:16", "definition_extent": "5:3-7:4", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], + "instances": [], "uses": ["5:10-5:16", "10:26-10:32", "13:13-13:19", "14:14-14:20"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@N@ns@ST>1#T@Holder@static_var", diff --git a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc index 9591e05f..8b14e157 100644 --- a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc +++ b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc @@ -14,6 +14,8 @@ namespace ns { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@ns@ST>1#T@Foo", @@ -21,7 +23,12 @@ OUTPUT: "detailed_name": "ns::Foo", "definition_spelling": "3:10-3:13", "definition_extent": "3:3-8:4", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["3:10-3:13", "10:11-10:14", "11:11-11:14"] }], "funcs": [{ @@ -30,10 +37,14 @@ OUTPUT: "usr": "c:@N@ns@ST>1#T@Foo@FT@>1#Tfoo#I#S", "short_name": "foo", "detailed_name": "int ns::Foo::foo()", + "declarations": [], "definition_spelling": "5:16-5:19", "definition_extent": "5:5-7:6", "declaring_type": 0, - "callers": ["-1@10:21-10:24", "-1@11:22-11:25"] + "derived": [], + "locals": [], + "callers": ["-1@10:21-10:24", "-1@11:22-11:25"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/templates/namespace_template_type_usage_folded_into_one.cc b/tests/templates/namespace_template_type_usage_folded_into_one.cc index 5d415c5e..e25c7987 100644 --- a/tests/templates/namespace_template_type_usage_folded_into_one.cc +++ b/tests/templates/namespace_template_type_usage_folded_into_one.cc @@ -9,6 +9,8 @@ namespace ns { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@N@ns@ST>1#T@Foo", @@ -16,9 +18,15 @@ OUTPUT: "detailed_name": "ns::Foo", "definition_spelling": "3:9-3:12", "definition_extent": "3:3-3:15", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["3:9-3:12", "5:3-5:6", "6:3-6:6"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@N@ns@a", diff --git a/tests/templates/specialized_func_definition.cc b/tests/templates/specialized_func_definition.cc index 24ef1dad..4b3b343b 100644 --- a/tests/templates/specialized_func_definition.cc +++ b/tests/templates/specialized_func_definition.cc @@ -15,6 +15,8 @@ void Template::Foo() {} OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Template", @@ -22,7 +24,12 @@ OUTPUT: "detailed_name": "Template", "definition_spelling": "2:7-2:15", "definition_extent": "2:1-4:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["2:7-2:15", "7:6-7:14", "9:6-9:14"] }], "funcs": [{ @@ -34,15 +41,22 @@ OUTPUT: "declarations": [{ "spelling": "3:8-3:11", "extent": "3:3-3:13", - "content": "void Foo()" + "content": "void Foo()", + "param_spellings": [] }, { "spelling": "9:22-9:25", "extent": "9:1-9:30", - "content": "void Template::Foo() {}" + "content": "void Template::Foo() {}", + "param_spellings": [] }], "definition_spelling": "7:19-7:22", "definition_extent": "6:1-7:24", - "declaring_type": 0 - }] + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/templates/template_class_func_usage_folded_into_one.cc b/tests/templates/template_class_func_usage_folded_into_one.cc index d7aaa39d..d83239c4 100644 --- a/tests/templates/template_class_func_usage_folded_into_one.cc +++ b/tests/templates/template_class_func_usage_folded_into_one.cc @@ -11,6 +11,8 @@ int b = Foo::foo(); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", @@ -18,7 +20,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "2:8-2:11", "definition_extent": "2:1-6:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["2:8-2:11", "8:9-8:12", "9:9-9:12"] }], "funcs": [{ @@ -27,10 +34,14 @@ OUTPUT: "usr": "c:@ST>1#T@Foo@F@foo#S", "short_name": "foo", "detailed_name": "int Foo::foo()", + "declarations": [], "definition_spelling": "3:14-3:17", "definition_extent": "3:3-5:4", "declaring_type": 0, - "callers": ["-1@8:19-8:22", "-1@9:20-9:23"] + "derived": [], + "locals": [], + "callers": ["-1@8:19-8:22", "-1@9:20-9:23"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/templates/template_class_template_func_usage_folded_into_one.cc b/tests/templates/template_class_template_func_usage_folded_into_one.cc index 9f5bccbb..d8304f76 100644 --- a/tests/templates/template_class_template_func_usage_folded_into_one.cc +++ b/tests/templates/template_class_template_func_usage_folded_into_one.cc @@ -12,6 +12,8 @@ int b = Foo::foo(); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", @@ -19,7 +21,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "2:8-2:11", "definition_extent": "2:1-7:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["2:8-2:11", "9:9-9:12", "10:9-10:12"] }], "funcs": [{ @@ -28,10 +35,14 @@ OUTPUT: "usr": "c:@ST>1#T@Foo@FT@>1#Tfoo#I#S", "short_name": "foo", "detailed_name": "int Foo::foo()", + "declarations": [], "definition_spelling": "4:14-4:17", "definition_extent": "4:3-6:4", "declaring_type": 0, - "callers": ["-1@9:19-9:22", "-1@10:20-10:23"] + "derived": [], + "locals": [], + "callers": ["-1@9:19-9:22", "-1@10:20-10:23"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/templates/template_class_type_usage_folded_into_one.cc b/tests/templates/template_class_type_usage_folded_into_one.cc index 317ee21f..3f9a070c 100644 --- a/tests/templates/template_class_type_usage_folded_into_one.cc +++ b/tests/templates/template_class_type_usage_folded_into_one.cc @@ -30,6 +30,7 @@ VarDecl b /* OUTPUT: { + "includes": [], "skipped_by_preprocessor": ["12:1-28:7"], "types": [{ "id": 0, @@ -38,6 +39,12 @@ OUTPUT: "detailed_name": "A", "definition_spelling": "1:6-1:7", "definition_extent": "1:1-1:10", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:6-1:7", "9:5-9:6"] }, { "id": 1, @@ -46,6 +53,12 @@ OUTPUT: "detailed_name": "B", "definition_spelling": "2:6-2:7", "definition_extent": "2:1-2:10", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:6-2:7", "10:5-10:6"] }, { "id": 2, @@ -54,6 +67,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-7:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"] }, { "id": 3, @@ -62,9 +81,15 @@ OUTPUT: "detailed_name": "Foo::Inner", "definition_spelling": "6:10-6:15", "definition_extent": "6:3-6:18", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["6:10-6:15", "9:9-9:14", "10:9-10:14"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@a", diff --git a/tests/templates/template_class_var_usage_folded_into_one.cc b/tests/templates/template_class_var_usage_folded_into_one.cc index d78fa531..a0812d0c 100644 --- a/tests/templates/template_class_var_usage_folded_into_one.cc +++ b/tests/templates/template_class_var_usage_folded_into_one.cc @@ -9,6 +9,8 @@ int b = Foo::var; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", @@ -16,8 +18,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "2:8-2:11", "definition_extent": "2:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:8-2:11", "6:9-6:12", "7:9-7:12"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@ST>1#T@Foo@var", diff --git a/tests/templates/template_func_usage_folded_into_one.cc b/tests/templates/template_func_usage_folded_into_one.cc index 7c5a9b23..a51e5024 100644 --- a/tests/templates/template_func_usage_folded_into_one.cc +++ b/tests/templates/template_func_usage_folded_into_one.cc @@ -12,15 +12,22 @@ int b = foo(); /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:template_func_usage_folded_into_one.cc@FT@>1#Tfoo#I#", "short_name": "foo", "detailed_name": "int foo()", + "declarations": [], "definition_spelling": "2:12-2:15", "definition_extent": "2:1-4:2", - "callers": ["-1@6:9-6:12", "-1@7:9-7:12"] + "derived": [], + "locals": [], + "callers": ["-1@6:9-6:12", "-1@7:9-7:12"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/templates/template_type_usage_folded_into_one.cc b/tests/templates/template_type_usage_folded_into_one.cc index e6c5a5c6..e158b47a 100644 --- a/tests/templates/template_type_usage_folded_into_one.cc +++ b/tests/templates/template_type_usage_folded_into_one.cc @@ -7,6 +7,8 @@ Foo b; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", @@ -14,9 +16,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-2:13", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["2:7-2:10", "4:1-4:4", "5:1-5:4"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@a", diff --git a/tests/templates/template_var_usage_folded_into_one.cc b/tests/templates/template_var_usage_folded_into_one.cc index ddcf80eb..df9fc5ab 100644 --- a/tests/templates/template_var_usage_folded_into_one.cc +++ b/tests/templates/template_var_usage_folded_into_one.cc @@ -30,6 +30,7 @@ UnexposedDecl var /* OUTPUT: { + "includes": [], "skipped_by_preprocessor": ["12:1-28:7"], "types": [{ "id": 0, @@ -38,6 +39,12 @@ OUTPUT: "detailed_name": "A", "definition_spelling": "1:6-1:7", "definition_extent": "1:1-1:10", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:6-1:7", "7:13-7:14"] }, { "id": 1, @@ -46,14 +53,27 @@ OUTPUT: "detailed_name": "B", "definition_spelling": "2:6-2:7", "definition_extent": "2:1-2:10", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:6-2:7", "8:13-8:14"] }, { "id": 2, "usr": "c:template_var_usage_folded_into_one.cc@35", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:1-5:2"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@VT>1#T@var", diff --git a/tests/types/anonymous_struct.cc b/tests/types/anonymous_struct.cc index 9631789f..bb79120c 100644 --- a/tests/types/anonymous_struct.cc +++ b/tests/types/anonymous_struct.cc @@ -6,6 +6,8 @@ union vector3 { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@U@vector3", @@ -13,7 +15,12 @@ OUTPUT: "detailed_name": "vector3", "definition_spelling": "1:7-1:14", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [3], + "instances": [], "uses": ["1:7-1:14"] }, { "id": 1, @@ -22,9 +29,15 @@ OUTPUT: "detailed_name": "vector3::", "definition_spelling": "2:3-2:9", "definition_extent": "2:3-2:28", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1, 2], + "instances": [], "uses": ["2:3-2:9"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@U@vector3@Sa@FI@x", diff --git a/tests/unions/union_decl.cc b/tests/unions/union_decl.cc index 6011e6ea..250dd375 100644 --- a/tests/unions/union_decl.cc +++ b/tests/unions/union_decl.cc @@ -6,6 +6,8 @@ union Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@U@Foo", @@ -13,9 +15,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], + "instances": [], "uses": ["1:7-1:10"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@U@Foo@FI@a", diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc index f40b0236..3b364aa6 100644 --- a/tests/unions/union_usage.cc +++ b/tests/unions/union_usage.cc @@ -14,6 +14,8 @@ void act(Foo*) { OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@U@Foo", @@ -21,6 +23,10 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-4:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], "instances": [2], "uses": ["1:7-1:10", "6:1-6:4", "8:10-8:13"] @@ -31,8 +37,13 @@ OUTPUT: "usr": "c:@F@act#*$@U@Foo#", "short_name": "act", "detailed_name": "void act(Foo *)", + "declarations": [], "definition_spelling": "8:6-8:9", - "definition_extent": "8:1-10:2" + "definition_extent": "8:1-10:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/func_called_from_constructor.cc b/tests/usage/func_called_from_constructor.cc index 1ac11a45..b6293f14 100644 --- a/tests/usage/func_called_from_constructor.cc +++ b/tests/usage/func_called_from_constructor.cc @@ -11,6 +11,8 @@ Foo::Foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -18,7 +20,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "3:8-3:11", "definition_extent": "3:1-5:2", + "parents": [], + "derived": [], + "types": [], "funcs": [1], + "vars": [], + "instances": [], "uses": ["3:8-3:11", "4:3-4:6", "7:6-7:9", "7:1-7:4"] }], "funcs": [{ @@ -27,9 +34,13 @@ OUTPUT: "usr": "c:@F@called#", "short_name": "called", "detailed_name": "void called()", + "declarations": [], "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", - "callers": ["1@8:3-8:9"] + "derived": [], + "locals": [], + "callers": ["1@8:3-8:9"], + "callees": [] }, { "id": 1, "is_operator": false, @@ -39,12 +50,17 @@ OUTPUT: "declarations": [{ "spelling": "4:3-4:6", "extent": "4:3-4:8", - "content": "Foo()" + "content": "Foo()", + "param_spellings": [] }], "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], "callees": ["0@8:3-8:9"] - }] + }], + "vars": [] } */ diff --git a/tests/usage/func_called_from_macro_argument.cc b/tests/usage/func_called_from_macro_argument.cc index 00455d78..5b2d7024 100644 --- a/tests/usage/func_called_from_macro_argument.cc +++ b/tests/usage/func_called_from_macro_argument.cc @@ -9,6 +9,9 @@ void caller() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -21,15 +24,22 @@ OUTPUT: "content": "bool called(bool a, bool b)", "param_spellings": ["3:18-3:19", "3:26-3:27"] }], - "callers": ["1@6:14-6:20"] + "derived": [], + "locals": [], + "callers": ["1@6:14-6:20"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@caller#", "short_name": "caller", "detailed_name": "void caller()", + "declarations": [], "definition_spelling": "5:6-5:12", "definition_extent": "5:1-7:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@6:14-6:20"] }], "vars": [{ diff --git a/tests/usage/func_called_from_template.cc b/tests/usage/func_called_from_template.cc index cd3f3a59..e17fee9d 100644 --- a/tests/usage/func_called_from_template.cc +++ b/tests/usage/func_called_from_template.cc @@ -14,6 +14,9 @@ void foo() { // called() is never referenced. OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -23,17 +26,24 @@ OUTPUT: "declarations": [{ "spelling": "1:6-1:12", "extent": "1:1-1:14", - "content": "void called()" + "content": "void called()", + "param_spellings": [] }], - "callers": ["1@5:3-5:9"] + "derived": [], + "locals": [], + "callers": ["1@5:3-5:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@FT@>1#Tcaller#v#", "short_name": "caller", "detailed_name": "void caller()", + "declarations": [], "definition_spelling": "4:6-4:12", "definition_extent": "4:1-6:2", + "derived": [], + "locals": [], "callers": ["2@9:3-9:9"], "callees": ["0@5:3-5:9"] }, { @@ -42,9 +52,14 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "8:6-8:9", "definition_extent": "8:1-10:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["1@9:3-9:9"] - }] + }], + "vars": [] } */ \ No newline at end of file diff --git a/tests/usage/func_called_implicit_ctor.cc b/tests/usage/func_called_implicit_ctor.cc index 366f0ce9..a93b5812 100644 --- a/tests/usage/func_called_implicit_ctor.cc +++ b/tests/usage/func_called_implicit_ctor.cc @@ -11,6 +11,8 @@ Wrapper caller() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Wrapper", @@ -18,7 +20,12 @@ OUTPUT: "detailed_name": "Wrapper", "definition_spelling": "1:8-1:15", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:8-1:15", "2:3-2:10", "7:1-7:8"] }], "funcs": [{ @@ -34,25 +41,37 @@ OUTPUT: "param_spellings": ["2:15-2:16"] }], "declaring_type": 0, - "callers": ["~2@8:10-8:16"] + "derived": [], + "locals": [], + "callers": ["~2@8:10-8:16"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@called#", "short_name": "called", "detailed_name": "int called()", + "declarations": [], "definition_spelling": "5:5-5:11", "definition_extent": "5:1-5:27", - "callers": ["2@8:10-8:16"] + "derived": [], + "locals": [], + "callers": ["2@8:10-8:16"], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@caller#", "short_name": "caller", "detailed_name": "Wrapper caller()", + "declarations": [], "definition_spelling": "7:9-7:15", "definition_extent": "7:1-9:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["~0@8:10-8:16", "1@8:10-8:16"] - }] + }], + "vars": [] } */ diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc index e8655c3b..70b93b89 100644 --- a/tests/usage/func_usage_addr_func.cc +++ b/tests/usage/func_usage_addr_func.cc @@ -10,32 +10,47 @@ void user() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@consume#*v#", "short_name": "consume", "detailed_name": "void consume(void *)", + "declarations": [], "definition_spelling": "1:6-1:13", "definition_extent": "1:1-1:23", - "callers": ["2@7:3-7:10"] + "derived": [], + "locals": [], + "callers": ["2@7:3-7:10"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@used#", "short_name": "used", "detailed_name": "void used()", + "declarations": [], "definition_spelling": "3:6-3:10", "definition_extent": "3:1-3:15", - "callers": ["2@6:13-6:17", "2@7:12-7:16"] + "derived": [], + "locals": [], + "callers": ["2@6:13-6:17", "2@7:12-7:16"], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@user#", "short_name": "user", "detailed_name": "void user()", + "declarations": [], "definition_spelling": "5:6-5:10", "definition_extent": "5:1-8:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["1@6:13-6:17", "0@7:3-7:10", "1@7:12-7:16"] }], "vars": [{ diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc index b58c8cf3..68e29849 100644 --- a/tests/usage/func_usage_addr_method.cc +++ b/tests/usage/func_usage_addr_method.cc @@ -10,6 +10,8 @@ void user() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -17,7 +19,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], + "instances": [], "uses": ["1:8-1:11", "6:13-6:16"] }], "funcs": [{ @@ -29,18 +36,26 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:12", "extent": "2:3-2:14", - "content": "void Used()" + "content": "void Used()", + "param_spellings": [] }], "declaring_type": 0, - "callers": ["1@6:18-6:22"] + "derived": [], + "locals": [], + "callers": ["1@6:18-6:22"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@user#", "short_name": "user", "detailed_name": "void user()", + "declarations": [], "definition_spelling": "5:6-5:10", "definition_extent": "5:1-7:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@6:18-6:22"] }], "vars": [{ diff --git a/tests/usage/func_usage_call_func.cc b/tests/usage/func_usage_call_func.cc index 1a939d56..7205a342 100644 --- a/tests/usage/func_usage_call_func.cc +++ b/tests/usage/func_usage_call_func.cc @@ -6,24 +6,36 @@ void caller() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@called#", "short_name": "called", "detailed_name": "void called()", + "declarations": [], "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", - "callers": ["1@3:3-3:9"] + "derived": [], + "locals": [], + "callers": ["1@3:3-3:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@caller#", "short_name": "caller", "detailed_name": "void caller()", + "declarations": [], "definition_spelling": "2:6-2:12", "definition_extent": "2:1-4:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@3:3-3:9"] - }] + }], + "vars": [] } */ diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc index c5e68d86..f1a00488 100644 --- a/tests/usage/func_usage_call_method.cc +++ b/tests/usage/func_usage_call_method.cc @@ -10,6 +10,8 @@ void user() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -17,7 +19,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], "instances": [0], "uses": ["1:8-1:11", "6:3-6:6"] }], @@ -30,18 +36,26 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:12", "extent": "2:3-2:14", - "content": "void Used()" + "content": "void Used()", + "param_spellings": [] }], "declaring_type": 0, - "callers": ["1@7:6-7:10"] + "derived": [], + "locals": [], + "callers": ["1@7:6-7:10"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@user#", "short_name": "user", "detailed_name": "void user()", + "declarations": [], "definition_spelling": "5:6-5:10", "definition_extent": "5:1-8:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@7:6-7:10"] }], "vars": [{ diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc index abb18a43..2cd36710 100644 --- a/tests/usage/func_usage_class_inline_var_def.cc +++ b/tests/usage/func_usage_class_inline_var_def.cc @@ -9,6 +9,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -16,7 +18,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "5:7-5:10", "definition_extent": "5:1-7:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], + "instances": [], "uses": ["5:7-5:10"] }], "funcs": [{ @@ -25,9 +32,13 @@ OUTPUT: "usr": "c:func_usage_class_inline_var_def.cc@F@helper#", "short_name": "helper", "detailed_name": "int helper()", + "declarations": [], "definition_spelling": "1:12-1:18", "definition_extent": "1:1-3:2", - "callers": ["-1@6:11-6:17"] + "derived": [], + "locals": [], + "callers": ["-1@6:11-6:17"], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/func_usage_forward_decl_func.cc b/tests/usage/func_usage_forward_decl_func.cc index a438fbdb..81f0e0c6 100644 --- a/tests/usage/func_usage_forward_decl_func.cc +++ b/tests/usage/func_usage_forward_decl_func.cc @@ -6,6 +6,9 @@ void usage() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -15,18 +18,27 @@ OUTPUT: "declarations": [{ "spelling": "1:6-1:9", "extent": "1:1-1:11", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], - "callers": ["1@4:3-4:6"] + "derived": [], + "locals": [], + "callers": ["1@4:3-4:6"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@usage#", "short_name": "usage", "detailed_name": "void usage()", + "declarations": [], "definition_spelling": "3:6-3:11", "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@4:3-4:6"] - }] + }], + "vars": [] } */ diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc index ab59b243..3c0004f3 100644 --- a/tests/usage/func_usage_forward_decl_method.cc +++ b/tests/usage/func_usage_forward_decl_method.cc @@ -9,6 +9,8 @@ void usage() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -16,7 +18,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], "instances": [0], "uses": ["1:8-1:11", "6:3-6:6"] }], @@ -29,18 +35,26 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:11", "extent": "2:3-2:13", - "content": "void foo()" + "content": "void foo()", + "param_spellings": [] }], "declaring_type": 0, - "callers": ["1@7:6-7:9"] + "derived": [], + "locals": [], + "callers": ["1@7:6-7:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@usage#", "short_name": "usage", "detailed_name": "void usage()", + "declarations": [], "definition_spelling": "5:6-5:11", "definition_extent": "5:1-8:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@7:6-7:9"] }], "vars": [{ diff --git a/tests/usage/func_usage_template_func.cc b/tests/usage/func_usage_template_func.cc index 6f07a864..abd8124a 100644 --- a/tests/usage/func_usage_template_func.cc +++ b/tests/usage/func_usage_template_func.cc @@ -9,6 +9,9 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -21,16 +24,24 @@ OUTPUT: "content": "void accept(T)", "param_spellings": ["2:14-2:14"] }], - "callers": ["1@5:3-5:9", "1@6:3-6:9"] + "derived": [], + "locals": [], + "callers": ["1@5:3-5:9", "1@6:3-6:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "4:6-4:9", "definition_extent": "4:1-7:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@5:3-5:9", "0@6:3-6:9"] - }] + }], + "vars": [] } */ diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc index 1447467e..36cb7374 100644 --- a/tests/usage/type_usage_as_template_parameter.cc +++ b/tests/usage/type_usage_as_template_parameter.cc @@ -13,11 +13,18 @@ unique_ptr* return_type() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@unique_ptr", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1, 2], "uses": ["2:7-2:17", "6:8-6:18", "7:8-7:18", "9:1-9:11", "10:3-10:13"] }, { @@ -27,6 +34,12 @@ OUTPUT: "detailed_name": "S", "definition_spelling": "4:8-4:9", "definition_extent": "4:1-4:12", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:8-4:9", "7:19-7:20", "9:12-9:13", "10:14-10:15"] }], "funcs": [{ @@ -35,8 +48,13 @@ OUTPUT: "usr": "c:@F@return_type#", "short_name": "return_type", "detailed_name": "unique_ptr *return_type()", + "declarations": [], "definition_spelling": "9:16-9:27", - "definition_extent": "9:1-12:2" + "definition_extent": "9:1-12:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc index 7ae5bc61..490b0beb 100644 --- a/tests/usage/type_usage_as_template_parameter_complex.cc +++ b/tests/usage/type_usage_as_template_parameter_complex.cc @@ -81,12 +81,18 @@ unique_ptr* Foo::foo() { return nullptr; } /* OUTPUT: { + "includes": [], "skipped_by_preprocessor": ["7:1-14:7", "17:1-32:7", "35:1-39:7", "42:1-52:7", "57:1-63:7", "68:1-78:7"], "types": [{ "id": 0, "usr": "c:@ST>2#T#T@unique_ptr", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["2:7-2:17", "15:8-15:18", "15:19-15:29", "33:1-33:11", "33:12-33:22", "33:52-33:62", "54:3-54:13", "54:14-54:24", "65:3-65:13", "79:1-79:11"] }, { @@ -94,12 +100,24 @@ OUTPUT: "usr": "c:@S@S1", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:8-4:10", "15:30-15:32", "33:23-33:25", "33:63-33:65", "54:25-54:27", "65:14-65:16", "79:12-79:14"] }, { "id": 2, "usr": "c:@S@S2", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:8-5:10", "15:34-15:36", "15:39-15:41", "33:27-33:29", "33:32-33:34", "33:67-33:69", "54:29-54:31", "54:34-54:36", "65:18-65:20", "79:16-79:18"] }, { "id": 3, @@ -108,7 +126,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "64:7-64:10", "definition_extent": "64:1-66:2", + "parents": [], + "derived": [], + "types": [], "funcs": [3], + "vars": [], + "instances": [], "uses": ["64:7-64:10", "79:21-79:24"] }], "funcs": [{ @@ -117,24 +140,39 @@ OUTPUT: "usr": "c:@F@as_return_type#*$@S@unique_ptr>#$@S@S1#$@S@S2#", "short_name": "as_return_type", "detailed_name": "unique_ptr, S2> *as_return_type(unique_ptr *)", + "declarations": [], "definition_spelling": "33:37-33:51", - "definition_extent": "33:1-33:92" + "definition_extent": "33:1-33:92", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@no_return_type#I#", "short_name": "no_return_type", "detailed_name": "void no_return_type(int)", + "declarations": [], "definition_spelling": "40:6-40:20", - "definition_extent": "40:1-40:28" + "definition_extent": "40:1-40:28", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@empty#", "short_name": "empty", "detailed_name": "void empty()", + "declarations": [], "definition_spelling": "53:6-53:11", - "definition_extent": "53:1-55:2" + "definition_extent": "53:1-55:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 3, "is_operator": false, @@ -144,11 +182,16 @@ OUTPUT: "declarations": [{ "spelling": "65:23-65:26", "extent": "65:3-65:28", - "content": "unique_ptr* foo()" + "content": "unique_ptr* foo()", + "param_spellings": [] }], "definition_spelling": "79:26-79:29", "definition_extent": "79:1-79:51", - "declaring_type": 3 + "declaring_type": 3, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc index c570ff08..7c689a7d 100644 --- a/tests/usage/type_usage_as_template_parameter_simple.cc +++ b/tests/usage/type_usage_as_template_parameter_simple.cc @@ -8,6 +8,8 @@ static unique_ptr foo; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@unique_ptr", @@ -15,6 +17,11 @@ OUTPUT: "detailed_name": "unique_ptr", "definition_spelling": "2:7-2:17", "definition_extent": "2:1-2:20", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["2:7-2:17", "6:8-6:18"] }, { @@ -22,8 +29,15 @@ OUTPUT: "usr": "c:@S@S", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:8-4:9", "6:19-6:20"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:type_usage_as_template_parameter_simple.cc@foo", diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc index 935cdcb2..60b12a32 100644 --- a/tests/usage/type_usage_declare_extern.cc +++ b/tests/usage/type_usage_declare_extern.cc @@ -4,6 +4,8 @@ extern T t; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@T", @@ -11,9 +13,15 @@ OUTPUT: "detailed_name": "T", "definition_spelling": "1:8-1:9", "definition_extent": "1:1-1:12", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:9", "3:8-3:9"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@t", diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc index fdea9056..1701224e 100644 --- a/tests/usage/type_usage_declare_field.cc +++ b/tests/usage/type_usage_declare_field.cc @@ -9,11 +9,18 @@ struct Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@ForwardType", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:19", "5:3-5:14"] }, { @@ -23,6 +30,11 @@ OUTPUT: "detailed_name": "ImplementedType", "definition_spelling": "2:8-2:23", "definition_extent": "2:1-2:26", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [1], "uses": ["2:8-2:23", "6:3-6:18"] }, { @@ -32,9 +44,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "4:8-4:11", "definition_extent": "4:1-7:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], + "instances": [], "uses": ["4:8-4:11"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Foo@FI@a", diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc index 37027b3e..8a9526ab 100644 --- a/tests/usage/type_usage_declare_local.cc +++ b/tests/usage/type_usage_declare_local.cc @@ -9,11 +9,18 @@ void Foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@ForwardType", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:19", "5:3-5:14"] }, { @@ -23,6 +30,11 @@ OUTPUT: "detailed_name": "ImplementedType", "definition_spelling": "2:8-2:23", "definition_extent": "2:1-2:26", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [1], "uses": ["2:8-2:23", "6:3-6:18"] }], @@ -32,8 +44,13 @@ OUTPUT: "usr": "c:@F@Foo#", "short_name": "Foo", "detailed_name": "void Foo()", + "declarations": [], "definition_spelling": "4:6-4:9", - "definition_extent": "4:1-7:2" + "definition_extent": "4:1-7:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc index c6dfb91f..e6cfe2ce 100644 --- a/tests/usage/type_usage_declare_param.cc +++ b/tests/usage/type_usage_declare_param.cc @@ -6,11 +6,18 @@ void foo(ForwardType* f, ImplementedType a) {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@ForwardType", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:19", "4:10-4:21"] }, { @@ -20,6 +27,11 @@ OUTPUT: "detailed_name": "ImplementedType", "definition_spelling": "2:8-2:23", "definition_extent": "2:1-2:26", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [1], "uses": ["2:8-2:23", "4:26-4:41"] }], @@ -29,8 +41,13 @@ OUTPUT: "usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#", "short_name": "foo", "detailed_name": "void foo(ForwardType *, ImplementedType)", + "declarations": [], "definition_spelling": "4:6-4:9", - "definition_extent": "4:1-4:47" + "definition_extent": "4:1-4:47", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc index 03215ee7..1bfb8cf2 100644 --- a/tests/usage/type_usage_declare_param_prototype.cc +++ b/tests/usage/type_usage_declare_param_prototype.cc @@ -11,11 +11,18 @@ void foo(Foo* f, Foo*) {} OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:11", "3:10-3:13", "3:18-3:21", "4:10-4:13", "4:18-4:21"] }], @@ -32,7 +39,11 @@ OUTPUT: "param_spellings": ["3:15-3:16", "3:22-3:22"] }], "definition_spelling": "4:6-4:9", - "definition_extent": "4:1-4:26" + "definition_extent": "4:1-4:26", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc index 55ba2041..43c7b046 100644 --- a/tests/usage/type_usage_declare_param_unnamed.cc +++ b/tests/usage/type_usage_declare_param_unnamed.cc @@ -3,11 +3,19 @@ void foo(ForwardType*) {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@ForwardType", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:8-1:19", "2:10-2:21"] }], "funcs": [{ @@ -16,8 +24,14 @@ OUTPUT: "usr": "c:@F@foo#*$@S@ForwardType#", "short_name": "foo", "detailed_name": "void foo(ForwardType *)", + "declarations": [], "definition_spelling": "2:6-2:9", - "definition_extent": "2:1-2:26" - }] + "definition_extent": "2:1-2:26", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc index 8b7e92cc..ffd2e9b6 100644 --- a/tests/usage/type_usage_declare_qualifiers.cc +++ b/tests/usage/type_usage_declare_qualifiers.cc @@ -9,6 +9,8 @@ void foo(Type& a0, const Type& a1) { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Type", @@ -16,6 +18,11 @@ OUTPUT: "detailed_name": "Type", "definition_spelling": "1:8-1:12", "definition_extent": "1:1-1:15", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1, 2, 3, 4, 5], "uses": ["1:8-1:12", "3:10-3:14", "3:26-3:30", "4:3-4:7", "5:3-5:7", "6:9-6:13", "7:9-7:13"] }], @@ -25,8 +32,13 @@ OUTPUT: "usr": "c:@F@foo#&$@S@Type#&1S1_#", "short_name": "foo", "detailed_name": "void foo(Type &, const Type &)", + "declarations": [], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-8:2" + "definition_extent": "3:1-8:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc index df1f055e..44de4c67 100644 --- a/tests/usage/type_usage_declare_static.cc +++ b/tests/usage/type_usage_declare_static.cc @@ -3,14 +3,22 @@ static Type t; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Type", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:12", "2:8-2:12"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:type_usage_declare_static.cc@t", diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc index 00cbf127..6980692a 100644 --- a/tests/usage/type_usage_on_return_type.cc +++ b/tests/usage/type_usage_on_return_type.cc @@ -20,11 +20,19 @@ static Type* bar() {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Type", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:8-1:12", "3:1-3:5", "4:1-4:5", "5:1-5:5", "8:3-8:7", "12:1-12:5", "15:14-15:18", "17:8-17:12", "18:8-18:12"] }, { "id": 1, @@ -33,7 +41,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "7:7-7:10", "definition_extent": "7:1-10:2", + "parents": [], + "derived": [], + "types": [], "funcs": [1, 2], + "vars": [], + "instances": [], "uses": ["7:7-7:10", "12:7-12:10", "13:6-13:9"] }], "funcs": [{ @@ -45,14 +58,20 @@ OUTPUT: "declarations": [{ "spelling": "3:7-3:10", "extent": "3:1-3:12", - "content": "Type* foo()" + "content": "Type* foo()", + "param_spellings": [] }, { "spelling": "4:7-4:10", "extent": "4:1-4:12", - "content": "Type* foo()" + "content": "Type* foo()", + "param_spellings": [] }], "definition_spelling": "5:7-5:10", - "definition_extent": "5:1-5:15" + "definition_extent": "5:1-5:15", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": false, @@ -67,7 +86,11 @@ OUTPUT: }], "definition_spelling": "12:12-12:15", "definition_extent": "12:1-12:23", - "declaring_type": 1 + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": false, @@ -77,11 +100,16 @@ OUTPUT: "declarations": [{ "spelling": "9:8-9:13", "extent": "9:3-9:15", - "content": "void Empty()" + "content": "void Empty()", + "param_spellings": [] }], "definition_spelling": "13:11-13:16", "definition_extent": "13:1-13:21", - "declaring_type": 1 + "declaring_type": 1, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 3, "is_operator": false, @@ -91,8 +119,13 @@ OUTPUT: "declarations": [{ "spelling": "15:20-15:28", "extent": "15:1-15:30", - "content": "extern const Type& external()" - }] + "content": "extern const Type& external()", + "param_spellings": [] + }], + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 4, "is_operator": false, @@ -102,10 +135,16 @@ OUTPUT: "declarations": [{ "spelling": "17:14-17:17", "extent": "17:1-17:19", - "content": "static Type* bar()" + "content": "static Type* bar()", + "param_spellings": [] }], "definition_spelling": "18:14-18:17", - "definition_extent": "18:1-18:22" - }] + "definition_extent": "18:1-18:22", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc index 4cf54200..2e8e5af7 100644 --- a/tests/usage/type_usage_typedef_and_using.cc +++ b/tests/usage/type_usage_typedef_and_using.cc @@ -12,11 +12,19 @@ void accept3(Foo3*) {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:8-1:11", "2:14-2:17", "3:9-3:12", "7:13-7:16"] }, { "id": 1, @@ -26,6 +34,12 @@ OUTPUT: "definition_spelling": "2:7-2:11", "definition_extent": "2:1-2:18", "alias_of": 0, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:7-2:11", "4:14-4:18", "8:14-8:18"] }, { "id": 2, @@ -35,6 +49,12 @@ OUTPUT: "definition_spelling": "3:13-3:17", "definition_extent": "3:1-3:17", "alias_of": 0, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["3:13-3:17", "9:14-9:18"] }, { "id": 3, @@ -44,6 +64,12 @@ OUTPUT: "definition_spelling": "4:7-4:11", "definition_extent": "4:1-4:18", "alias_of": 1, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:7-4:11", "10:14-10:18"] }, { "id": 4, @@ -52,6 +78,12 @@ OUTPUT: "detailed_name": "Foo4", "definition_spelling": "5:7-5:11", "definition_extent": "5:1-5:17", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:7-5:11"] }], "funcs": [{ @@ -60,32 +92,53 @@ OUTPUT: "usr": "c:@F@accept#*$@S@Foo#", "short_name": "accept", "detailed_name": "void accept(Foo *)", + "declarations": [], "definition_spelling": "7:6-7:12", - "definition_extent": "7:1-7:21" + "definition_extent": "7:1-7:21", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@accept1#**$@S@Foo#", "short_name": "accept1", "detailed_name": "void accept1(Foo1 *)", + "declarations": [], "definition_spelling": "8:6-8:13", - "definition_extent": "8:1-8:23" + "definition_extent": "8:1-8:23", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@accept2#*$@S@Foo#", "short_name": "accept2", "detailed_name": "void accept2(Foo2 *)", + "declarations": [], "definition_spelling": "9:6-9:13", - "definition_extent": "9:1-9:23" + "definition_extent": "9:1-9:23", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }, { "id": 3, "is_operator": false, "usr": "c:@F@accept3#**$@S@Foo#", "short_name": "accept3", "detailed_name": "void accept3(Foo3 *)", + "declarations": [], "definition_spelling": "10:6-10:13", - "definition_extent": "10:1-10:23" - }] + "definition_extent": "10:1-10:23", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc index 7a45452b..3583fbf6 100644 --- a/tests/usage/type_usage_typedef_and_using_template.cc +++ b/tests/usage/type_usage_typedef_and_using_template.cc @@ -7,11 +7,19 @@ typedef Foo Foo2; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["2:8-2:11", "4:14-4:17", "5:9-5:12"] }, { "id": 1, @@ -21,6 +29,12 @@ OUTPUT: "definition_spelling": "4:7-4:11", "definition_extent": "4:1-4:22", "alias_of": 0, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["4:7-4:11", "5:13-5:17"] }, { "id": 2, @@ -30,7 +44,15 @@ OUTPUT: "definition_spelling": "5:19-5:23", "definition_extent": "5:1-5:23", "alias_of": 0, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["5:19-5:23"] - }] + }], + "funcs": [], + "vars": [] } */ diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc index 0d706978..b518bb83 100644 --- a/tests/usage/type_usage_various.cc +++ b/tests/usage/type_usage_various.cc @@ -12,6 +12,8 @@ extern Foo foo; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -19,7 +21,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], "funcs": [0], + "vars": [], "instances": [0, 1], "uses": ["1:7-1:10", "2:3-2:6", "5:1-5:4", "5:6-5:9", "6:3-6:6", "10:8-10:11"] }], @@ -32,11 +38,16 @@ OUTPUT: "declarations": [{ "spelling": "2:8-2:12", "extent": "2:3-2:14", - "content": "Foo* make()" + "content": "Foo* make()", + "param_spellings": [] }], "definition_spelling": "5:11-5:15", "definition_extent": "5:1-8:2", - "declaring_type": 0 + "declaring_type": 0, + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc index 885b7335..c32eb180 100644 --- a/tests/usage/usage_inside_of_call.cc +++ b/tests/usage/usage_inside_of_call.cc @@ -17,6 +17,8 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -24,7 +26,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-8:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [1, 0], + "instances": [], "uses": ["5:8-5:11", "10:5-10:8", "14:22-14:25", "14:40-14:43"] }], "funcs": [{ @@ -39,7 +46,10 @@ OUTPUT: "content": "void called(int a)", "param_spellings": ["1:17-1:18"] }], - "callers": ["2@14:3-14:9"] + "derived": [], + "locals": [], + "callers": ["2@14:3-14:9"], + "callees": [] }, { "id": 1, "is_operator": false, @@ -49,17 +59,25 @@ OUTPUT: "declarations": [{ "spelling": "3:5-3:8", "extent": "3:1-3:10", - "content": "int gen()" + "content": "int gen()", + "param_spellings": [] }], - "callers": ["2@14:14-14:17"] + "derived": [], + "locals": [], + "callers": ["2@14:14-14:17"], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "12:6-12:9", "definition_extent": "12:1-15:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@14:3-14:9", "1@14:14-14:17"] }], "vars": [{ diff --git a/tests/usage/usage_inside_of_call_simple.cc b/tests/usage/usage_inside_of_call_simple.cc index 92a21c2e..df6ed6e6 100644 --- a/tests/usage/usage_inside_of_call_simple.cc +++ b/tests/usage/usage_inside_of_call_simple.cc @@ -9,6 +9,9 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, @@ -21,25 +24,37 @@ OUTPUT: "content": "void called(int a)", "param_spellings": ["1:17-1:18"] }], - "callers": ["2@6:3-6:9"] + "derived": [], + "locals": [], + "callers": ["2@6:3-6:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@gen#", "short_name": "gen", "detailed_name": "int gen()", + "declarations": [], "definition_spelling": "3:5-3:8", "definition_extent": "3:1-3:24", - "callers": ["2@6:10-6:13", "2@6:18-6:21"] + "derived": [], + "locals": [], + "callers": ["2@6:10-6:13", "2@6:18-6:21"], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "5:6-5:9", "definition_extent": "5:1-7:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@6:3-6:9", "1@6:10-6:13", "1@6:18-6:21"] - }] + }], + "vars": [] } */ diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc index 3337779d..e68444e4 100644 --- a/tests/usage/var_usage_call_function.cc +++ b/tests/usage/var_usage_call_function.cc @@ -10,23 +10,34 @@ void caller() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@called#", "short_name": "called", "detailed_name": "void called()", + "declarations": [], "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", - "callers": ["1@4:13-4:19", "1@7:3-7:9"] + "derived": [], + "locals": [], + "callers": ["1@4:13-4:19", "1@7:3-7:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@caller#", "short_name": "caller", "detailed_name": "void caller()", + "declarations": [], "definition_spelling": "3:6-3:12", "definition_extent": "3:1-8:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@4:13-4:19", "0@7:3-7:9"] }], "vars": [{ diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc index 2a4c9084..533b65ed 100644 --- a/tests/usage/var_usage_class_member.cc +++ b/tests/usage/var_usage_class_member.cc @@ -20,6 +20,8 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -27,6 +29,10 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0, 1], "instances": [2], "uses": ["1:7-1:10", "11:3-11:6"] @@ -43,7 +49,10 @@ OUTPUT: "content": "void accept(int)", "param_spellings": ["7:16-7:16"] }], - "callers": ["2@14:3-14:9", "2@15:3-15:9", "2@17:3-17:9"] + "derived": [], + "locals": [], + "callers": ["2@14:3-14:9", "2@15:3-15:9", "2@17:3-17:9"], + "callees": [] }, { "id": 1, "is_operator": false, @@ -56,15 +65,22 @@ OUTPUT: "content": "void accept(int*)", "param_spellings": ["8:17-8:17"] }], - "callers": ["2@16:3-16:9"] + "derived": [], + "locals": [], + "callers": ["2@16:3-16:9"], + "callees": [] }, { "id": 2, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "10:6-10:9", "definition_extent": "10:1-18:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@14:3-14:9", "0@15:3-15:9", "1@16:3-16:9", "0@17:3-17:9"] }], "vars": [{ diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc index 821e8e2b..c5da4e60 100644 --- a/tests/usage/var_usage_class_member_static.cc +++ b/tests/usage/var_usage_class_member_static.cc @@ -11,6 +11,8 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -18,6 +20,12 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:8-1:11", "8:10-8:13"] }], "funcs": [{ @@ -32,15 +40,22 @@ OUTPUT: "content": "void accept(int)", "param_spellings": ["5:16-5:16"] }], - "callers": ["1@8:3-8:9"] + "derived": [], + "locals": [], + "callers": ["1@8:3-8:9"], + "callees": [] }, { "id": 1, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", + "derived": [], + "locals": [], + "callers": [], "callees": ["0@8:3-8:9"] }], "vars": [{ diff --git a/tests/usage/var_usage_cstyle_cast.cc b/tests/usage/var_usage_cstyle_cast.cc index c14f1c08..00148c10 100644 --- a/tests/usage/var_usage_cstyle_cast.cc +++ b/tests/usage/var_usage_cstyle_cast.cc @@ -10,6 +10,8 @@ const VarType Holder::static_var; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@E@VarType", @@ -17,6 +19,11 @@ OUTPUT: "detailed_name": "VarType", "definition_spelling": "1:6-1:13", "definition_extent": "1:1-1:16", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:6-1:13", "4:20-4:27", "4:42-4:49", "7:7-7:14"] }, { @@ -26,9 +33,15 @@ OUTPUT: "detailed_name": "Holder", "definition_spelling": "3:8-3:14", "definition_extent": "3:1-5:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], + "instances": [], "uses": ["3:8-3:14", "7:15-7:21"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Holder@static_var", diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc index e9487309..07a47515 100644 --- a/tests/usage/var_usage_extern.cc +++ b/tests/usage/var_usage_extern.cc @@ -6,14 +6,22 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-5:2" + "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc index e8076d65..9a4c6db5 100644 --- a/tests/usage/var_usage_func_parameter.cc +++ b/tests/usage/var_usage_func_parameter.cc @@ -4,14 +4,22 @@ void foo(int a) { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#I#", "short_name": "foo", "detailed_name": "void foo(int)", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-3:2" + "definition_extent": "1:1-3:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc index 0791b26b..2e301db1 100644 --- a/tests/usage/var_usage_local.cc +++ b/tests/usage/var_usage_local.cc @@ -5,14 +5,22 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-4:2" + "definition_extent": "1:1-4:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc index 04ee888b..dd4c65b9 100644 --- a/tests/usage/var_usage_shadowed_local.cc +++ b/tests/usage/var_usage_shadowed_local.cc @@ -10,14 +10,22 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-9:2" + "definition_extent": "1:1-9:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc index 159c23bc..c23996d2 100644 --- a/tests/usage/var_usage_shadowed_parameter.cc +++ b/tests/usage/var_usage_shadowed_parameter.cc @@ -10,14 +10,22 @@ void foo(int a) { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#I#", "short_name": "foo", "detailed_name": "void foo(int)", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-8:2" + "definition_extent": "1:1-8:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc index e7454ef5..62458de3 100644 --- a/tests/usage/var_usage_static.cc +++ b/tests/usage/var_usage_static.cc @@ -7,14 +7,22 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-5:2" + "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc index 50944ddb..57bcdce1 100644 --- a/tests/vars/class_member.cc +++ b/tests/vars/class_member.cc @@ -4,6 +4,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -11,10 +13,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], "instances": [0], "uses": ["1:7-1:10", "2:3-2:6"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Foo@FI@member", diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc index 8e5b3235..0077e7a6 100644 --- a/tests/vars/class_static_member.cc +++ b/tests/vars/class_static_member.cc @@ -6,6 +6,8 @@ Foo* Foo::member = nullptr; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -13,10 +15,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], "vars": [0], "instances": [0], "uses": ["1:7-1:10", "2:10-2:13", "4:1-4:4", "4:6-4:9"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Foo@member", diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc index e541db53..9de79129 100644 --- a/tests/vars/class_static_member_decl_only.cc +++ b/tests/vars/class_static_member_decl_only.cc @@ -4,6 +4,8 @@ class Foo { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -11,8 +13,15 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:7-1:10"] }], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@S@Foo@member", diff --git a/tests/vars/deduce_auto_type.cc b/tests/vars/deduce_auto_type.cc index 0b0c2a85..54daf62a 100644 --- a/tests/vars/deduce_auto_type.cc +++ b/tests/vars/deduce_auto_type.cc @@ -7,6 +7,8 @@ void f() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", @@ -14,6 +16,11 @@ OUTPUT: "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-1:13", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["1:7-1:10", "3:16-3:19", "4:17-4:20"] }], @@ -23,8 +30,13 @@ OUTPUT: "usr": "c:@F@f#", "short_name": "f", "detailed_name": "void f()", + "declarations": [], "definition_spelling": "2:6-2:7", - "definition_extent": "2:1-5:2" + "definition_extent": "2:1-5:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc index 6b0a9f3c..4efbf90d 100644 --- a/tests/vars/function_local.cc +++ b/tests/vars/function_local.cc @@ -7,11 +7,18 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["1:8-1:11", "4:3-4:6"] }], @@ -21,8 +28,13 @@ OUTPUT: "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-5:2" + "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc index f133fbd8..8dd431b9 100644 --- a/tests/vars/function_param.cc +++ b/tests/vars/function_param.cc @@ -5,11 +5,18 @@ void foo(Foo* p0, Foo* p1) {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@Foo", "short_name": "", "detailed_name": "", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0, 1], "uses": ["1:8-1:11", "3:10-3:13", "3:19-3:22"] }], @@ -19,8 +26,13 @@ OUTPUT: "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", "detailed_name": "void foo(Foo *, Foo *)", + "declarations": [], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-3:30" + "definition_extent": "3:1-3:30", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/vars/function_param_unnamed.cc b/tests/vars/function_param_unnamed.cc index 31930a50..b24c0a6b 100644 --- a/tests/vars/function_param_unnamed.cc +++ b/tests/vars/function_param_unnamed.cc @@ -2,14 +2,23 @@ void foo(int, int) {} /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#I#I#", "short_name": "foo", "detailed_name": "void foo(int, int)", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-1:22" - }] + "definition_extent": "1:1-1:22", + "derived": [], + "locals": [], + "callers": [], + "callees": [] + }], + "vars": [] } */ diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc index dcee30f9..811fe555 100644 --- a/tests/vars/function_shadow_local.cc +++ b/tests/vars/function_shadow_local.cc @@ -10,14 +10,22 @@ void foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#", "short_name": "foo", "detailed_name": "void foo()", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-9:2" + "definition_extent": "1:1-9:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc index 3e5905a0..80fbf8c4 100644 --- a/tests/vars/function_shadow_param.cc +++ b/tests/vars/function_shadow_param.cc @@ -4,14 +4,22 @@ void foo(int p) { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], "funcs": [{ "id": 0, "is_operator": false, "usr": "c:@F@foo#I#", "short_name": "foo", "detailed_name": "void foo(int)", + "declarations": [], "definition_spelling": "1:6-1:9", - "definition_extent": "1:1-3:2" + "definition_extent": "1:1-3:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0, diff --git a/tests/vars/global_variable.cc b/tests/vars/global_variable.cc index 5d79b0c4..574601ac 100644 --- a/tests/vars/global_variable.cc +++ b/tests/vars/global_variable.cc @@ -2,6 +2,10 @@ static int global = 0; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], + "funcs": [], "vars": [{ "id": 0, "usr": "c:global_variable.cc@global", diff --git a/tests/vars/global_variable_decl_only.cc b/tests/vars/global_variable_decl_only.cc index 6978c43b..3d4071f3 100644 --- a/tests/vars/global_variable_decl_only.cc +++ b/tests/vars/global_variable_decl_only.cc @@ -2,6 +2,10 @@ extern int global; /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], + "types": [], + "funcs": [], "vars": [{ "id": 0, "usr": "c:@global", diff --git a/tests/vars/type_instance_on_using_type.cc b/tests/vars/type_instance_on_using_type.cc index c605a9cc..5e2f7d77 100644 --- a/tests/vars/type_instance_on_using_type.cc +++ b/tests/vars/type_instance_on_using_type.cc @@ -9,6 +9,8 @@ void Foo() { /* OUTPUT: { + "includes": [], + "skipped_by_preprocessor": [], "types": [{ "id": 0, "usr": "c:@S@S", @@ -16,6 +18,12 @@ OUTPUT: "detailed_name": "S", "definition_spelling": "1:8-1:9", "definition_extent": "1:1-1:12", + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], + "instances": [], "uses": ["1:8-1:9", "2:11-2:12"] }, { "id": 1, @@ -25,6 +33,11 @@ OUTPUT: "definition_spelling": "2:7-2:8", "definition_extent": "2:1-2:12", "alias_of": 0, + "parents": [], + "derived": [], + "types": [], + "funcs": [], + "vars": [], "instances": [0], "uses": ["2:7-2:8", "4:3-4:4"] }], @@ -34,8 +47,13 @@ OUTPUT: "usr": "c:@F@Foo#", "short_name": "Foo", "detailed_name": "void Foo()", + "declarations": [], "definition_spelling": "3:6-3:9", - "definition_extent": "3:1-5:2" + "definition_extent": "3:1-5:2", + "derived": [], + "locals": [], + "callers": [], + "callees": [] }], "vars": [{ "id": 0,