From b5305e14f2756e6219d181018ff6ccae094cc87a Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Wed, 28 Jun 2017 23:25:19 -0700 Subject: [PATCH] Add |is_macro| state to IndexVar. This does not handle setting |is_macro|, this CL is about updating the tests. --- src/indexer.h | 3 +++ src/serializer.cc | 1 + tests/constructors/constructor.cc | 2 ++ tests/constructors/destructor.cc | 1 + tests/constructors/implicit_constructor.cc | 2 ++ .../declaration_vs_definition/class_member.cc | 1 + .../class_member_static.cc | 1 + .../func_associated_function_params.cc | 2 ++ tests/enums/enum_class_decl.cc | 2 ++ tests/enums/enum_decl.cc | 2 ++ tests/enums/enum_inherit.cc | 2 ++ tests/enums/enum_usage.cc | 3 +++ tests/foobar.cc | 2 ++ tests/macros/complex.cc | 2 ++ tests/macros/foo.cc | 3 +++ tests/multi_file/funky_enum.cc | 3 +++ tests/multi_file/impl.cc | 5 +++++ tests/namespaces/namespace_alias.cc | 3 +++ tests/namespaces/namespace_reference.cc | 2 ++ tests/outline/outline.cc | 3 +++ tests/outline/outline2.cc | 3 +++ tests/preprocessor/include_guard.cc | 21 +++++++++++++++++++ .../implicit_variable_instantiation.cc | 3 +++ ...ass_template_func_usage_folded_into_one.cc | 2 ++ ...ace_template_type_usage_folded_into_one.cc | 2 ++ ...mplate_class_func_usage_folded_into_one.cc | 2 ++ ...ass_template_func_usage_folded_into_one.cc | 2 ++ ...mplate_class_type_usage_folded_into_one.cc | 2 ++ ...emplate_class_var_usage_folded_into_one.cc | 3 +++ .../template_func_usage_folded_into_one.cc | 2 ++ .../template_type_usage_folded_into_one.cc | 2 ++ .../template_var_usage_folded_into_one.cc | 3 +++ tests/types/anonymous_struct.cc | 4 ++++ tests/unions/union_decl.cc | 2 ++ tests/unions/union_usage.cc | 3 +++ .../usage/func_called_from_macro_argument.cc | 1 + tests/usage/func_usage_addr_func.cc | 1 + tests/usage/func_usage_addr_method.cc | 1 + tests/usage/func_usage_call_method.cc | 1 + .../usage/func_usage_class_inline_var_def.cc | 1 + tests/usage/func_usage_forward_decl_method.cc | 1 + .../usage/type_usage_as_template_parameter.cc | 3 +++ ...ype_usage_as_template_parameter_complex.cc | 2 ++ ...type_usage_as_template_parameter_simple.cc | 1 + tests/usage/type_usage_declare_extern.cc | 1 + tests/usage/type_usage_declare_field.cc | 2 ++ tests/usage/type_usage_declare_local.cc | 2 ++ tests/usage/type_usage_declare_param.cc | 2 ++ .../type_usage_declare_param_prototype.cc | 1 + tests/usage/type_usage_declare_qualifiers.cc | 6 ++++++ tests/usage/type_usage_declare_static.cc | 1 + tests/usage/type_usage_various.cc | 2 ++ tests/usage/usage_inside_of_call.cc | 3 +++ tests/usage/var_usage_call_function.cc | 1 + tests/usage/var_usage_class_member.cc | 3 +++ tests/usage/var_usage_class_member_static.cc | 1 + tests/usage/var_usage_cstyle_cast.cc | 1 + tests/usage/var_usage_extern.cc | 1 + tests/usage/var_usage_func_parameter.cc | 1 + tests/usage/var_usage_local.cc | 1 + tests/usage/var_usage_shadowed_local.cc | 2 ++ tests/usage/var_usage_shadowed_parameter.cc | 2 ++ tests/usage/var_usage_static.cc | 1 + tests/vars/class_member.cc | 1 + tests/vars/class_static_member.cc | 1 + tests/vars/class_static_member_decl_only.cc | 1 + tests/vars/deduce_auto_type.cc | 2 ++ tests/vars/function_local.cc | 1 + tests/vars/function_param.cc | 2 ++ tests/vars/function_shadow_local.cc | 2 ++ tests/vars/function_shadow_param.cc | 2 ++ tests/vars/global_variable.cc | 1 + tests/vars/global_variable_decl_only.cc | 1 + tests/vars/type_instance_on_using_type.cc | 1 + 74 files changed, 162 insertions(+) create mode 100644 tests/preprocessor/include_guard.cc diff --git a/src/indexer.h b/src/indexer.h index fc7f3ab0..fcb061f7 100644 --- a/src/indexer.h +++ b/src/indexer.h @@ -371,6 +371,8 @@ struct VarDefDefinitionData { // Is this a "local" variable, ie, a parameter or function variable? bool is_local = false; + // Is this a macro, ie, #define FOO? + bool is_macro = false; VarDefDefinitionData() {} // For reflection. VarDefDefinitionData(const std::string& usr) : usr(usr) {} @@ -407,6 +409,7 @@ void Reflect(TVisitor& visitor, REFLECT_MEMBER(variable_type); REFLECT_MEMBER(declaring_type); REFLECT_MEMBER(is_local); + REFLECT_MEMBER(is_macro); REFLECT_MEMBER_END(); } diff --git a/src/serializer.cc b/src/serializer.cc index 3ba55f0b..5c361e8b 100644 --- a/src/serializer.cc +++ b/src/serializer.cc @@ -125,6 +125,7 @@ void Reflect(TVisitor& visitor, IndexVar& value) { REFLECT_MEMBER2("variable_type", value.def.variable_type); REFLECT_MEMBER2("declaring_type", value.def.declaring_type); REFLECT_MEMBER2("is_local", value.def.is_local); + REFLECT_MEMBER2("is_macro", value.def.is_macro); REFLECT_MEMBER2("uses", value.uses); REFLECT_MEMBER_END(); } diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc index a1aabd0a..121331a3 100644 --- a/tests/constructors/constructor.cc +++ b/tests/constructors/constructor.cc @@ -49,6 +49,7 @@ OUTPUT: "definition_extent": "7:3-7:8", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["7:7-7:8"] }, { "id": 1, @@ -59,6 +60,7 @@ OUTPUT: "definition_extent": "8:3-8:22", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["8:8-8:10"] }] } diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc index 37a45941..68b1dae8 100644 --- a/tests/constructors/destructor.cc +++ b/tests/constructors/destructor.cc @@ -62,6 +62,7 @@ OUTPUT: "definition_extent": "8:3-8:8", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["8:7-8:8"] }] } diff --git a/tests/constructors/implicit_constructor.cc b/tests/constructors/implicit_constructor.cc index 2f3d1543..6bb4a860 100644 --- a/tests/constructors/implicit_constructor.cc +++ b/tests/constructors/implicit_constructor.cc @@ -48,6 +48,7 @@ OUTPUT: "definition_extent": "6:3-6:11", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["6:8-6:11"] }, { "id": 1, @@ -57,6 +58,7 @@ OUTPUT: "definition_spelling": "7:8-7:11", "definition_extent": "7:3-7:11", "is_local": true, + "is_macro": false, "uses": ["7:8-7:11"] }] } diff --git a/tests/declaration_vs_definition/class_member.cc b/tests/declaration_vs_definition/class_member.cc index 3e2412c0..50eea642 100644 --- a/tests/declaration_vs_definition/class_member.cc +++ b/tests/declaration_vs_definition/class_member.cc @@ -24,6 +24,7 @@ OUTPUT: "definition_extent": "2:3-2:10", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:7-2:10"] }] } diff --git a/tests/declaration_vs_definition/class_member_static.cc b/tests/declaration_vs_definition/class_member_static.cc index fffa5ab6..0e7172da 100644 --- a/tests/declaration_vs_definition/class_member_static.cc +++ b/tests/declaration_vs_definition/class_member_static.cc @@ -27,6 +27,7 @@ OUTPUT: "definition_extent": "5:1-5:13", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:14-2:17", "5:10-5:13"] }] } diff --git a/tests/declaration_vs_definition/func_associated_function_params.cc b/tests/declaration_vs_definition/func_associated_function_params.cc index 81af9bf5..8f13314e 100644 --- a/tests/declaration_vs_definition/func_associated_function_params.cc +++ b/tests/declaration_vs_definition/func_associated_function_params.cc @@ -39,6 +39,7 @@ OUTPUT: "definition_spelling": "5:13-5:14", "definition_extent": "5:9-5:14", "is_local": true, + "is_macro": false, "uses": ["5:13-5:14"] }, { "id": 1, @@ -48,6 +49,7 @@ OUTPUT: "definition_spelling": "5:20-5:21", "definition_extent": "5:16-5:21", "is_local": true, + "is_macro": false, "uses": ["5:20-5:21"] }] } diff --git a/tests/enums/enum_class_decl.cc b/tests/enums/enum_class_decl.cc index d1a5aa30..9ddc3010 100644 --- a/tests/enums/enum_class_decl.cc +++ b/tests/enums/enum_class_decl.cc @@ -26,6 +26,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:3-2:4"] }, { "id": 1, @@ -37,6 +38,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:3-3:4"] }] } diff --git a/tests/enums/enum_decl.cc b/tests/enums/enum_decl.cc index c0ddcc9d..fce43617 100644 --- a/tests/enums/enum_decl.cc +++ b/tests/enums/enum_decl.cc @@ -26,6 +26,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:3-2:4"] }, { "id": 1, @@ -37,6 +38,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:3-3:4"] }] } diff --git a/tests/enums/enum_inherit.cc b/tests/enums/enum_inherit.cc index b7320f7a..a779fbeb 100644 --- a/tests/enums/enum_inherit.cc +++ b/tests/enums/enum_inherit.cc @@ -26,6 +26,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:3-2:4"] }, { "id": 1, @@ -37,6 +38,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:3-3:4"] }] } diff --git a/tests/enums/enum_usage.cc b/tests/enums/enum_usage.cc index b79b218a..e69c85dd 100644 --- a/tests/enums/enum_usage.cc +++ b/tests/enums/enum_usage.cc @@ -29,6 +29,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:3-2:4", "6:14-6:15"] }, { "id": 1, @@ -40,6 +41,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:3-3:4"] }, { "id": 2, @@ -50,6 +52,7 @@ OUTPUT: "definition_extent": "6:1-6:15", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:5-6:6"] }] } diff --git a/tests/foobar.cc b/tests/foobar.cc index b2e0dea8..b2cb9f74 100644 --- a/tests/foobar.cc +++ b/tests/foobar.cc @@ -55,6 +55,7 @@ OUTPUT: "definition_extent": "9:1-9:16", "variable_type": 3, "is_local": false, + "is_macro": false, "uses": ["9:15-9:16"] }, { "id": 1, @@ -65,6 +66,7 @@ OUTPUT: "definition_extent": "10:1-10:9", "variable_type": 2, "is_local": false, + "is_macro": false, "uses": ["10:8-10:9"] }] } diff --git a/tests/macros/complex.cc b/tests/macros/complex.cc index 8d214373..4ecb2447 100644 --- a/tests/macros/complex.cc +++ b/tests/macros/complex.cc @@ -44,6 +44,7 @@ OUTPUT: "definition_spelling": "9:11-9:16", "definition_extent": "9:1-9:20", "is_local": false, + "is_macro": false, "uses": ["9:11-9:16", "12:14-12:19"] }, { "id": 1, @@ -53,6 +54,7 @@ OUTPUT: "definition_spelling": "1:9-1:12", "definition_extent": "1:9-3:32", "is_local": false, + "is_macro": false, "uses": ["1:9-1:12", "12:1-12:4"] }] } diff --git a/tests/macros/foo.cc b/tests/macros/foo.cc index 561191fd..55be3ab6 100644 --- a/tests/macros/foo.cc +++ b/tests/macros/foo.cc @@ -27,6 +27,7 @@ OUTPUT: "definition_spelling": "8:5-8:6", "definition_extent": "8:1-8:10", "is_local": false, + "is_macro": false, "uses": ["8:5-8:6"] }, { "id": 1, @@ -36,6 +37,7 @@ OUTPUT: "definition_spelling": "1:9-1:10", "definition_extent": "1:9-1:12", "is_local": false, + "is_macro": false, "uses": ["1:9-1:10", "8:9-8:10"] }, { "id": 2, @@ -45,6 +47,7 @@ OUTPUT: "definition_spelling": "2:9-2:17", "definition_extent": "2:9-2:46", "is_local": false, + "is_macro": false, "uses": ["2:9-2:17", "5:3-5:11"] }] } diff --git a/tests/multi_file/funky_enum.cc b/tests/multi_file/funky_enum.cc index 02aa2e3a..e7cc0940 100644 --- a/tests/multi_file/funky_enum.cc +++ b/tests/multi_file/funky_enum.cc @@ -23,6 +23,7 @@ OUTPUT: funky_enum.h "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["4:1-4:2"] }, { "id": 1, @@ -34,6 +35,7 @@ OUTPUT: funky_enum.h "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["5:1-5:2"] }, { "id": 2, @@ -45,6 +47,7 @@ OUTPUT: funky_enum.h "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:1-6:2"] }] } diff --git a/tests/multi_file/impl.cc b/tests/multi_file/impl.cc index 8343d366..8d10b8cd 100644 --- a/tests/multi_file/impl.cc +++ b/tests/multi_file/impl.cc @@ -70,6 +70,7 @@ OUTPUT: header.h "variable_type": 4, "declaring_type": 4, "is_local": false, + "is_macro": false, "uses": ["15:13-15:14"] }, { "id": 1, @@ -81,6 +82,7 @@ OUTPUT: header.h "variable_type": 4, "declaring_type": 4, "is_local": false, + "is_macro": false, "uses": ["15:16-15:17"] }, { "id": 2, @@ -92,6 +94,7 @@ OUTPUT: header.h "variable_type": 4, "declaring_type": 4, "is_local": false, + "is_macro": false, "uses": ["15:19-15:20"] }, { "id": 3, @@ -101,6 +104,7 @@ OUTPUT: header.h "definition_spelling": "17:5-17:9", "definition_extent": "17:1-17:9", "is_local": false, + "is_macro": false, "uses": ["17:5-17:9"] }, { "id": 4, @@ -110,6 +114,7 @@ OUTPUT: header.h "definition_spelling": "18:12-18:16", "definition_extent": "18:1-18:16", "is_local": false, + "is_macro": false, "uses": ["18:12-18:16"] }] } diff --git a/tests/namespaces/namespace_alias.cc b/tests/namespaces/namespace_alias.cc index ecf92d25..b1957afc 100644 --- a/tests/namespaces/namespace_alias.cc +++ b/tests/namespaces/namespace_alias.cc @@ -32,6 +32,7 @@ OUTPUT: "definition_spelling": "4:18-4:21", "definition_extent": "4:14-4:26", "is_local": false, + "is_macro": false, "uses": ["4:18-4:21", "12:26-12:29", "13:16-13:19"] }, { "id": 1, @@ -41,6 +42,7 @@ OUTPUT: "definition_spelling": "12:7-12:8", "definition_extent": "12:3-12:29", "is_local": true, + "is_macro": false, "uses": ["12:7-12:8"] }, { "id": 2, @@ -50,6 +52,7 @@ OUTPUT: "definition_spelling": "13:7-13:8", "definition_extent": "13:3-13:19", "is_local": true, + "is_macro": false, "uses": ["13:7-13:8"] }] } diff --git a/tests/namespaces/namespace_reference.cc b/tests/namespaces/namespace_reference.cc index c161d7b4..41e7af2c 100644 --- a/tests/namespaces/namespace_reference.cc +++ b/tests/namespaces/namespace_reference.cc @@ -37,6 +37,7 @@ OUTPUT: "definition_spelling": "2:7-2:10", "definition_extent": "2:3-2:10", "is_local": false, + "is_macro": false, "uses": ["2:7-2:10", "7:18-7:21", "9:10-9:13"] }, { "id": 1, @@ -46,6 +47,7 @@ OUTPUT: "definition_spelling": "3:19-3:20", "definition_extent": "3:15-3:20", "is_local": true, + "is_macro": false, "uses": ["3:19-3:20"] }] } diff --git a/tests/outline/outline.cc b/tests/outline/outline.cc index 883618c2..62b9d0cd 100644 --- a/tests/outline/outline.cc +++ b/tests/outline/outline.cc @@ -38,6 +38,7 @@ OUTPUT: "definition_extent": "4:3-4:8", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["4:7-4:8"] }, { "id": 1, @@ -48,6 +49,7 @@ OUTPUT: "definition_extent": "5:3-5:8", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["5:7-5:8"] }, { "id": 2, @@ -59,6 +61,7 @@ OUTPUT: "variable_type": 1, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:20-6:26"] }] } diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc index 4e85acac..04776b1d 100644 --- a/tests/outline/outline2.cc +++ b/tests/outline/outline2.cc @@ -64,6 +64,7 @@ OUTPUT: "variable_type": 1, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["7:15-7:24"] }, { "id": 1, @@ -75,6 +76,7 @@ OUTPUT: "variable_type": 1, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["8:15-8:23"] }, { "id": 2, @@ -86,6 +88,7 @@ OUTPUT: "variable_type": 2, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["9:28-9:32"] }] } diff --git a/tests/preprocessor/include_guard.cc b/tests/preprocessor/include_guard.cc new file mode 100644 index 00000000..f66bb71a --- /dev/null +++ b/tests/preprocessor/include_guard.cc @@ -0,0 +1,21 @@ +#ifndef FOO +#define FOO + +#endif + +/* +OUTPUT: +{ + "vars": [{ + "id": 0, + "usr": "c:include_guard.cc@21@macro@FOO", + "short_name": "FOO", + "detailed_name": "FOO", + "definition_spelling": "2:9-2:12", + "definition_extent": "2:9-2:12", + "is_local": false, + "is_macro": false, + "uses": ["2:9-2:12"] + }] +} +*/ diff --git a/tests/templates/implicit_variable_instantiation.cc b/tests/templates/implicit_variable_instantiation.cc index 6a72d0e7..07e15f17 100644 --- a/tests/templates/implicit_variable_instantiation.cc +++ b/tests/templates/implicit_variable_instantiation.cc @@ -47,6 +47,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 1, "is_local": false, + "is_macro": false, "uses": ["6:30-6:40", "10:37-10:47", "13:26-13:36", "14:27-14:37"] }, { "id": 1, @@ -56,6 +57,7 @@ OUTPUT: "definition_spelling": "13:7-13:10", "definition_extent": "13:3-13:36", "is_local": false, + "is_macro": false, "uses": ["13:7-13:10"] }, { "id": 2, @@ -65,6 +67,7 @@ OUTPUT: "definition_spelling": "14:7-14:11", "definition_extent": "14:3-14:37", "is_local": false, + "is_macro": false, "uses": ["14:7-14:11"] }] } 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 31f4ac70..811949a1 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 @@ -42,6 +42,7 @@ OUTPUT: "definition_spelling": "10:7-10:8", "definition_extent": "10:3-10:33", "is_local": false, + "is_macro": false, "uses": ["10:7-10:8"] }, { "id": 1, @@ -51,6 +52,7 @@ OUTPUT: "definition_spelling": "11:7-11:8", "definition_extent": "11:3-11:35", "is_local": false, + "is_macro": false, "uses": ["11:7-11:8"] }] } 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 58fe24de..5d415c5e 100644 --- a/tests/templates/namespace_template_type_usage_folded_into_one.cc +++ b/tests/templates/namespace_template_type_usage_folded_into_one.cc @@ -28,6 +28,7 @@ OUTPUT: "definition_extent": "5:3-5:13", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["5:12-5:13"] }, { "id": 1, @@ -38,6 +39,7 @@ OUTPUT: "definition_extent": "6:3-6:14", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:13-6:14"] }] } 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 603f28a5..7030c299 100644 --- a/tests/templates/template_class_func_usage_folded_into_one.cc +++ b/tests/templates/template_class_func_usage_folded_into_one.cc @@ -39,6 +39,7 @@ OUTPUT: "definition_spelling": "8:5-8:6", "definition_extent": "8:1-8:24", "is_local": false, + "is_macro": false, "uses": ["8:5-8:6"] }, { "id": 1, @@ -48,6 +49,7 @@ OUTPUT: "definition_spelling": "9:5-9:6", "definition_extent": "9:1-9:25", "is_local": false, + "is_macro": false, "uses": ["9:5-9:6"] }] } 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 31708202..a43d1544 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 @@ -40,6 +40,7 @@ OUTPUT: "definition_spelling": "9:5-9:6", "definition_extent": "9:1-9:31", "is_local": false, + "is_macro": false, "uses": ["9:5-9:6"] }, { "id": 1, @@ -49,6 +50,7 @@ OUTPUT: "definition_spelling": "10:5-10:6", "definition_extent": "10:1-10:33", "is_local": false, + "is_macro": false, "uses": ["10:5-10:6"] }] } 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 f8e7d23a..317ee21f 100644 --- a/tests/templates/template_class_type_usage_folded_into_one.cc +++ b/tests/templates/template_class_type_usage_folded_into_one.cc @@ -74,6 +74,7 @@ OUTPUT: "definition_extent": "9:1-9:16", "variable_type": 3, "is_local": false, + "is_macro": false, "uses": ["9:15-9:16"] }, { "id": 1, @@ -84,6 +85,7 @@ OUTPUT: "definition_extent": "10:1-10:16", "variable_type": 3, "is_local": false, + "is_macro": false, "uses": ["10:15-10:16"] }] } 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 fbf61273..d78fa531 100644 --- a/tests/templates/template_class_var_usage_folded_into_one.cc +++ b/tests/templates/template_class_var_usage_folded_into_one.cc @@ -25,6 +25,7 @@ OUTPUT: "detailed_name": "const int Foo::var", "declaration": "3:24-3:27", "is_local": false, + "is_macro": false, "uses": ["3:24-3:27", "6:19-6:22", "7:20-7:23"] }, { "id": 1, @@ -34,6 +35,7 @@ OUTPUT: "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:22", "is_local": false, + "is_macro": false, "uses": ["6:5-6:6"] }, { "id": 2, @@ -43,6 +45,7 @@ OUTPUT: "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:23", "is_local": false, + "is_macro": false, "uses": ["7:5-7:6"] }] } diff --git a/tests/templates/template_func_usage_folded_into_one.cc b/tests/templates/template_func_usage_folded_into_one.cc index 8a377f72..10426ddb 100644 --- a/tests/templates/template_func_usage_folded_into_one.cc +++ b/tests/templates/template_func_usage_folded_into_one.cc @@ -29,6 +29,7 @@ OUTPUT: "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:19", "is_local": false, + "is_macro": false, "uses": ["6:5-6:6"] }, { "id": 1, @@ -38,6 +39,7 @@ OUTPUT: "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:20", "is_local": false, + "is_macro": false, "uses": ["7:5-7:6"] }] } diff --git a/tests/templates/template_type_usage_folded_into_one.cc b/tests/templates/template_type_usage_folded_into_one.cc index 1f7bb6e9..e6c5a5c6 100644 --- a/tests/templates/template_type_usage_folded_into_one.cc +++ b/tests/templates/template_type_usage_folded_into_one.cc @@ -26,6 +26,7 @@ OUTPUT: "definition_extent": "4:1-4:11", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["4:10-4:11"] }, { "id": 1, @@ -36,6 +37,7 @@ OUTPUT: "definition_extent": "5:1-5:12", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["5:11-5:12"] }] } diff --git a/tests/templates/template_var_usage_folded_into_one.cc b/tests/templates/template_var_usage_folded_into_one.cc index 3246e14d..0dbd8dfc 100644 --- a/tests/templates/template_var_usage_folded_into_one.cc +++ b/tests/templates/template_var_usage_folded_into_one.cc @@ -60,6 +60,7 @@ OUTPUT: "definition_spelling": "5:3-5:6", "definition_extent": "5:1-5:10", "is_local": false, + "is_macro": false, "uses": ["5:3-5:6", "7:9-7:12", "8:9-8:12"] }, { "id": 1, @@ -69,6 +70,7 @@ OUTPUT: "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:15", "is_local": false, + "is_macro": false, "uses": ["7:5-7:6"] }, { "id": 2, @@ -78,6 +80,7 @@ OUTPUT: "definition_spelling": "8:5-8:6", "definition_extent": "8:1-8:15", "is_local": false, + "is_macro": false, "uses": ["8:5-8:6"] }] } diff --git a/tests/types/anonymous_struct.cc b/tests/types/anonymous_struct.cc index 145af704..9631789f 100644 --- a/tests/types/anonymous_struct.cc +++ b/tests/types/anonymous_struct.cc @@ -34,6 +34,7 @@ OUTPUT: "definition_extent": "2:12-2:19", "declaring_type": 1, "is_local": false, + "is_macro": false, "uses": ["2:18-2:19"] }, { "id": 1, @@ -44,6 +45,7 @@ OUTPUT: "definition_extent": "2:12-2:22", "declaring_type": 1, "is_local": false, + "is_macro": false, "uses": ["2:21-2:22"] }, { "id": 2, @@ -54,6 +56,7 @@ OUTPUT: "definition_extent": "2:12-2:25", "declaring_type": 1, "is_local": false, + "is_macro": false, "uses": ["2:24-2:25"] }, { "id": 3, @@ -64,6 +67,7 @@ OUTPUT: "definition_extent": "3:3-3:13", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:9-3:10"] }] } diff --git a/tests/unions/union_decl.cc b/tests/unions/union_decl.cc index 2bf9e6c0..6011e6ea 100644 --- a/tests/unions/union_decl.cc +++ b/tests/unions/union_decl.cc @@ -25,6 +25,7 @@ OUTPUT: "definition_extent": "2:3-2:8", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:7-2:8"] }, { "id": 1, @@ -35,6 +36,7 @@ OUTPUT: "definition_extent": "3:3-3:9", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:8-3:9"] }] } diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc index 82b6b772..d1a95765 100644 --- a/tests/unions/union_usage.cc +++ b/tests/unions/union_usage.cc @@ -42,6 +42,7 @@ OUTPUT: "definition_extent": "2:3-2:12", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:7-2:8", "9:5-9:6"] }, { "id": 1, @@ -52,6 +53,7 @@ OUTPUT: "definition_extent": "3:3-3:13", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:8-3:9"] }, { "id": 2, @@ -62,6 +64,7 @@ OUTPUT: "definition_extent": "6:1-6:6", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:5-6:6", "9:3-9:4"] }] } diff --git a/tests/usage/func_called_from_macro_argument.cc b/tests/usage/func_called_from_macro_argument.cc index 82bae5c1..b3f0bd72 100644 --- a/tests/usage/func_called_from_macro_argument.cc +++ b/tests/usage/func_called_from_macro_argument.cc @@ -38,6 +38,7 @@ OUTPUT: "definition_spelling": "1:9-1:19", "definition_extent": "1:9-1:24", "is_local": false, + "is_macro": false, "uses": ["1:9-1:19", "6:3-6:13"] }] } diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc index cf49d619..e4c57986 100644 --- a/tests/usage/func_usage_addr_func.cc +++ b/tests/usage/func_usage_addr_func.cc @@ -43,6 +43,7 @@ OUTPUT: "definition_spelling": "6:8-6:9", "definition_extent": "6:3-6:17", "is_local": true, + "is_macro": false, "uses": ["6:8-6:9"] }] } diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc index 021e91ff..933b3597 100644 --- a/tests/usage/func_usage_addr_method.cc +++ b/tests/usage/func_usage_addr_method.cc @@ -49,6 +49,7 @@ OUTPUT: "definition_spelling": "6:8-6:9", "definition_extent": "6:3-6:22", "is_local": true, + "is_macro": false, "uses": ["6:8-6:9"] }] } diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc index f141c141..7a8ec497 100644 --- a/tests/usage/func_usage_call_method.cc +++ b/tests/usage/func_usage_call_method.cc @@ -51,6 +51,7 @@ OUTPUT: "definition_extent": "6:3-6:19", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["6:8-6:9", "7:3-7:4"] }] } diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc index dd2ffe89..46b54419 100644 --- a/tests/usage/func_usage_class_inline_var_def.cc +++ b/tests/usage/func_usage_class_inline_var_def.cc @@ -37,6 +37,7 @@ OUTPUT: "definition_extent": "6:3-6:19", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:7-6:8"] }] } diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc index 2db6bfe1..15f81a82 100644 --- a/tests/usage/func_usage_forward_decl_method.cc +++ b/tests/usage/func_usage_forward_decl_method.cc @@ -50,6 +50,7 @@ OUTPUT: "definition_extent": "6:3-6:19", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["6:8-6:9", "7:3-7:4"] }] } diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc index f6c2d6a8..b770f933 100644 --- a/tests/usage/type_usage_as_template_parameter.cc +++ b/tests/usage/type_usage_as_template_parameter.cc @@ -44,6 +44,7 @@ OUTPUT: "definition_extent": "6:1-6:27", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:25-6:27"] }, { "id": 1, @@ -54,6 +55,7 @@ OUTPUT: "definition_extent": "7:1-7:24", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["7:22-7:24"] }, { "id": 2, @@ -64,6 +66,7 @@ OUTPUT: "definition_extent": "10:3-10:23", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["10:18-10:23"] }] } diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc index 981d3720..d6b282db 100644 --- a/tests/usage/type_usage_as_template_parameter_complex.cc +++ b/tests/usage/type_usage_as_template_parameter_complex.cc @@ -148,6 +148,7 @@ OUTPUT: "declaration": "15:43-15:44", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["15:43-15:44"] }, { "id": 1, @@ -158,6 +159,7 @@ OUTPUT: "definition_extent": "54:3-54:44", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["54:39-54:44"] }] } diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc index d8636ab2..f3233a8d 100644 --- a/tests/usage/type_usage_as_template_parameter_simple.cc +++ b/tests/usage/type_usage_as_template_parameter_simple.cc @@ -31,6 +31,7 @@ OUTPUT: "definition_extent": "6:1-6:25", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:22-6:25"] }] } diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc index d769e8ec..935cdcb2 100644 --- a/tests/usage/type_usage_declare_extern.cc +++ b/tests/usage/type_usage_declare_extern.cc @@ -22,6 +22,7 @@ OUTPUT: "declaration": "3:10-3:11", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:10-3:11"] }] } diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc index e79e3b71..e5afbf26 100644 --- a/tests/usage/type_usage_declare_field.cc +++ b/tests/usage/type_usage_declare_field.cc @@ -43,6 +43,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 2, "is_local": false, + "is_macro": false, "uses": ["5:16-5:17"] }, { "id": 1, @@ -54,6 +55,7 @@ OUTPUT: "variable_type": 1, "declaring_type": 2, "is_local": false, + "is_macro": false, "uses": ["6:19-6:20"] }] } diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc index 8886a234..1d238623 100644 --- a/tests/usage/type_usage_declare_local.cc +++ b/tests/usage/type_usage_declare_local.cc @@ -41,6 +41,7 @@ OUTPUT: "definition_extent": "5:3-5:17", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["5:16-5:17"] }, { "id": 1, @@ -51,6 +52,7 @@ OUTPUT: "definition_extent": "6:3-6:20", "variable_type": 1, "is_local": true, + "is_macro": false, "uses": ["6:19-6:20"] }] } diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc index 28bfadeb..9ad96cb5 100644 --- a/tests/usage/type_usage_declare_param.cc +++ b/tests/usage/type_usage_declare_param.cc @@ -38,6 +38,7 @@ OUTPUT: "definition_extent": "4:10-4:24", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["4:23-4:24"] }, { "id": 1, @@ -48,6 +49,7 @@ OUTPUT: "definition_extent": "4:26-4:43", "variable_type": 1, "is_local": true, + "is_macro": false, "uses": ["4:42-4:43"] }] } diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc index 9132cf77..4370d2d0 100644 --- a/tests/usage/type_usage_declare_param_prototype.cc +++ b/tests/usage/type_usage_declare_param_prototype.cc @@ -40,6 +40,7 @@ OUTPUT: "definition_extent": "4:10-4:16", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["4:15-4:16"] }] } diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc index 93a2fc72..9671c90b 100644 --- a/tests/usage/type_usage_declare_qualifiers.cc +++ b/tests/usage/type_usage_declare_qualifiers.cc @@ -36,6 +36,7 @@ OUTPUT: "definition_extent": "3:10-3:18", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["3:16-3:18"] }, { "id": 1, @@ -46,6 +47,7 @@ OUTPUT: "definition_extent": "3:20-3:34", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["3:32-3:34"] }, { "id": 2, @@ -56,6 +58,7 @@ OUTPUT: "definition_extent": "4:3-4:10", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["4:8-4:10"] }, { "id": 3, @@ -66,6 +69,7 @@ OUTPUT: "definition_extent": "5:3-5:11", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["5:9-5:11"] }, { "id": 4, @@ -76,6 +80,7 @@ OUTPUT: "definition_extent": "6:3-6:17", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["6:15-6:17"] }, { "id": 5, @@ -86,6 +91,7 @@ OUTPUT: "definition_extent": "7:3-7:23", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["7:21-7:23"] }] } diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc index 25c9acf5..3b423813 100644 --- a/tests/usage/type_usage_declare_static.cc +++ b/tests/usage/type_usage_declare_static.cc @@ -18,6 +18,7 @@ OUTPUT: "definition_extent": "2:1-2:14", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:13-2:14"] }] } diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc index 3d606dd1..36cdfeb2 100644 --- a/tests/usage/type_usage_various.cc +++ b/tests/usage/type_usage_various.cc @@ -46,6 +46,7 @@ OUTPUT: "definition_extent": "6:3-6:8", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["6:7-6:8"] }, { "id": 1, @@ -55,6 +56,7 @@ OUTPUT: "declaration": "10:12-10:15", "variable_type": 0, "is_local": false, + "is_macro": false, "uses": ["10:12-10:15"] }] } diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc index aa194dac..d4d5edd7 100644 --- a/tests/usage/usage_inside_of_call.cc +++ b/tests/usage/usage_inside_of_call.cc @@ -69,6 +69,7 @@ OUTPUT: "definition_extent": "10:1-10:24", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["6:14-6:24", "10:10-10:20", "14:45-14:55"] }, { "id": 1, @@ -79,6 +80,7 @@ OUTPUT: "definition_extent": "7:3-7:16", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["7:7-7:16", "14:28-14:37"] }, { "id": 2, @@ -88,6 +90,7 @@ OUTPUT: "definition_spelling": "13:7-13:8", "definition_extent": "13:3-13:12", "is_local": true, + "is_macro": false, "uses": ["13:7-13:8", "14:10-14:11"] }] } diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc index ef9ede0f..c5334e15 100644 --- a/tests/usage/var_usage_call_function.cc +++ b/tests/usage/var_usage_call_function.cc @@ -35,6 +35,7 @@ OUTPUT: "definition_spelling": "4:8-4:9", "definition_extent": "4:3-4:19", "is_local": true, + "is_macro": false, "uses": ["4:8-4:9", "5:3-5:4"] }] } diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc index fe01b9f7..71215b46 100644 --- a/tests/usage/var_usage_class_member.cc +++ b/tests/usage/var_usage_class_member.cc @@ -73,6 +73,7 @@ OUTPUT: "definition_extent": "3:3-3:8", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["3:7-3:8", "12:5-12:6", "13:5-13:6", "14:12-14:13", "15:12-15:13", "16:13-16:14"] }, { "id": 1, @@ -83,6 +84,7 @@ OUTPUT: "definition_extent": "4:3-4:8", "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["4:7-4:8", "17:12-17:13"] }, { "id": 2, @@ -93,6 +95,7 @@ OUTPUT: "definition_extent": "11:3-11:8", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["11:7-11:8", "12:3-12:4", "13:3-13:4", "14:10-14:11", "15:10-15:11", "16:11-16:12", "17:10-17:11"] }] } diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc index 73f797c6..c534d2f2 100644 --- a/tests/usage/var_usage_class_member_static.cc +++ b/tests/usage/var_usage_class_member_static.cc @@ -48,6 +48,7 @@ OUTPUT: "detailed_name": "int Foo::x", "declaration": "2:14-2:15", "is_local": false, + "is_macro": false, "uses": ["2:14-2:15", "8:15-8:16"] }] } diff --git a/tests/usage/var_usage_cstyle_cast.cc b/tests/usage/var_usage_cstyle_cast.cc index 5523406d..c14f1c08 100644 --- a/tests/usage/var_usage_cstyle_cast.cc +++ b/tests/usage/var_usage_cstyle_cast.cc @@ -40,6 +40,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 1, "is_local": false, + "is_macro": false, "uses": ["4:28-4:38", "7:23-7:33"] }] } diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc index 51d925e0..d2cb9865 100644 --- a/tests/usage/var_usage_extern.cc +++ b/tests/usage/var_usage_extern.cc @@ -21,6 +21,7 @@ OUTPUT: "detailed_name": "int a", "declaration": "1:12-1:13", "is_local": false, + "is_macro": false, "uses": ["1:12-1:13", "4:3-4:4"] }] } diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc index 8cb0ea7c..f10fa988 100644 --- a/tests/usage/var_usage_func_parameter.cc +++ b/tests/usage/var_usage_func_parameter.cc @@ -20,6 +20,7 @@ OUTPUT: "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "is_local": true, + "is_macro": false, "uses": ["1:14-1:15", "2:3-2:4"] }] } diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc index de997431..e403c2a0 100644 --- a/tests/usage/var_usage_local.cc +++ b/tests/usage/var_usage_local.cc @@ -21,6 +21,7 @@ OUTPUT: "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "is_local": true, + "is_macro": false, "uses": ["2:7-2:8", "3:3-3:4"] }] } diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc index 8f5693ba..8cfe84af 100644 --- a/tests/usage/var_usage_shadowed_local.cc +++ b/tests/usage/var_usage_shadowed_local.cc @@ -26,6 +26,7 @@ OUTPUT: "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "is_local": true, + "is_macro": false, "uses": ["2:7-2:8", "3:3-3:4", "8:3-8:4"] }, { "id": 1, @@ -35,6 +36,7 @@ OUTPUT: "definition_spelling": "5:9-5:10", "definition_extent": "5:5-5:10", "is_local": true, + "is_macro": false, "uses": ["5:9-5:10", "6:5-6:6"] }] } diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc index 3251e5fb..1febb11a 100644 --- a/tests/usage/var_usage_shadowed_parameter.cc +++ b/tests/usage/var_usage_shadowed_parameter.cc @@ -26,6 +26,7 @@ OUTPUT: "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "is_local": true, + "is_macro": false, "uses": ["1:14-1:15", "2:3-2:4", "7:3-7:4"] }, { "id": 1, @@ -35,6 +36,7 @@ OUTPUT: "definition_spelling": "4:9-4:10", "definition_extent": "4:5-4:10", "is_local": true, + "is_macro": false, "uses": ["4:9-4:10", "5:5-5:6"] }] } diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc index 557bcbe4..cef9e9d4 100644 --- a/tests/usage/var_usage_static.cc +++ b/tests/usage/var_usage_static.cc @@ -23,6 +23,7 @@ OUTPUT: "definition_spelling": "1:12-1:13", "definition_extent": "1:1-1:13", "is_local": false, + "is_macro": false, "uses": ["1:12-1:13", "4:3-4:4"] }] } diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc index f47a7fab..50944ddb 100644 --- a/tests/vars/class_member.cc +++ b/tests/vars/class_member.cc @@ -25,6 +25,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:8-2:14"] }] } diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc index aece86cb..8e5b3235 100644 --- a/tests/vars/class_static_member.cc +++ b/tests/vars/class_static_member.cc @@ -28,6 +28,7 @@ OUTPUT: "variable_type": 0, "declaring_type": 0, "is_local": false, + "is_macro": false, "uses": ["2:15-2:21", "4:11-4:17"] }] } diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc index d960173d..e541db53 100644 --- a/tests/vars/class_static_member_decl_only.cc +++ b/tests/vars/class_static_member_decl_only.cc @@ -20,6 +20,7 @@ OUTPUT: "detailed_name": "int Foo::member", "declaration": "2:14-2:20", "is_local": false, + "is_macro": false, "uses": ["2:14-2:20"] }] } diff --git a/tests/vars/deduce_auto_type.cc b/tests/vars/deduce_auto_type.cc index 1065faf6..8434a21b 100644 --- a/tests/vars/deduce_auto_type.cc +++ b/tests/vars/deduce_auto_type.cc @@ -34,6 +34,7 @@ OUTPUT: "definition_extent": "3:3-3:21", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["3:8-3:9"] }, { "id": 1, @@ -44,6 +45,7 @@ OUTPUT: "definition_extent": "4:3-4:22", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["4:9-4:10"] }] } diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc index 4016064d..618ced76 100644 --- a/tests/vars/function_local.cc +++ b/tests/vars/function_local.cc @@ -30,6 +30,7 @@ OUTPUT: "definition_extent": "4:3-4:9", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["4:8-4:9"] }] } diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc index cddc5d52..5729336f 100644 --- a/tests/vars/function_param.cc +++ b/tests/vars/function_param.cc @@ -28,6 +28,7 @@ OUTPUT: "definition_extent": "3:10-3:17", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["3:15-3:17"] }, { "id": 1, @@ -38,6 +39,7 @@ OUTPUT: "definition_extent": "3:19-3:26", "variable_type": 0, "is_local": true, + "is_macro": false, "uses": ["3:24-3:26"] }] } diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc index a5a5ef65..e5a0675e 100644 --- a/tests/vars/function_shadow_local.cc +++ b/tests/vars/function_shadow_local.cc @@ -26,6 +26,7 @@ OUTPUT: "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "is_local": true, + "is_macro": false, "uses": ["2:7-2:8", "3:3-3:4", "8:3-8:4"] }, { "id": 1, @@ -35,6 +36,7 @@ OUTPUT: "definition_spelling": "5:9-5:10", "definition_extent": "5:5-5:10", "is_local": true, + "is_macro": false, "uses": ["5:9-5:10", "6:5-6:6"] }] } diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc index ae26806c..3b085120 100644 --- a/tests/vars/function_shadow_param.cc +++ b/tests/vars/function_shadow_param.cc @@ -20,6 +20,7 @@ OUTPUT: "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "is_local": true, + "is_macro": false, "uses": ["1:14-1:15"] }, { "id": 1, @@ -29,6 +30,7 @@ OUTPUT: "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "is_local": true, + "is_macro": false, "uses": ["2:7-2:8"] }] } diff --git a/tests/vars/global_variable.cc b/tests/vars/global_variable.cc index 20f793a0..5d79b0c4 100644 --- a/tests/vars/global_variable.cc +++ b/tests/vars/global_variable.cc @@ -10,6 +10,7 @@ OUTPUT: "definition_spelling": "1:12-1:18", "definition_extent": "1:1-1:22", "is_local": false, + "is_macro": false, "uses": ["1:12-1:18"] }] } diff --git a/tests/vars/global_variable_decl_only.cc b/tests/vars/global_variable_decl_only.cc index ca76a576..6978c43b 100644 --- a/tests/vars/global_variable_decl_only.cc +++ b/tests/vars/global_variable_decl_only.cc @@ -9,6 +9,7 @@ OUTPUT: "detailed_name": "int global", "declaration": "1:12-1:18", "is_local": false, + "is_macro": false, "uses": ["1:12-1:18"] }] } diff --git a/tests/vars/type_instance_on_using_type.cc b/tests/vars/type_instance_on_using_type.cc index 06085203..fbf6897d 100644 --- a/tests/vars/type_instance_on_using_type.cc +++ b/tests/vars/type_instance_on_using_type.cc @@ -45,6 +45,7 @@ OUTPUT: "definition_extent": "4:3-4:6", "variable_type": 1, "is_local": true, + "is_macro": false, "uses": ["4:5-4:6"] }] }