From a7f5231e4cc4bb8ea676ef93851b9edaeeb13123 Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Mon, 20 Feb 2017 21:34:46 -0800 Subject: [PATCH] rename all_uses to uses --- main.cpp | 86 ++++--------------- tests/class_forward_declaration.cc | 2 +- tests/constructors/constructor.cc | 10 +-- tests/constructors/destructor.cc | 10 +-- tests/declaration_vs_definition/class.cc | 2 +- .../declaration_vs_definition/class_member.cc | 4 +- .../class_member_static.cc | 4 +- tests/declaration_vs_definition/func.cc | 2 +- tests/declaration_vs_definition/method.cc | 8 +- tests/enums/enum_class_decl.cc | 6 +- tests/enums/enum_decl.cc | 6 +- tests/enums/enum_inherit.cc | 6 +- tests/enums/enum_usage.cc | 8 +- tests/foobar.cc | 6 +- tests/function_declaration.cc | 2 +- tests/function_declaration_definition.cc | 2 +- tests/function_definition.cc | 2 +- tests/inheritance/class_inherit.cc | 4 +- .../class_inherit_templated_parent.cc | 12 +-- tests/inheritance/class_multiple_inherit.cc | 8 +- tests/inheritance/function_override.cc | 8 +- tests/inheritance/interface_pure_virtual.cc | 4 +- tests/method_declaration.cc | 4 +- tests/method_definition.cc | 4 +- tests/method_inline_declaration.cc | 4 +- tests/namespaces/anonymous_function.cc | 2 +- tests/namespaces/function_declaration.cc | 2 +- tests/namespaces/function_definition.cc | 2 +- tests/namespaces/method_declaration.cc | 4 +- tests/namespaces/method_definition.cc | 4 +- tests/namespaces/method_inline_declaration.cc | 4 +- tests/unions/union_decl.cc | 6 +- tests/unions/union_usage.cc | 10 +-- tests/usage/func_usage_addr_func.cc | 8 +- tests/usage/func_usage_addr_method.cc | 8 +- tests/usage/func_usage_call_func.cc | 4 +- tests/usage/func_usage_call_method.cc | 8 +- .../usage/func_usage_class_inline_var_def.cc | 6 +- tests/usage/func_usage_forward_decl_func.cc | 4 +- tests/usage/func_usage_forward_decl_method.cc | 8 +- tests/usage/func_usage_template_func.cc | 4 +- .../usage/type_usage_as_template_parameter.cc | 12 +-- ...ype_usage_as_template_parameter_complex.cc | 20 ++--- ...type_usage_as_template_parameter_simple.cc | 6 +- tests/usage/type_usage_declare_extern.cc | 4 +- tests/usage/type_usage_declare_field.cc | 10 +-- tests/usage/type_usage_declare_local.cc | 10 +-- tests/usage/type_usage_declare_param.cc | 10 +-- .../type_usage_declare_param_prototype.cc | 6 +- .../usage/type_usage_declare_param_unnamed.cc | 4 +- tests/usage/type_usage_declare_qualifiers.cc | 16 ++-- tests/usage/type_usage_declare_static.cc | 4 +- tests/usage/type_usage_on_return_type.cc | 14 +-- tests/usage/type_usage_typedef_and_using.cc | 18 ++-- .../type_usage_typedef_and_using_template.cc | 6 +- tests/usage/type_usage_various.cc | 8 +- tests/usage/usage_inside_of_call.cc | 14 +-- tests/usage/usage_inside_of_call_simple.cc | 6 +- tests/usage/var_usage_call_function.cc | 6 +- tests/usage/var_usage_class_member.cc | 14 +-- tests/usage/var_usage_class_member_static.cc | 8 +- tests/usage/var_usage_extern.cc | 4 +- tests/usage/var_usage_func_parameter.cc | 4 +- tests/usage/var_usage_local.cc | 4 +- tests/usage/var_usage_shadowed_local.cc | 6 +- tests/usage/var_usage_shadowed_parameter.cc | 6 +- tests/usage/var_usage_static.cc | 4 +- tests/vars/class_member.cc | 4 +- tests/vars/class_static_member.cc | 4 +- tests/vars/class_static_member_decl_only.cc | 4 +- tests/vars/function_local.cc | 6 +- tests/vars/function_param.cc | 8 +- tests/vars/function_param_unnamed.cc | 2 +- tests/vars/function_shadow_local.cc | 6 +- tests/vars/function_shadow_param.cc | 6 +- tests/vars/global_variable.cc | 2 +- tests/vars/global_variable_decl_only.cc | 2 +- 77 files changed, 256 insertions(+), 310 deletions(-) diff --git a/main.cpp b/main.cpp index 8f56084b..288ec326 100644 --- a/main.cpp +++ b/main.cpp @@ -211,7 +211,7 @@ struct TypeDef { // Every usage, useful for things like renames. // NOTE: Do not insert directly! Use AddUsage instead. - std::vector all_uses; + std::vector uses; TypeDef(TypeId id, const std::string& usr) : id(id), usr(usr) { assert(usr.size() > 0); @@ -219,16 +219,16 @@ struct TypeDef { } void AddUsage(Location loc, bool insert_if_not_present = true) { - for (int i = all_uses.size() - 1; i >= 0; --i) { - if (all_uses[i].IsEqualTo(loc)) { + for (int i = uses.size() - 1; i >= 0; --i) { + if (uses[i].IsEqualTo(loc)) { if (loc.interesting) - all_uses[i].interesting = true; + uses[i].interesting = true; return; } } if (insert_if_not_present) - all_uses.push_back(loc); + uses.push_back(loc); } }; @@ -262,7 +262,7 @@ struct FuncDef { std::vector callees; // All usages. For interesting usages, see callees. - std::vector all_uses; + std::vector uses; FuncDef(FuncId id, const std::string& usr) : id(id), usr(usr) { assert(usr.size() > 0); @@ -287,7 +287,7 @@ struct VarDef { std::optional declaring_type; // Usages. - std::vector all_uses; + std::vector uses; VarDef(VarId id, const std::string& usr) : id(id), usr(usr) { assert(usr.size() > 0); @@ -476,7 +476,7 @@ std::string ParsingDatabase::ToString() { auto it = usr_to_type_id.find(""); if (it != usr_to_type_id.end()) { Resolve(it->second)->short_name = ""; - assert(Resolve(it->second)->all_uses.size() == 0); + assert(Resolve(it->second)->uses.size() == 0); } #define WRITE(name) Write(writer, #name, def.name) @@ -505,7 +505,7 @@ std::string ParsingDatabase::ToString() { WRITE(types); WRITE(funcs); WRITE(vars); - WRITE(all_uses); + WRITE(uses); writer.EndObject(); } writer.EndArray(); @@ -527,7 +527,7 @@ std::string ParsingDatabase::ToString() { WRITE(locals); WRITE(callers); WRITE(callees); - WRITE(all_uses); + WRITE(uses); writer.EndObject(); } writer.EndArray(); @@ -545,8 +545,7 @@ std::string ParsingDatabase::ToString() { WRITE(definition); WRITE(variable_type); WRITE(declaring_type); - //WRITE(initializations); - WRITE(all_uses); + WRITE(uses); writer.EndObject(); } writer.EndArray(); @@ -567,59 +566,6 @@ struct FileDef { }; -/* -struct Database { - std::unordered_map usr_to_type_id; - std::unordered_map usr_to_func_id; - std::unordered_map usr_to_var_id; - - std::vector files; - - TypeId ToTypeId(const std::string& usr); - FuncId ToFuncId(const std::string& usr); - VarId ToVarId(const std::string& usr); -}; - -TypeId Database::ToTypeId(const std::string& usr) { - auto it = usr_to_type_id.find(usr); - assert(it != usr_to_type_id.end() && "Usr is not registered"); - return it->second; -} -FuncId Database::ToFuncId(const std::string& usr) { - auto it = usr_to_func_id.find(usr); - assert(it != usr_to_func_id.end() && "Usr is not registered"); - return it->second; -} -VarId Database::ToVarId(const std::string& usr) { - auto it = usr_to_var_id.find(usr); - assert(it != usr_to_var_id.end() && "Usr is not registered"); - return it->second; -} - -TypeDef* Resolve(FileDef* file, TypeId id) { - assert(file->id == id.file_id); - return &file->types[id.local_id]; -} -FuncDef* Resolve(FileDef* file, FuncId id) { - assert(file->id == id.file_id); - return &file->funcs[id.local_id]; -} -VarDef* Resolve(FileDef* file, VarId id) { - assert(file->id == id.file_id); - return &file->vars[id.local_id]; -} - -TypeDef* Resolve(Database* db, TypeId id) { - return Resolve(&db->files[id.file_id], id); -} -FuncDef* Resolve(Database* db, FuncId id) { - return Resolve(&db->files[id.file_id], id); -} -VarDef* Resolve(Database* db, VarId id) { - return Resolve(&db->files[id.file_id], id); -} -*/ - template @@ -959,7 +905,7 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { var_def->definition = decl_loc; else var_def->declaration = decl_loc; - var_def->all_uses.push_back(decl_loc); + var_def->uses.push_back(decl_loc); // Declaring variable type information. Note that we do not insert an @@ -1002,7 +948,7 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { func_def->definition = decl_loc; else func_def->declaration = decl_loc; - func_def->all_uses.push_back(decl_loc); + func_def->uses.push_back(decl_loc); bool is_pure_virtual = clang_CXXMethod_isPureVirtual(decl->cursor); bool is_ctor_or_dtor = decl->entityInfo->kind == CXIdxEntity_CXXConstructor || decl->entityInfo->kind == CXIdxEntity_CXXDestructor; @@ -1201,7 +1147,7 @@ void indexEntityReference(CXClientData client_data, const CXIdxEntityRefInfo* re { VarId var_id = db->ToVarId(ref->referencedEntity->cursor); VarDef* var_def = db->Resolve(var_id); - var_def->all_uses.push_back(db->file_db.Resolve(ref->loc, false /*interesting*/)); + var_def->uses.push_back(db->file_db.Resolve(ref->loc, false /*interesting*/)); break; } @@ -1232,11 +1178,11 @@ void indexEntityReference(CXClientData client_data, const CXIdxEntityRefInfo* re caller_def->callees.push_back(FuncRef(called_id, loc)); called_def->callers.push_back(FuncRef(caller_id, loc)); - called_def->all_uses.push_back(loc); + called_def->uses.push_back(loc); } else { FuncDef* called_def = db->Resolve(called_id); - called_def->all_uses.push_back(loc); + called_def->uses.push_back(loc); } // For constructor/destructor, also add a usage against the type. Clang diff --git a/tests/class_forward_declaration.cc b/tests/class_forward_declaration.cc index 392dd694..c4f3f30c 100644 --- a/tests/class_forward_declaration.cc +++ b/tests/class_forward_declaration.cc @@ -12,7 +12,7 @@ OUTPUT: "short_name": "Foo", "qualified_name": "Foo", "definition": "1:3:7", - "all_uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"] + "uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"] }], "functions": [], "variables": [] diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc index 7fb7dab7..df4b9883 100644 --- a/tests/constructors/constructor.cc +++ b/tests/constructors/constructor.cc @@ -18,7 +18,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0], - "all_uses": ["1:1:7", "1:3:3", "*1:7:3", "*1:8:3", "*1:8:17"] + "uses": ["1:1:7", "1:3:3", "*1:7:3", "*1:8:3", "*1:8:17"] }], "functions": [{ "id": 0, @@ -28,7 +28,7 @@ OUTPUT: "definition": "1:3:3", "declaring_type": 0, "callers": ["1@1:7:7", "1@1:8:17"], - "all_uses": ["1:3:3", "1:7:7", "1:8:17"] + "uses": ["1:3:3", "1:7:7", "1:8:17"] }, { "id": 1, "usr": "c:@F@foo#", @@ -36,7 +36,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:6:6", "callees": ["0@1:7:7", "0@1:8:17"], - "all_uses": ["1:6:6"] + "uses": ["1:6:6"] }], "variables": [{ "id": 0, @@ -45,7 +45,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:7:7", "variable_type": 0, - "all_uses": ["1:7:7"] + "uses": ["1:7:7"] }, { "id": 1, "usr": "c:constructor.cc@66@F@foo#@f2", @@ -53,7 +53,7 @@ OUTPUT: "qualified_name": "f2", "definition": "1:8:8", "variable_type": 0, - "all_uses": ["1:8:8"] + "uses": ["1:8:8"] }] } */ \ No newline at end of file diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc index 029e2457..0037d377 100644 --- a/tests/constructors/destructor.cc +++ b/tests/constructors/destructor.cc @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0, 1], - "all_uses": ["1:1:7", "1:3:3", "1:4:3", "*1:8:3"] + "uses": ["1:1:7", "1:3:3", "1:4:3", "*1:8:3"] }], "functions": [{ "id": 0, @@ -33,7 +33,7 @@ OUTPUT: "definition": "1:3:3", "declaring_type": 0, "callers": ["2@1:8:7"], - "all_uses": ["1:3:3", "1:8:7"] + "uses": ["1:3:3", "1:8:7"] }, { "id": 1, "usr": "c:@S@Foo@F@~Foo#", @@ -41,7 +41,7 @@ OUTPUT: "qualified_name": "Foo::~Foo", "definition": "1:4:3", "declaring_type": 0, - "all_uses": ["1:4:3"] + "uses": ["1:4:3"] }, { "id": 2, "usr": "c:@F@foo#", @@ -49,7 +49,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:7:6", "callees": ["0@1:8:7"], - "all_uses": ["1:7:6"] + "uses": ["1:7:6"] }], "variables": [{ "id": 0, @@ -58,7 +58,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:8:7", "variable_type": 0, - "all_uses": ["1:8:7"] + "uses": ["1:8:7"] }] } */ \ No newline at end of file diff --git a/tests/declaration_vs_definition/class.cc b/tests/declaration_vs_definition/class.cc index 9d0c26bb..b092ba62 100644 --- a/tests/declaration_vs_definition/class.cc +++ b/tests/declaration_vs_definition/class.cc @@ -14,7 +14,7 @@ OUTPUT: "short_name": "Foo", "qualified_name": "Foo", "definition": "1:3:7", - "all_uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"] + "uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"] }], "functions": [], "variables": [] diff --git a/tests/declaration_vs_definition/class_member.cc b/tests/declaration_vs_definition/class_member.cc index 805bb0d8..268d7c76 100644 --- a/tests/declaration_vs_definition/class_member.cc +++ b/tests/declaration_vs_definition/class_member.cc @@ -12,7 +12,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0], - "all_uses": ["1:1:7"] + "uses": ["1:1:7"] }], "functions": [], "variables": [{ @@ -22,7 +22,7 @@ OUTPUT: "qualified_name": "Foo::foo", "definition": "1:2:7", "declaring_type": 0, - "all_uses": ["1:2:7"] + "uses": ["1:2:7"] }] } */ \ No newline at end of file diff --git a/tests/declaration_vs_definition/class_member_static.cc b/tests/declaration_vs_definition/class_member_static.cc index 2fae5da2..eaebafd0 100644 --- a/tests/declaration_vs_definition/class_member_static.cc +++ b/tests/declaration_vs_definition/class_member_static.cc @@ -14,7 +14,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0], - "all_uses": ["1:1:7", "1:5:5"] + "uses": ["1:1:7", "1:5:5"] }], "functions": [], "variables": [{ @@ -25,7 +25,7 @@ OUTPUT: "declaration": "1:2:14", "definition": "1:5:10", "declaring_type": 0, - "all_uses": ["1:2:14", "1:5:10"] + "uses": ["1:2:14", "1:5:10"] }] } */ \ No newline at end of file diff --git a/tests/declaration_vs_definition/func.cc b/tests/declaration_vs_definition/func.cc index 32114692..593df83c 100644 --- a/tests/declaration_vs_definition/func.cc +++ b/tests/declaration_vs_definition/func.cc @@ -15,7 +15,7 @@ OUTPUT: "qualified_name": "foo", "declaration": "1:4:6", "definition": "1:3:6", - "all_uses": ["1:1:6", "1:2:6", "1:3:6", "1:4:6"] + "uses": ["1:1:6", "1:2:6", "1:3:6", "1:4:6"] }], "variables": [] } diff --git a/tests/declaration_vs_definition/method.cc b/tests/declaration_vs_definition/method.cc index a136ec74..e32b94fa 100644 --- a/tests/declaration_vs_definition/method.cc +++ b/tests/declaration_vs_definition/method.cc @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0, 1, 2], - "all_uses": ["1:1:7", "1:7:6"] + "uses": ["1:1:7", "1:7:6"] }], "functions": [{ "id": 0, @@ -25,7 +25,7 @@ OUTPUT: "qualified_name": "Foo::declonly", "declaration": "1:2:8", "declaring_type": 0, - "all_uses": ["1:2:8"] + "uses": ["1:2:8"] }, { "id": 1, "usr": "c:@S@Foo@F@purevirtual#", @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "Foo::purevirtual", "declaration": "1:3:16", "declaring_type": 0, - "all_uses": ["1:3:16"] + "uses": ["1:3:16"] }, { "id": 2, "usr": "c:@S@Foo@F@def#", @@ -42,7 +42,7 @@ OUTPUT: "declaration": "1:4:8", "definition": "1:7:11", "declaring_type": 0, - "all_uses": ["1:4:8", "1:7:11"] + "uses": ["1:4:8", "1:7:11"] }], "variables": [] } diff --git a/tests/enums/enum_class_decl.cc b/tests/enums/enum_class_decl.cc index 91e4274e..abacf086 100644 --- a/tests/enums/enum_class_decl.cc +++ b/tests/enums/enum_class_decl.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:12", "vars": [0, 1], - "all_uses": ["1:1:12"] + "uses": ["1:1:12"] }], "functions": [], "variables": [{ @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "Foo::A", "definition": "1:2:3", "declaring_type": 0, - "all_uses": ["1:2:3"] + "uses": ["1:2:3"] }, { "id": 1, "usr": "c:@E@Foo@B", @@ -31,7 +31,7 @@ OUTPUT: "qualified_name": "Foo::B", "definition": "1:3:3", "declaring_type": 0, - "all_uses": ["1:3:3"] + "uses": ["1:3:3"] }] } */ \ No newline at end of file diff --git a/tests/enums/enum_decl.cc b/tests/enums/enum_decl.cc index 715b0bcc..635c332a 100644 --- a/tests/enums/enum_decl.cc +++ b/tests/enums/enum_decl.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:6", "vars": [0, 1], - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "functions": [], "variables": [{ @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "Foo::A", "definition": "1:2:3", "declaring_type": 0, - "all_uses": ["1:2:3"] + "uses": ["1:2:3"] }, { "id": 1, "usr": "c:@E@Foo@B", @@ -31,7 +31,7 @@ OUTPUT: "qualified_name": "Foo::B", "definition": "1:3:3", "declaring_type": 0, - "all_uses": ["1:3:3"] + "uses": ["1:3:3"] }] } */ \ No newline at end of file diff --git a/tests/enums/enum_inherit.cc b/tests/enums/enum_inherit.cc index 794c9c75..ad9298a1 100644 --- a/tests/enums/enum_inherit.cc +++ b/tests/enums/enum_inherit.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:6", "vars": [0, 1], - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "functions": [], "variables": [{ @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "Foo::A", "definition": "1:2:3", "declaring_type": 0, - "all_uses": ["1:2:3"] + "uses": ["1:2:3"] }, { "id": 1, "usr": "c:@E@Foo@B", @@ -31,7 +31,7 @@ OUTPUT: "qualified_name": "Foo::B", "definition": "1:3:3", "declaring_type": 0, - "all_uses": ["1:3:3"] + "uses": ["1:3:3"] }] } */ \ No newline at end of file diff --git a/tests/enums/enum_usage.cc b/tests/enums/enum_usage.cc index b508aeb6..1c55a94c 100644 --- a/tests/enums/enum_usage.cc +++ b/tests/enums/enum_usage.cc @@ -15,7 +15,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:12", "vars": [0, 1], - "all_uses": ["1:1:12", "*1:6:1", "1:6:9"] + "uses": ["1:1:12", "*1:6:1", "1:6:9"] }], "functions": [], "variables": [{ @@ -25,7 +25,7 @@ OUTPUT: "qualified_name": "Foo::A", "definition": "1:2:3", "declaring_type": 0, - "all_uses": ["1:2:3", "1:6:14"] + "uses": ["1:2:3", "1:6:14"] }, { "id": 1, "usr": "c:@E@Foo@B", @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "Foo::B", "definition": "1:3:3", "declaring_type": 0, - "all_uses": ["1:3:3"] + "uses": ["1:3:3"] }, { "id": 2, "usr": "c:@x", @@ -41,7 +41,7 @@ OUTPUT: "qualified_name": "x", "definition": "1:6:5", "variable_type": 0, - "all_uses": ["1:6:5"] + "uses": ["1:6:5"] }] } */ \ No newline at end of file diff --git a/tests/foobar.cc b/tests/foobar.cc index 89528132..f8af6a85 100644 --- a/tests/foobar.cc +++ b/tests/foobar.cc @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "called", "declaration": "1:1:6", "callers": ["2@1:6:3"], - "all_uses": ["1:1:6", "1:6:3"] + "uses": ["1:1:6", "1:6:3"] }, { "id": 1, "usr": "c:@F@gen#", @@ -24,7 +24,7 @@ OUTPUT: "qualified_name": "gen", "definition": "1:3:5", "callers": ["2@1:6:10", "2@1:6:18"], - "all_uses": ["1:3:5", "1:6:10", "1:6:18"] + "uses": ["1:3:5", "1:6:10", "1:6:18"] }, { "id": 2, "usr": "c:@F@foo#", @@ -32,7 +32,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:5:6", "callees": ["0@1:6:3", "1@1:6:10", "1@1:6:18"], - "all_uses": ["1:5:6"] + "uses": ["1:5:6"] }], "variables": [] } diff --git a/tests/function_declaration.cc b/tests/function_declaration.cc index accc0996..d2cbd17a 100644 --- a/tests/function_declaration.cc +++ b/tests/function_declaration.cc @@ -10,7 +10,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "declaration": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [] } diff --git a/tests/function_declaration_definition.cc b/tests/function_declaration_definition.cc index cf17f26a..cdb65920 100644 --- a/tests/function_declaration_definition.cc +++ b/tests/function_declaration_definition.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "foo", "declaration": "1:1:6", "definition": "1:3:6", - "all_uses": ["1:1:6", "1:3:6"] + "uses": ["1:1:6", "1:3:6"] }], "variables": [] } diff --git a/tests/function_definition.cc b/tests/function_definition.cc index 43e70dab..0d282f16 100644 --- a/tests/function_definition.cc +++ b/tests/function_definition.cc @@ -10,7 +10,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [] } diff --git a/tests/inheritance/class_inherit.cc b/tests/inheritance/class_inherit.cc index 17613be6..2e14f2be 100644 --- a/tests/inheritance/class_inherit.cc +++ b/tests/inheritance/class_inherit.cc @@ -11,7 +11,7 @@ OUTPUT: "qualified_name": "Parent", "definition": "1:1:7", "derived": [1], - "all_uses": ["1:1:7", "*1:2:24"] + "uses": ["1:1:7", "*1:2:24"] }, { "id": 1, "usr": "c:@S@Derived", @@ -19,7 +19,7 @@ OUTPUT: "qualified_name": "Derived", "definition": "1:2:7", "parents": [0], - "all_uses": ["1:2:7"] + "uses": ["1:2:7"] }], "functions": [], "variables": [] diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc index 2d6ee3de..a140153e 100644 --- a/tests/inheritance/class_inherit_templated_parent.cc +++ b/tests/inheritance/class_inherit_templated_parent.cc @@ -22,7 +22,7 @@ OUTPUT: "qualified_name": "Base1", "definition": "1:2:7", "derived": [2, 5], - "all_uses": ["1:2:7", "*1:8:18", "*1:13:17"] + "uses": ["1:2:7", "*1:8:18", "*1:13:17"] }, { "id": 1, "usr": "c:@ST>1#T@Base2", @@ -30,7 +30,7 @@ OUTPUT: "qualified_name": "Base2", "definition": "1:5:7", "derived": [3, 5], - "all_uses": ["1:5:7", "*1:11:18", "*1:13:27"] + "uses": ["1:5:7", "*1:11:18", "*1:13:27"] }, { "id": 2, "usr": "c:@ST>1#Ni@Derived1", @@ -39,7 +39,7 @@ OUTPUT: "definition": "1:8:7", "parents": [0], "derived": [5], - "all_uses": ["1:8:7", "*1:13:43"] + "uses": ["1:8:7", "*1:13:43"] }, { "id": 3, "usr": "c:@ST>1#T@Derived2", @@ -48,11 +48,11 @@ OUTPUT: "definition": "1:11:7", "parents": [1], "derived": [5], - "all_uses": ["1:11:7", "*1:13:56"] + "uses": ["1:11:7", "*1:13:56"] }, { "id": 4, "usr": "c:class_inherit_templated_parent.cc@154", - "all_uses": ["*1:11:24"] + "uses": ["*1:11:24"] }, { "id": 5, "usr": "c:@S@Derived", @@ -60,7 +60,7 @@ OUTPUT: "qualified_name": "Derived", "definition": "1:13:7", "parents": [0, 1, 2, 3], - "all_uses": ["1:13:7", "*1:13:33", "*1:13:65"] + "uses": ["1:13:7", "*1:13:33", "*1:13:65"] }], "functions": [], "variables": [] diff --git a/tests/inheritance/class_multiple_inherit.cc b/tests/inheritance/class_multiple_inherit.cc index b12c93d5..d9df276a 100644 --- a/tests/inheritance/class_multiple_inherit.cc +++ b/tests/inheritance/class_multiple_inherit.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "Root", "definition": "1:1:7", "derived": [1, 2], - "all_uses": ["1:1:7", "*1:2:24", "*1:3:24"] + "uses": ["1:1:7", "*1:2:24", "*1:3:24"] }, { "id": 1, "usr": "c:@S@MiddleA", @@ -22,7 +22,7 @@ OUTPUT: "definition": "1:2:7", "parents": [0], "derived": [3], - "all_uses": ["1:2:7", "*1:4:24"] + "uses": ["1:2:7", "*1:4:24"] }, { "id": 2, "usr": "c:@S@MiddleB", @@ -31,7 +31,7 @@ OUTPUT: "definition": "1:3:7", "parents": [0], "derived": [3], - "all_uses": ["1:3:7", "*1:4:40"] + "uses": ["1:3:7", "*1:4:40"] }, { "id": 3, "usr": "c:@S@Derived", @@ -39,7 +39,7 @@ OUTPUT: "qualified_name": "Derived", "definition": "1:4:7", "parents": [1, 2], - "all_uses": ["1:4:7"] + "uses": ["1:4:7"] }], "functions": [], "variables": [] diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc index 56eed379..da2590eb 100644 --- a/tests/inheritance/function_override.cc +++ b/tests/inheritance/function_override.cc @@ -16,7 +16,7 @@ OUTPUT: "definition": "1:1:7", "derived": [1], "funcs": [0], - "all_uses": ["1:1:7", "*1:4:24"] + "uses": ["1:1:7", "*1:4:24"] }, { "id": 1, "usr": "c:@S@Derived", @@ -25,7 +25,7 @@ OUTPUT: "definition": "1:4:7", "parents": [0], "funcs": [1], - "all_uses": ["1:4:7"] + "uses": ["1:4:7"] }], "functions": [{ "id": 0, @@ -35,7 +35,7 @@ OUTPUT: "declaration": "1:2:16", "declaring_type": 0, "derived": [1], - "all_uses": ["1:2:16"] + "uses": ["1:2:16"] }, { "id": 1, "usr": "c:@S@Derived@F@foo#", @@ -44,7 +44,7 @@ OUTPUT: "definition": "1:5:8", "declaring_type": 1, "base": 0, - "all_uses": ["1:5:8"] + "uses": ["1:5:8"] }], "variables": [] } diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc index 4fa18481..8f7d8723 100644 --- a/tests/inheritance/interface_pure_virtual.cc +++ b/tests/inheritance/interface_pure_virtual.cc @@ -12,7 +12,7 @@ OUTPUT: "qualified_name": "IFoo", "definition": "1:1:7", "funcs": [0], - "all_uses": ["1:1:7"] + "uses": ["1:1:7"] }], "functions": [{ "id": 0, @@ -21,7 +21,7 @@ OUTPUT: "qualified_name": "IFoo::foo", "definition": "1:2:16", "declaring_type": 0, - "all_uses": ["1:2:16"] + "uses": ["1:2:16"] }], "variables": [] } diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc index c49c0eb7..00c740c0 100644 --- a/tests/method_declaration.cc +++ b/tests/method_declaration.cc @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0], - "all_uses": ["1:1:7"] + "uses": ["1:1:7"] }], "functions": [{ "id": 0, @@ -25,7 +25,7 @@ OUTPUT: "qualified_name": "Foo::foo", "declaration": "1:2:8", "declaring_type": 0, - "all_uses": ["1:2:8"] + "uses": ["1:2:8"] }], "variables": [] } diff --git a/tests/method_definition.cc b/tests/method_definition.cc index cfa5bab3..e1152f3b 100644 --- a/tests/method_definition.cc +++ b/tests/method_definition.cc @@ -14,7 +14,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0], - "all_uses": ["1:1:7", "1:5:6"] + "uses": ["1:1:7", "1:5:6"] }], "functions": [{ "id": 0, @@ -24,7 +24,7 @@ OUTPUT: "declaration": "1:2:8", "definition": "1:5:11", "declaring_type": 0, - "all_uses": ["1:2:8", "1:5:11"] + "uses": ["1:2:8", "1:5:11"] }], "variables": [] } diff --git a/tests/method_inline_declaration.cc b/tests/method_inline_declaration.cc index 85d19032..6e281fdc 100644 --- a/tests/method_inline_declaration.cc +++ b/tests/method_inline_declaration.cc @@ -12,7 +12,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0], - "all_uses": ["1:1:7"] + "uses": ["1:1:7"] }], "functions": [{ "id": 0, @@ -21,7 +21,7 @@ OUTPUT: "qualified_name": "Foo::foo", "definition": "1:2:8", "declaring_type": 0, - "all_uses": ["1:2:8"] + "uses": ["1:2:8"] }], "variables": [] } diff --git a/tests/namespaces/anonymous_function.cc b/tests/namespaces/anonymous_function.cc index 1c2defd9..770efadf 100644 --- a/tests/namespaces/anonymous_function.cc +++ b/tests/namespaces/anonymous_function.cc @@ -12,7 +12,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "::foo", "declaration": "1:2:6", - "all_uses": ["1:2:6"] + "uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/namespaces/function_declaration.cc b/tests/namespaces/function_declaration.cc index ed161f25..8afe389f 100644 --- a/tests/namespaces/function_declaration.cc +++ b/tests/namespaces/function_declaration.cc @@ -12,7 +12,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "hello::foo", "declaration": "1:2:6", - "all_uses": ["1:2:6"] + "uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/namespaces/function_definition.cc b/tests/namespaces/function_definition.cc index 6a87d0c4..edfe7575 100644 --- a/tests/namespaces/function_definition.cc +++ b/tests/namespaces/function_definition.cc @@ -12,7 +12,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "hello::foo", "definition": "1:2:6", - "all_uses": ["1:2:6"] + "uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/namespaces/method_declaration.cc b/tests/namespaces/method_declaration.cc index 7f5e2af2..293fc792 100644 --- a/tests/namespaces/method_declaration.cc +++ b/tests/namespaces/method_declaration.cc @@ -14,7 +14,7 @@ OUTPUT: "qualified_name": "hello::Foo", "definition": "1:2:7", "funcs": [0], - "all_uses": ["1:2:7"] + "uses": ["1:2:7"] }], "functions": [{ "id": 0, @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "hello::Foo::foo", "declaration": "1:3:8", "declaring_type": 0, - "all_uses": ["1:3:8"] + "uses": ["1:3:8"] }], "variables": [] } diff --git a/tests/namespaces/method_definition.cc b/tests/namespaces/method_definition.cc index 8ffe778f..983c3592 100644 --- a/tests/namespaces/method_definition.cc +++ b/tests/namespaces/method_definition.cc @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "hello::Foo", "definition": "1:2:7", "funcs": [0], - "all_uses": ["1:2:7", "1:6:6"] + "uses": ["1:2:7", "1:6:6"] }], "functions": [{ "id": 0, @@ -26,7 +26,7 @@ OUTPUT: "declaration": "1:3:8", "definition": "1:6:11", "declaring_type": 0, - "all_uses": ["1:3:8", "1:6:11"] + "uses": ["1:3:8", "1:6:11"] }], "variables": [] } diff --git a/tests/namespaces/method_inline_declaration.cc b/tests/namespaces/method_inline_declaration.cc index edafa84c..2555922e 100644 --- a/tests/namespaces/method_inline_declaration.cc +++ b/tests/namespaces/method_inline_declaration.cc @@ -14,7 +14,7 @@ OUTPUT: "qualified_name": "hello::Foo", "definition": "1:2:7", "funcs": [0], - "all_uses": ["1:2:7"] + "uses": ["1:2:7"] }], "functions": [{ "id": 0, @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "hello::Foo::foo", "definition": "1:3:8", "declaring_type": 0, - "all_uses": ["1:3:8"] + "uses": ["1:3:8"] }], "variables": [] } diff --git a/tests/unions/union_decl.cc b/tests/unions/union_decl.cc index ca9a8771..929c96a5 100644 --- a/tests/unions/union_decl.cc +++ b/tests/unions/union_decl.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0, 1], - "all_uses": ["1:1:7"] + "uses": ["1:1:7"] }], "functions": [], "variables": [{ @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "Foo::a", "definition": "1:2:7", "declaring_type": 0, - "all_uses": ["1:2:7"] + "uses": ["1:2:7"] }, { "id": 1, "usr": "c:@U@Foo@FI@b", @@ -31,7 +31,7 @@ OUTPUT: "qualified_name": "Foo::b", "definition": "1:3:8", "declaring_type": 0, - "all_uses": ["1:3:8"] + "uses": ["1:3:8"] }] } */ \ No newline at end of file diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc index bba5924a..7333bf3c 100644 --- a/tests/unions/union_usage.cc +++ b/tests/unions/union_usage.cc @@ -19,7 +19,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0, 1], - "all_uses": ["1:1:7", "*1:6:1", "*1:8:10"] + "uses": ["1:1:7", "*1:6:1", "*1:8:10"] }], "functions": [{ "id": 0, @@ -27,7 +27,7 @@ OUTPUT: "short_name": "act", "qualified_name": "act", "definition": "1:8:6", - "all_uses": ["1:8:6"] + "uses": ["1:8:6"] }], "variables": [{ "id": 0, @@ -36,7 +36,7 @@ OUTPUT: "qualified_name": "Foo::a", "definition": "1:2:7", "declaring_type": 0, - "all_uses": ["1:2:7", "1:9:5"] + "uses": ["1:2:7", "1:9:5"] }, { "id": 1, "usr": "c:@U@Foo@FI@b", @@ -44,7 +44,7 @@ OUTPUT: "qualified_name": "Foo::b", "definition": "1:3:8", "declaring_type": 0, - "all_uses": ["1:3:8"] + "uses": ["1:3:8"] }, { "id": 2, "usr": "c:@f", @@ -52,7 +52,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:6:5", "variable_type": 0, - "all_uses": ["1:6:5", "1:9:3"] + "uses": ["1:6:5", "1:9:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc index 03f322d6..b14f8031 100644 --- a/tests/usage/func_usage_addr_func.cc +++ b/tests/usage/func_usage_addr_func.cc @@ -18,7 +18,7 @@ OUTPUT: "qualified_name": "consume", "definition": "1:1:6", "callers": ["2@1:7:3"], - "all_uses": ["1:1:6", "1:7:3"] + "uses": ["1:1:6", "1:7:3"] }, { "id": 1, "usr": "c:@F@used#", @@ -26,7 +26,7 @@ OUTPUT: "qualified_name": "used", "definition": "1:3:6", "callers": ["2@1:6:13", "2@1:7:12"], - "all_uses": ["1:3:6", "1:6:13", "1:7:12"] + "uses": ["1:3:6", "1:6:13", "1:7:12"] }, { "id": 2, "usr": "c:@F@user#", @@ -34,7 +34,7 @@ OUTPUT: "qualified_name": "user", "definition": "1:5:6", "callees": ["1@1:6:13", "0@1:7:3", "1@1:7:12"], - "all_uses": ["1:5:6"] + "uses": ["1:5:6"] }], "variables": [{ "id": 0, @@ -42,7 +42,7 @@ OUTPUT: "short_name": "x", "qualified_name": "x", "definition": "1:6:8", - "all_uses": ["1:6:8"] + "uses": ["1:6:8"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc index b8ec2fc9..8e1b9f8d 100644 --- a/tests/usage/func_usage_addr_method.cc +++ b/tests/usage/func_usage_addr_method.cc @@ -17,7 +17,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:8", "funcs": [0], - "all_uses": ["1:1:8", "1:6:13"] + "uses": ["1:1:8", "1:6:13"] }], "functions": [{ "id": 0, @@ -27,7 +27,7 @@ OUTPUT: "declaration": "1:2:8", "declaring_type": 0, "callers": ["1@1:6:18"], - "all_uses": ["1:2:8", "1:6:18"] + "uses": ["1:2:8", "1:6:18"] }, { "id": 1, "usr": "c:@F@user#", @@ -35,7 +35,7 @@ OUTPUT: "qualified_name": "user", "definition": "1:5:6", "callees": ["0@1:6:18"], - "all_uses": ["1:5:6"] + "uses": ["1:5:6"] }], "variables": [{ "id": 0, @@ -43,7 +43,7 @@ OUTPUT: "short_name": "x", "qualified_name": "x", "definition": "1:6:8", - "all_uses": ["1:6:8"] + "uses": ["1:6:8"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_call_func.cc b/tests/usage/func_usage_call_func.cc index 43baabc6..400ea5cb 100644 --- a/tests/usage/func_usage_call_func.cc +++ b/tests/usage/func_usage_call_func.cc @@ -14,7 +14,7 @@ OUTPUT: "qualified_name": "called", "definition": "1:1:6", "callers": ["1@1:3:3"], - "all_uses": ["1:1:6", "1:3:3"] + "uses": ["1:1:6", "1:3:3"] }, { "id": 1, "usr": "c:@F@caller#", @@ -22,7 +22,7 @@ OUTPUT: "qualified_name": "caller", "definition": "1:2:6", "callees": ["0@1:3:3"], - "all_uses": ["1:2:6"] + "uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc index 1bd1918a..6a7d3158 100644 --- a/tests/usage/func_usage_call_method.cc +++ b/tests/usage/func_usage_call_method.cc @@ -17,7 +17,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:8", "funcs": [0], - "all_uses": ["1:1:8", "*1:6:3"] + "uses": ["1:1:8", "*1:6:3"] }], "functions": [{ "id": 0, @@ -27,7 +27,7 @@ OUTPUT: "declaration": "1:2:8", "declaring_type": 0, "callers": ["1@1:7:6"], - "all_uses": ["1:2:8", "1:7:6"] + "uses": ["1:2:8", "1:7:6"] }, { "id": 1, "usr": "c:@F@user#", @@ -35,7 +35,7 @@ OUTPUT: "qualified_name": "user", "definition": "1:5:6", "callees": ["0@1:7:6"], - "all_uses": ["1:5:6"] + "uses": ["1:5:6"] }], "variables": [{ "id": 0, @@ -44,7 +44,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:6:8", "variable_type": 0, - "all_uses": ["1:6:8", "1:7:3"] + "uses": ["1:6:8", "1:7:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc index 06a5422e..bdca5410 100644 --- a/tests/usage/func_usage_class_inline_var_def.cc +++ b/tests/usage/func_usage_class_inline_var_def.cc @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:5:7", "vars": [0], - "all_uses": ["1:5:7"] + "uses": ["1:5:7"] }], "functions": [{ "id": 0, @@ -24,7 +24,7 @@ OUTPUT: "short_name": "helper", "qualified_name": "helper", "definition": "1:1:12", - "all_uses": ["1:1:12", "1:6:11"] + "uses": ["1:1:12", "1:6:11"] }], "variables": [{ "id": 0, @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "Foo::x", "definition": "1:6:7", "declaring_type": 0, - "all_uses": ["1:6:7"] + "uses": ["1:6:7"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_forward_decl_func.cc b/tests/usage/func_usage_forward_decl_func.cc index 05620073..d0ec7568 100644 --- a/tests/usage/func_usage_forward_decl_func.cc +++ b/tests/usage/func_usage_forward_decl_func.cc @@ -14,7 +14,7 @@ OUTPUT: "qualified_name": "foo", "declaration": "1:1:6", "callers": ["1@1:4:3"], - "all_uses": ["1:1:6", "1:4:3"] + "uses": ["1:1:6", "1:4:3"] }, { "id": 1, "usr": "c:@F@usage#", @@ -22,7 +22,7 @@ OUTPUT: "qualified_name": "usage", "definition": "1:3:6", "callees": ["0@1:4:3"], - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [] } diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc index be91d882..a130e6a3 100644 --- a/tests/usage/func_usage_forward_decl_method.cc +++ b/tests/usage/func_usage_forward_decl_method.cc @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:8", "funcs": [0], - "all_uses": ["1:1:8", "*1:6:3"] + "uses": ["1:1:8", "*1:6:3"] }], "functions": [{ "id": 0, @@ -26,7 +26,7 @@ OUTPUT: "declaration": "1:2:8", "declaring_type": 0, "callers": ["1@1:7:6"], - "all_uses": ["1:2:8", "1:7:6"] + "uses": ["1:2:8", "1:7:6"] }, { "id": 1, "usr": "c:@F@usage#", @@ -34,7 +34,7 @@ OUTPUT: "qualified_name": "usage", "definition": "1:5:6", "callees": ["0@1:7:6"], - "all_uses": ["1:5:6"] + "uses": ["1:5:6"] }], "variables": [{ "id": 0, @@ -43,7 +43,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:6:8", "variable_type": 0, - "all_uses": ["1:6:8", "1:7:3"] + "uses": ["1:6:8", "1:7:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/func_usage_template_func.cc b/tests/usage/func_usage_template_func.cc index 8dae32fa..1063e773 100644 --- a/tests/usage/func_usage_template_func.cc +++ b/tests/usage/func_usage_template_func.cc @@ -17,7 +17,7 @@ OUTPUT: "qualified_name": "accept", "declaration": "1:2:6", "callers": ["1@1:5:3", "1@1:6:3"], - "all_uses": ["1:2:6", "1:5:3", "1:6:3"] + "uses": ["1:2:6", "1:5:3", "1:6:3"] }, { "id": 1, "usr": "c:@F@foo#", @@ -25,7 +25,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:4:6", "callees": ["0@1:5:3", "0@1:6:3"], - "all_uses": ["1:4:6"] + "uses": ["1:4:6"] }], "variables": [] } diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc index 31e1227c..2b68d8b9 100644 --- a/tests/usage/type_usage_as_template_parameter.cc +++ b/tests/usage/type_usage_as_template_parameter.cc @@ -16,14 +16,14 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@ST>1#T@unique_ptr", - "all_uses": ["1:2:7", "*1:6:8", "*1:7:8", "*1:9:1", "*1:10:3"] + "uses": ["1:2:7", "*1:6:8", "*1:7:8", "*1:9:1", "*1:10:3"] }, { "id": 1, "usr": "c:@S@S", "short_name": "S", "qualified_name": "S", "definition": "1:4:8", - "all_uses": ["1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"] + "uses": ["1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"] }], "functions": [{ "id": 0, @@ -31,7 +31,7 @@ OUTPUT: "short_name": "return_type", "qualified_name": "return_type", "definition": "1:9:16", - "all_uses": ["1:9:16"] + "uses": ["1:9:16"] }], "variables": [{ "id": 0, @@ -40,7 +40,7 @@ OUTPUT: "qualified_name": "f0", "definition": "1:6:25", "variable_type": 0, - "all_uses": ["1:6:25"] + "uses": ["1:6:25"] }, { "id": 1, "usr": "c:type_usage_as_template_parameter.cc@f1", @@ -48,7 +48,7 @@ OUTPUT: "qualified_name": "f1", "definition": "1:7:22", "variable_type": 0, - "all_uses": ["1:7:22"] + "uses": ["1:7:22"] }, { "id": 2, "usr": "c:type_usage_as_template_parameter.cc@150@F@return_type#@local", @@ -56,7 +56,7 @@ OUTPUT: "qualified_name": "local", "definition": "1:10:18", "variable_type": 0, - "all_uses": ["1:10:18"] + "uses": ["1:10:18"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc index f1605cff..63e15d24 100644 --- a/tests/usage/type_usage_as_template_parameter_complex.cc +++ b/tests/usage/type_usage_as_template_parameter_complex.cc @@ -84,15 +84,15 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@ST>2#T#T@unique_ptr", - "all_uses": ["1:2:7", "*1:15:8", "*1:15:19", "*1:33:1", "*1:33:12", "*1:33:52", "*1:54:3", "*1:54:14", "*1:65:3", "*1:79:1"] + "uses": ["1:2:7", "*1:15:8", "*1:15:19", "*1:33:1", "*1:33:12", "*1:33:52", "*1:54:3", "*1:54:14", "*1:65:3", "*1:79:1"] }, { "id": 1, "usr": "c:@S@S1", - "all_uses": ["1:4:8", "*1:15:30", "*1:33:23", "*1:33:63", "*1:54:25", "*1:65:14", "*1:79:12"] + "uses": ["1:4:8", "*1:15:30", "*1:33:23", "*1:33:63", "*1:54:25", "*1:65:14", "*1:79:12"] }, { "id": 2, "usr": "c:@S@S2", - "all_uses": ["1:5:8", "*1:15:34", "*1:15:39", "*1:33:27", "*1:33:32", "*1:33:67", "*1:54:29", "*1:54:34", "*1:65:18", "*1:79:16"] + "uses": ["1:5:8", "*1:15:34", "*1:15:39", "*1:33:27", "*1:33:32", "*1:33:67", "*1:54:29", "*1:54:34", "*1:65:18", "*1:79:16"] }, { "id": 3, "usr": "c:@S@Foo", @@ -100,7 +100,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:64:7", "funcs": [3], - "all_uses": ["1:64:7", "1:79:21"] + "uses": ["1:64:7", "1:79:21"] }], "functions": [{ "id": 0, @@ -108,21 +108,21 @@ OUTPUT: "short_name": "as_return_type", "qualified_name": "as_return_type", "definition": "1:33:37", - "all_uses": ["1:33:37"] + "uses": ["1:33:37"] }, { "id": 1, "usr": "c:@F@no_return_type#I#", "short_name": "no_return_type", "qualified_name": "no_return_type", "definition": "1:40:6", - "all_uses": ["1:40:6"] + "uses": ["1:40:6"] }, { "id": 2, "usr": "c:@F@empty#", "short_name": "empty", "qualified_name": "empty", "definition": "1:53:6", - "all_uses": ["1:53:6"] + "uses": ["1:53:6"] }, { "id": 3, "usr": "c:@S@Foo@F@foo#", @@ -131,7 +131,7 @@ OUTPUT: "declaration": "1:65:23", "definition": "1:79:26", "declaring_type": 3, - "all_uses": ["1:65:23", "1:79:26"] + "uses": ["1:65:23", "1:79:26"] }], "variables": [{ "id": 0, @@ -140,7 +140,7 @@ OUTPUT: "qualified_name": "f", "declaration": "1:15:43", "variable_type": 0, - "all_uses": ["1:15:43"] + "uses": ["1:15:43"] }, { "id": 1, "usr": "c:type_usage_as_template_parameter_complex.cc@1062@F@empty#@local", @@ -148,7 +148,7 @@ OUTPUT: "qualified_name": "local", "definition": "1:54:39", "variable_type": 0, - "all_uses": ["1:54:39"] + "uses": ["1:54:39"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc index 54d47155..1f0f4f3d 100644 --- a/tests/usage/type_usage_as_template_parameter_simple.cc +++ b/tests/usage/type_usage_as_template_parameter_simple.cc @@ -14,11 +14,11 @@ OUTPUT: "short_name": "unique_ptr", "qualified_name": "unique_ptr", "definition": "1:2:7", - "all_uses": ["1:2:7", "*1:6:8"] + "uses": ["1:2:7", "*1:6:8"] }, { "id": 1, "usr": "c:@S@S", - "all_uses": ["1:4:8", "*1:6:19"] + "uses": ["1:4:8", "*1:6:19"] }], "functions": [], "variables": [{ @@ -28,7 +28,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:6:22", "variable_type": 0, - "all_uses": ["1:6:22"] + "uses": ["1:6:22"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc index e3de3450..94688ee0 100644 --- a/tests/usage/type_usage_declare_extern.cc +++ b/tests/usage/type_usage_declare_extern.cc @@ -10,7 +10,7 @@ OUTPUT: "short_name": "T", "qualified_name": "T", "definition": "1:1:8", - "all_uses": ["1:1:8", "*1:3:8"] + "uses": ["1:1:8", "*1:3:8"] }], "functions": [], "variables": [{ @@ -20,7 +20,7 @@ OUTPUT: "qualified_name": "t", "declaration": "1:3:10", "variable_type": 0, - "all_uses": ["1:3:10"] + "uses": ["1:3:10"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc index f8390879..0f3b6624 100644 --- a/tests/usage/type_usage_declare_field.cc +++ b/tests/usage/type_usage_declare_field.cc @@ -12,14 +12,14 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["1:1:8", "*1:5:3"] + "uses": ["1:1:8", "*1:5:3"] }, { "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", "qualified_name": "ImplementedType", "definition": "1:2:8", - "all_uses": ["1:2:8", "*1:6:3"] + "uses": ["1:2:8", "*1:6:3"] }, { "id": 2, "usr": "c:@S@Foo", @@ -27,7 +27,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:4:8", "vars": [0, 1], - "all_uses": ["1:4:8"] + "uses": ["1:4:8"] }], "functions": [], "variables": [{ @@ -38,7 +38,7 @@ OUTPUT: "definition": "1:5:16", "variable_type": 0, "declaring_type": 2, - "all_uses": ["1:5:16"] + "uses": ["1:5:16"] }, { "id": 1, "usr": "c:@S@Foo@FI@b", @@ -47,7 +47,7 @@ OUTPUT: "definition": "1:6:19", "variable_type": 1, "declaring_type": 2, - "all_uses": ["1:6:19"] + "uses": ["1:6:19"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc index 74afbfa8..2691b9a6 100644 --- a/tests/usage/type_usage_declare_local.cc +++ b/tests/usage/type_usage_declare_local.cc @@ -12,14 +12,14 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["1:1:8", "*1:5:3"] + "uses": ["1:1:8", "*1:5:3"] }, { "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", "qualified_name": "ImplementedType", "definition": "1:2:8", - "all_uses": ["1:2:8", "*1:6:3"] + "uses": ["1:2:8", "*1:6:3"] }], "functions": [{ "id": 0, @@ -27,7 +27,7 @@ OUTPUT: "short_name": "Foo", "qualified_name": "Foo", "definition": "1:4:6", - "all_uses": ["1:4:6"] + "uses": ["1:4:6"] }], "variables": [{ "id": 0, @@ -36,7 +36,7 @@ OUTPUT: "qualified_name": "a", "definition": "1:5:16", "variable_type": 0, - "all_uses": ["1:5:16"] + "uses": ["1:5:16"] }, { "id": 1, "usr": "c:type_usage_declare_local.cc@86@F@Foo#@b", @@ -44,7 +44,7 @@ OUTPUT: "qualified_name": "b", "definition": "1:6:19", "variable_type": 1, - "all_uses": ["1:6:19"] + "uses": ["1:6:19"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc index f9269cad..ebad66f1 100644 --- a/tests/usage/type_usage_declare_param.cc +++ b/tests/usage/type_usage_declare_param.cc @@ -9,14 +9,14 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["1:1:8", "*1:4:10"] + "uses": ["1:1:8", "*1:4:10"] }, { "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", "qualified_name": "ImplementedType", "definition": "1:2:8", - "all_uses": ["1:2:8", "*1:4:26"] + "uses": ["1:2:8", "*1:4:26"] }], "functions": [{ "id": 0, @@ -24,7 +24,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:4:6", - "all_uses": ["1:4:6"] + "uses": ["1:4:6"] }], "variables": [{ "id": 0, @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:4:23", "variable_type": 0, - "all_uses": ["1:4:23"] + "uses": ["1:4:23"] }, { "id": 1, "usr": "c:type_usage_declare_param.cc@76@F@foo#*$@S@ForwardType#$@S@ImplementedType#@a", @@ -41,7 +41,7 @@ OUTPUT: "qualified_name": "a", "definition": "1:4:42", "variable_type": 1, - "all_uses": ["1:4:42"] + "uses": ["1:4:42"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc index 5a68e4f6..acdbee45 100644 --- a/tests/usage/type_usage_declare_param_prototype.cc +++ b/tests/usage/type_usage_declare_param_prototype.cc @@ -14,7 +14,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["1:1:8", "1:3:10", "1:3:18", "*1:4:10", "*1:4:18"] + "uses": ["1:1:8", "1:3:10", "1:3:18", "*1:4:10", "*1:4:18"] }], "functions": [{ "id": 0, @@ -23,7 +23,7 @@ OUTPUT: "qualified_name": "foo", "declaration": "1:3:6", "definition": "1:4:6", - "all_uses": ["1:3:6", "1:4:6"] + "uses": ["1:3:6", "1:4:6"] }], "variables": [{ "id": 0, @@ -32,7 +32,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:4:15", "variable_type": 0, - "all_uses": ["1:4:15"] + "uses": ["1:4:15"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc index e70bbb93..de0c0c0f 100644 --- a/tests/usage/type_usage_declare_param_unnamed.cc +++ b/tests/usage/type_usage_declare_param_unnamed.cc @@ -6,7 +6,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@ForwardType", - "all_uses": ["1:1:8", "*1:2:10"] + "uses": ["1:1:8", "*1:2:10"] }], "functions": [{ "id": 0, @@ -14,7 +14,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:2:6", - "all_uses": ["1:2:6"] + "uses": ["1:2:6"] }], "variables": [] } diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc index e14d2ab8..d1e9380f 100644 --- a/tests/usage/type_usage_declare_qualifiers.cc +++ b/tests/usage/type_usage_declare_qualifiers.cc @@ -15,7 +15,7 @@ OUTPUT: "short_name": "Type", "qualified_name": "Type", "definition": "1:1:8", - "all_uses": ["1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"] + "uses": ["1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"] }], "functions": [{ "id": 0, @@ -23,7 +23,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:3:6", - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [{ "id": 0, @@ -32,7 +32,7 @@ OUTPUT: "qualified_name": "a0", "definition": "1:3:16", "variable_type": 0, - "all_uses": ["1:3:16"] + "uses": ["1:3:16"] }, { "id": 1, "usr": "c:type_usage_declare_qualifiers.cc@38@F@foo#&$@S@Type#&1S1_#@a1", @@ -40,7 +40,7 @@ OUTPUT: "qualified_name": "a1", "definition": "1:3:32", "variable_type": 0, - "all_uses": ["1:3:32"] + "uses": ["1:3:32"] }, { "id": 2, "usr": "c:type_usage_declare_qualifiers.cc@59@F@foo#&$@S@Type#&1S1_#@a2", @@ -48,7 +48,7 @@ OUTPUT: "qualified_name": "a2", "definition": "1:4:8", "variable_type": 0, - "all_uses": ["1:4:8"] + "uses": ["1:4:8"] }, { "id": 3, "usr": "c:type_usage_declare_qualifiers.cc@71@F@foo#&$@S@Type#&1S1_#@a3", @@ -56,7 +56,7 @@ OUTPUT: "qualified_name": "a3", "definition": "1:5:9", "variable_type": 0, - "all_uses": ["1:5:9"] + "uses": ["1:5:9"] }, { "id": 4, "usr": "c:type_usage_declare_qualifiers.cc@84@F@foo#&$@S@Type#&1S1_#@a4", @@ -64,7 +64,7 @@ OUTPUT: "qualified_name": "a4", "definition": "1:6:15", "variable_type": 0, - "all_uses": ["1:6:15"] + "uses": ["1:6:15"] }, { "id": 5, "usr": "c:type_usage_declare_qualifiers.cc@103@F@foo#&$@S@Type#&1S1_#@a5", @@ -72,7 +72,7 @@ OUTPUT: "qualified_name": "a5", "definition": "1:7:21", "variable_type": 0, - "all_uses": ["1:7:21"] + "uses": ["1:7:21"] }] } diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc index 04ac05e3..d9e8e4ee 100644 --- a/tests/usage/type_usage_declare_static.cc +++ b/tests/usage/type_usage_declare_static.cc @@ -6,7 +6,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Type", - "all_uses": ["1:1:8", "*1:2:8"] + "uses": ["1:1:8", "*1:2:8"] }], "functions": [], "variables": [{ @@ -16,7 +16,7 @@ OUTPUT: "qualified_name": "t", "definition": "1:2:13", "variable_type": 0, - "all_uses": ["1:2:13"] + "uses": ["1:2:13"] }] } */ \ No newline at end of file diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc index e0517945..29cb7b73 100644 --- a/tests/usage/type_usage_on_return_type.cc +++ b/tests/usage/type_usage_on_return_type.cc @@ -23,7 +23,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Type", - "all_uses": ["1:1:8", "*1:3:1", "*1:4:1", "*1:5:1", "*1:8:3", "*1:12:1", "*1:15:14", "*1:17:8", "*1:18:8"] + "uses": ["1:1:8", "*1:3:1", "*1:4:1", "*1:5:1", "*1:8:3", "*1:12:1", "*1:15:14", "*1:17:8", "*1:18:8"] }, { "id": 1, "usr": "c:@S@Foo", @@ -31,7 +31,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:7:7", "funcs": [1, 2], - "all_uses": ["1:7:7", "1:12:7", "1:13:6"] + "uses": ["1:7:7", "1:12:7", "1:13:6"] }], "functions": [{ "id": 0, @@ -40,7 +40,7 @@ OUTPUT: "qualified_name": "foo", "declaration": "1:4:7", "definition": "1:5:7", - "all_uses": ["1:3:7", "1:4:7", "1:5:7"] + "uses": ["1:3:7", "1:4:7", "1:5:7"] }, { "id": 1, "usr": "c:@S@Foo@F@Get#I#", @@ -49,7 +49,7 @@ OUTPUT: "declaration": "1:8:9", "definition": "1:12:12", "declaring_type": 1, - "all_uses": ["1:8:9", "1:12:12"] + "uses": ["1:8:9", "1:12:12"] }, { "id": 2, "usr": "c:@S@Foo@F@Empty#", @@ -58,14 +58,14 @@ OUTPUT: "declaration": "1:9:8", "definition": "1:13:11", "declaring_type": 1, - "all_uses": ["1:9:8", "1:13:11"] + "uses": ["1:9:8", "1:13:11"] }, { "id": 3, "usr": "c:@F@external#", "short_name": "external", "qualified_name": "external", "declaration": "1:15:20", - "all_uses": ["1:15:20"] + "uses": ["1:15:20"] }, { "id": 4, "usr": "c:type_usage_on_return_type.cc@F@bar#", @@ -73,7 +73,7 @@ OUTPUT: "qualified_name": "bar", "declaration": "1:17:14", "definition": "1:18:14", - "all_uses": ["1:17:14", "1:18:14"] + "uses": ["1:17:14", "1:18:14"] }], "variables": [] } diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc index f287b852..d84a6abd 100644 --- a/tests/usage/type_usage_typedef_and_using.cc +++ b/tests/usage/type_usage_typedef_and_using.cc @@ -20,7 +20,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["1:1:8", "*1:2:14", "*1:3:9", "*1:7:13"] + "uses": ["1:1:8", "*1:2:14", "*1:3:9", "*1:7:13"] }, { "id": 1, "usr": "c:@Foo1", @@ -28,7 +28,7 @@ OUTPUT: "qualified_name": "Foo1", "definition": "1:2:7", "alias_of": 0, - "all_uses": ["1:2:7", "*1:4:14", "*1:8:14"] + "uses": ["1:2:7", "*1:4:14", "*1:8:14"] }, { "id": 2, "usr": "c:type_usage_typedef_and_using.cc@T@Foo2", @@ -36,7 +36,7 @@ OUTPUT: "qualified_name": "Foo2", "definition": "1:3:13", "alias_of": 0, - "all_uses": ["1:3:13", "*1:9:14"] + "uses": ["1:3:13", "*1:9:14"] }, { "id": 3, "usr": "c:@Foo3", @@ -44,14 +44,14 @@ OUTPUT: "qualified_name": "Foo3", "definition": "1:4:7", "alias_of": 1, - "all_uses": ["1:4:7", "*1:10:14"] + "uses": ["1:4:7", "*1:10:14"] }, { "id": 4, "usr": "c:@Foo4", "short_name": "Foo4", "qualified_name": "Foo4", "definition": "1:5:7", - "all_uses": ["1:5:7"] + "uses": ["1:5:7"] }], "functions": [{ "id": 0, @@ -59,28 +59,28 @@ OUTPUT: "short_name": "accept", "qualified_name": "accept", "definition": "1:7:6", - "all_uses": ["1:7:6"] + "uses": ["1:7:6"] }, { "id": 1, "usr": "c:@F@accept1#**$@S@Foo#", "short_name": "accept1", "qualified_name": "accept1", "definition": "1:8:6", - "all_uses": ["1:8:6"] + "uses": ["1:8:6"] }, { "id": 2, "usr": "c:@F@accept2#*$@S@Foo#", "short_name": "accept2", "qualified_name": "accept2", "definition": "1:9:6", - "all_uses": ["1:9:6"] + "uses": ["1:9:6"] }, { "id": 3, "usr": "c:@F@accept3#**$@S@Foo#", "short_name": "accept3", "qualified_name": "accept3", "definition": "1:10:6", - "all_uses": ["1:10:6"] + "uses": ["1:10:6"] }], "variables": [] } diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc index 31c27107..22c4fc95 100644 --- a/tests/usage/type_usage_typedef_and_using_template.cc +++ b/tests/usage/type_usage_typedef_and_using_template.cc @@ -10,7 +10,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@ST>1#T@Foo", - "all_uses": ["1:2:8", "*1:4:14", "*1:5:9"] + "uses": ["1:2:8", "*1:4:14", "*1:5:9"] }, { "id": 1, "usr": "c:@Foo1", @@ -18,7 +18,7 @@ OUTPUT: "qualified_name": "Foo1", "definition": "1:4:7", "alias_of": 0, - "all_uses": ["1:4:7", "*1:5:13"] + "uses": ["1:4:7", "*1:5:13"] }, { "id": 2, "usr": "c:type_usage_typedef_and_using_template.cc@T@Foo2", @@ -26,7 +26,7 @@ OUTPUT: "qualified_name": "Foo2", "definition": "1:5:19", "alias_of": 0, - "all_uses": ["1:5:19"] + "uses": ["1:5:19"] }], "functions": [], "variables": [] diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc index 853c1569..c47a5143 100644 --- a/tests/usage/type_usage_various.cc +++ b/tests/usage/type_usage_various.cc @@ -19,7 +19,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "funcs": [0], - "all_uses": ["1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"] + "uses": ["1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"] }], "functions": [{ "id": 0, @@ -29,7 +29,7 @@ OUTPUT: "declaration": "1:2:8", "definition": "1:5:11", "declaring_type": 0, - "all_uses": ["1:2:8", "1:5:11"] + "uses": ["1:2:8", "1:5:11"] }], "variables": [{ "id": 0, @@ -38,7 +38,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:6:7", "variable_type": 0, - "all_uses": ["1:6:7"] + "uses": ["1:6:7"] }, { "id": 1, "usr": "c:@foo", @@ -46,7 +46,7 @@ OUTPUT: "qualified_name": "foo", "declaration": "1:10:12", "variable_type": 0, - "all_uses": ["1:10:12"] + "uses": ["1:10:12"] }] } */ \ No newline at end of file diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc index f68f444c..e41859de 100644 --- a/tests/usage/usage_inside_of_call.cc +++ b/tests/usage/usage_inside_of_call.cc @@ -24,7 +24,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:5:8", "vars": [1, 0], - "all_uses": ["1:5:8", "1:10:5", "1:14:22", "1:14:40"] + "uses": ["1:5:8", "1:10:5", "1:14:22", "1:14:40"] }], "functions": [{ "id": 0, @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "called", "declaration": "1:1:6", "callers": ["2@1:14:3"], - "all_uses": ["1:1:6", "1:14:3"] + "uses": ["1:1:6", "1:14:3"] }, { "id": 1, "usr": "c:@F@gen#", @@ -41,7 +41,7 @@ OUTPUT: "qualified_name": "gen", "declaration": "1:3:5", "callers": ["2@1:14:14"], - "all_uses": ["1:3:5", "1:14:14"] + "uses": ["1:3:5", "1:14:14"] }, { "id": 2, "usr": "c:@F@foo#", @@ -49,7 +49,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:12:6", "callees": ["0@1:14:3", "1@1:14:14"], - "all_uses": ["1:12:6"] + "uses": ["1:12:6"] }], "variables": [{ "id": 0, @@ -59,7 +59,7 @@ OUTPUT: "declaration": "1:6:14", "definition": "1:10:10", "declaring_type": 0, - "all_uses": ["1:6:14", "1:10:10", "1:14:45"] + "uses": ["1:6:14", "1:10:10", "1:14:45"] }, { "id": 1, "usr": "c:@S@Foo@FI@field_var", @@ -67,14 +67,14 @@ OUTPUT: "qualified_name": "Foo::field_var", "definition": "1:7:7", "declaring_type": 0, - "all_uses": ["1:7:7", "1:14:28"] + "uses": ["1:7:7", "1:14:28"] }, { "id": 2, "usr": "c:usage_inside_of_call.cc@145@F@foo#@a", "short_name": "a", "qualified_name": "a", "definition": "1:13:7", - "all_uses": ["1:13:7", "1:14:10"] + "uses": ["1:13:7", "1:14:10"] }] } */ \ No newline at end of file diff --git a/tests/usage/usage_inside_of_call_simple.cc b/tests/usage/usage_inside_of_call_simple.cc index 83f1a97f..4db43b17 100644 --- a/tests/usage/usage_inside_of_call_simple.cc +++ b/tests/usage/usage_inside_of_call_simple.cc @@ -17,7 +17,7 @@ OUTPUT: "qualified_name": "called", "declaration": "1:1:6", "callers": ["2@1:6:3"], - "all_uses": ["1:1:6", "1:6:3"] + "uses": ["1:1:6", "1:6:3"] }, { "id": 1, "usr": "c:@F@gen#", @@ -25,7 +25,7 @@ OUTPUT: "qualified_name": "gen", "definition": "1:3:5", "callers": ["2@1:6:10", "2@1:6:18"], - "all_uses": ["1:3:5", "1:6:10", "1:6:18"] + "uses": ["1:3:5", "1:6:10", "1:6:18"] }, { "id": 2, "usr": "c:@F@foo#", @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:5:6", "callees": ["0@1:6:3", "1@1:6:10", "1@1:6:18"], - "all_uses": ["1:5:6"] + "uses": ["1:5:6"] }], "variables": [] } diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc index d1603b70..bb71b07f 100644 --- a/tests/usage/var_usage_call_function.cc +++ b/tests/usage/var_usage_call_function.cc @@ -18,7 +18,7 @@ OUTPUT: "qualified_name": "called", "definition": "1:1:6", "callers": ["1@1:4:13", "1@1:7:3"], - "all_uses": ["1:1:6", "1:4:13", "1:7:3"] + "uses": ["1:1:6", "1:4:13", "1:7:3"] }, { "id": 1, "usr": "c:@F@caller#", @@ -26,7 +26,7 @@ OUTPUT: "qualified_name": "caller", "definition": "1:3:6", "callees": ["0@1:4:13", "0@1:7:3"], - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [{ "id": 0, @@ -34,7 +34,7 @@ OUTPUT: "short_name": "x", "qualified_name": "x", "definition": "1:4:8", - "all_uses": ["1:4:8", "1:5:3"] + "uses": ["1:4:8", "1:5:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc index d88f0cff..15b308c4 100644 --- a/tests/usage/var_usage_class_member.cc +++ b/tests/usage/var_usage_class_member.cc @@ -27,7 +27,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0, 1], - "all_uses": ["1:1:7", "*1:11:3"] + "uses": ["1:1:7", "*1:11:3"] }], "functions": [{ "id": 0, @@ -36,7 +36,7 @@ OUTPUT: "qualified_name": "accept", "declaration": "1:7:6", "callers": ["2@1:14:3", "2@1:15:3", "2@1:17:3"], - "all_uses": ["1:7:6", "1:14:3", "1:15:3", "1:17:3"] + "uses": ["1:7:6", "1:14:3", "1:15:3", "1:17:3"] }, { "id": 1, "usr": "c:@F@accept#*I#", @@ -44,7 +44,7 @@ OUTPUT: "qualified_name": "accept", "declaration": "1:8:6", "callers": ["2@1:16:3"], - "all_uses": ["1:8:6", "1:16:3"] + "uses": ["1:8:6", "1:16:3"] }, { "id": 2, "usr": "c:@F@foo#", @@ -52,7 +52,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:10:6", "callees": ["0@1:14:3", "0@1:15:3", "1@1:16:3", "0@1:17:3"], - "all_uses": ["1:10:6"] + "uses": ["1:10:6"] }], "variables": [{ "id": 0, @@ -61,7 +61,7 @@ OUTPUT: "qualified_name": "Foo::x", "definition": "1:3:7", "declaring_type": 0, - "all_uses": ["1:3:7", "1:12:5", "1:13:5", "1:14:12", "1:15:12", "1:16:13"] + "uses": ["1:3:7", "1:12:5", "1:13:5", "1:14:12", "1:15:12", "1:16:13"] }, { "id": 1, "usr": "c:@S@Foo@FI@y", @@ -69,7 +69,7 @@ OUTPUT: "qualified_name": "Foo::y", "definition": "1:4:7", "declaring_type": 0, - "all_uses": ["1:4:7", "1:17:12"] + "uses": ["1:4:7", "1:17:12"] }, { "id": 2, "usr": "c:var_usage_class_member.cc@105@F@foo#@f", @@ -77,7 +77,7 @@ OUTPUT: "qualified_name": "f", "definition": "1:11:7", "variable_type": 0, - "all_uses": ["1:11:7", "1:12:3", "1:13:3", "1:14:10", "1:15:10", "1:16:11", "1:17:10"] + "uses": ["1:11:7", "1:12:3", "1:13:3", "1:14:10", "1:15:10", "1:16:11", "1:17:10"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc index 7b81a359..1859ef7b 100644 --- a/tests/usage/var_usage_class_member_static.cc +++ b/tests/usage/var_usage_class_member_static.cc @@ -17,7 +17,7 @@ OUTPUT: "short_name": "Foo", "qualified_name": "Foo", "definition": "1:1:8", - "all_uses": ["1:1:8", "1:8:10"] + "uses": ["1:1:8", "1:8:10"] }], "functions": [{ "id": 0, @@ -26,7 +26,7 @@ OUTPUT: "qualified_name": "accept", "declaration": "1:5:6", "callers": ["1@1:8:3"], - "all_uses": ["1:5:6", "1:8:3"] + "uses": ["1:5:6", "1:8:3"] }, { "id": 1, "usr": "c:@F@foo#", @@ -34,7 +34,7 @@ OUTPUT: "qualified_name": "foo", "definition": "1:7:6", "callees": ["0@1:8:3"], - "all_uses": ["1:7:6"] + "uses": ["1:7:6"] }], "variables": [{ "id": 0, @@ -42,7 +42,7 @@ OUTPUT: "short_name": "x", "qualified_name": "Foo::x", "declaration": "1:2:14", - "all_uses": ["1:2:14", "1:8:15"] + "uses": ["1:2:14", "1:8:15"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc index c24e6fc6..834ac61d 100644 --- a/tests/usage/var_usage_extern.cc +++ b/tests/usage/var_usage_extern.cc @@ -13,7 +13,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:3:6", - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [{ "id": 0, @@ -21,7 +21,7 @@ OUTPUT: "short_name": "a", "qualified_name": "a", "declaration": "1:1:12", - "all_uses": ["1:1:12", "1:4:3"] + "uses": ["1:1:12", "1:4:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc index b0b00659..178f4b2d 100644 --- a/tests/usage/var_usage_func_parameter.cc +++ b/tests/usage/var_usage_func_parameter.cc @@ -11,7 +11,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [{ "id": 0, @@ -19,7 +19,7 @@ OUTPUT: "short_name": "a", "qualified_name": "a", "definition": "1:1:14", - "all_uses": ["1:1:14", "1:2:3"] + "uses": ["1:1:14", "1:2:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc index 1807dcb5..3af6d60c 100644 --- a/tests/usage/var_usage_local.cc +++ b/tests/usage/var_usage_local.cc @@ -12,7 +12,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [{ "id": 0, @@ -20,7 +20,7 @@ OUTPUT: "short_name": "x", "qualified_name": "x", "definition": "1:2:7", - "all_uses": ["1:2:7", "1:3:3"] + "uses": ["1:2:7", "1:3:3"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc index 4796699b..565e954b 100644 --- a/tests/usage/var_usage_shadowed_local.cc +++ b/tests/usage/var_usage_shadowed_local.cc @@ -17,7 +17,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [{ "id": 0, @@ -25,14 +25,14 @@ OUTPUT: "short_name": "a", "qualified_name": "a", "definition": "1:2:7", - "all_uses": ["1:2:7", "1:3:3", "1:8:3"] + "uses": ["1:2:7", "1:3:3", "1:8:3"] }, { "id": 1, "usr": "c:var_usage_shadowed_local.cc@43@F@foo#@a", "short_name": "a", "qualified_name": "a", "definition": "1:5:9", - "all_uses": ["1:5:9", "1:6:5"] + "uses": ["1:5:9", "1:6:5"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc index 8f027e54..4b46355f 100644 --- a/tests/usage/var_usage_shadowed_parameter.cc +++ b/tests/usage/var_usage_shadowed_parameter.cc @@ -17,7 +17,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [{ "id": 0, @@ -25,14 +25,14 @@ OUTPUT: "short_name": "a", "qualified_name": "a", "definition": "1:1:14", - "all_uses": ["1:1:14", "1:2:3", "1:7:3"] + "uses": ["1:1:14", "1:2:3", "1:7:3"] }, { "id": 1, "usr": "c:var_usage_shadowed_parameter.cc@38@F@foo#I#@a", "short_name": "a", "qualified_name": "a", "definition": "1:4:9", - "all_uses": ["1:4:9", "1:5:5"] + "uses": ["1:4:9", "1:5:5"] }] } */ \ No newline at end of file diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc index 2552248a..6ac80aa5 100644 --- a/tests/usage/var_usage_static.cc +++ b/tests/usage/var_usage_static.cc @@ -14,7 +14,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:3:6", - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [{ "id": 0, @@ -22,7 +22,7 @@ OUTPUT: "short_name": "a", "qualified_name": "a", "definition": "1:1:12", - "all_uses": ["1:1:12", "1:4:3"] + "uses": ["1:1:12", "1:4:3"] }] } */ \ No newline at end of file diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc index 63f2abf2..667b0abe 100644 --- a/tests/vars/class_member.cc +++ b/tests/vars/class_member.cc @@ -11,7 +11,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0], - "all_uses": ["1:1:7", "*1:2:3"] + "uses": ["1:1:7", "*1:2:3"] }], "functions": [], "variables": [{ @@ -22,7 +22,7 @@ OUTPUT: "definition": "1:2:8", "variable_type": 0, "declaring_type": 0, - "all_uses": ["1:2:8"] + "uses": ["1:2:8"] }] } */ \ No newline at end of file diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc index a7a3df8a..7f18d142 100644 --- a/tests/vars/class_static_member.cc +++ b/tests/vars/class_static_member.cc @@ -13,7 +13,7 @@ OUTPUT: "qualified_name": "Foo", "definition": "1:1:7", "vars": [0], - "all_uses": ["1:1:7", "*1:2:10", "*1:4:1", "1:4:6"] + "uses": ["1:1:7", "*1:2:10", "*1:4:1", "1:4:6"] }], "functions": [], "variables": [{ @@ -25,7 +25,7 @@ OUTPUT: "definition": "1:4:11", "variable_type": 0, "declaring_type": 0, - "all_uses": ["1:2:15", "1:4:11"] + "uses": ["1:2:15", "1:4:11"] }] } */ \ No newline at end of file diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc index f582277d..8dc177e8 100644 --- a/tests/vars/class_static_member_decl_only.cc +++ b/tests/vars/class_static_member_decl_only.cc @@ -10,7 +10,7 @@ OUTPUT: "short_name": "Foo", "qualified_name": "Foo", "definition": "1:1:7", - "all_uses": ["1:1:7"] + "uses": ["1:1:7"] }], "functions": [], "variables": [{ @@ -19,7 +19,7 @@ OUTPUT: "short_name": "member", "qualified_name": "Foo::member", "declaration": "1:2:14", - "all_uses": ["1:2:14"] + "uses": ["1:2:14"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc index 4585be48..83f513ec 100644 --- a/tests/vars/function_local.cc +++ b/tests/vars/function_local.cc @@ -10,7 +10,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["1:1:8", "*1:4:3"] + "uses": ["1:1:8", "*1:4:3"] }], "functions": [{ "id": 0, @@ -18,7 +18,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:3:6", - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [{ "id": 0, @@ -27,7 +27,7 @@ OUTPUT: "qualified_name": "a", "definition": "1:4:8", "variable_type": 0, - "all_uses": ["1:4:8"] + "uses": ["1:4:8"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc index 8f08dbc9..6e93a379 100644 --- a/tests/vars/function_param.cc +++ b/tests/vars/function_param.cc @@ -8,7 +8,7 @@ OUTPUT: "types": [{ "id": 0, "usr": "c:@S@Foo", - "all_uses": ["1:1:8", "*1:3:10", "*1:3:19"] + "uses": ["1:1:8", "*1:3:10", "*1:3:19"] }], "functions": [{ "id": 0, @@ -16,7 +16,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:3:6", - "all_uses": ["1:3:6"] + "uses": ["1:3:6"] }], "variables": [{ "id": 0, @@ -25,7 +25,7 @@ OUTPUT: "qualified_name": "p0", "definition": "1:3:15", "variable_type": 0, - "all_uses": ["1:3:15"] + "uses": ["1:3:15"] }, { "id": 1, "usr": "c:function_param.cc@33@F@foo#*$@S@Foo#S0_#@p1", @@ -33,7 +33,7 @@ OUTPUT: "qualified_name": "p1", "definition": "1:3:24", "variable_type": 0, - "all_uses": ["1:3:24"] + "uses": ["1:3:24"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_param_unnamed.cc b/tests/vars/function_param_unnamed.cc index 495e8ca1..ae531eb2 100644 --- a/tests/vars/function_param_unnamed.cc +++ b/tests/vars/function_param_unnamed.cc @@ -9,7 +9,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [] } diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc index 264704c5..1ca97ff6 100644 --- a/tests/vars/function_shadow_local.cc +++ b/tests/vars/function_shadow_local.cc @@ -17,7 +17,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [{ "id": 0, @@ -25,14 +25,14 @@ OUTPUT: "short_name": "a", "qualified_name": "a", "definition": "1:2:7", - "all_uses": ["1:2:7", "1:3:3", "1:8:3"] + "uses": ["1:2:7", "1:3:3", "1:8:3"] }, { "id": 1, "usr": "c:function_shadow_local.cc@43@F@foo#@a", "short_name": "a", "qualified_name": "a", "definition": "1:5:9", - "all_uses": ["1:5:9", "1:6:5"] + "uses": ["1:5:9", "1:6:5"] }] } */ \ No newline at end of file diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc index e90b54d5..eb26ed96 100644 --- a/tests/vars/function_shadow_param.cc +++ b/tests/vars/function_shadow_param.cc @@ -11,7 +11,7 @@ OUTPUT: "short_name": "foo", "qualified_name": "foo", "definition": "1:1:6", - "all_uses": ["1:1:6"] + "uses": ["1:1:6"] }], "variables": [{ "id": 0, @@ -19,14 +19,14 @@ OUTPUT: "short_name": "p", "qualified_name": "p", "definition": "1:1:14", - "all_uses": ["1:1:14"] + "uses": ["1:1:14"] }, { "id": 1, "usr": "c:function_shadow_param.cc@21@F@foo#I#@p", "short_name": "p", "qualified_name": "p", "definition": "1:2:7", - "all_uses": ["1:2:7"] + "uses": ["1:2:7"] }] } */ \ No newline at end of file diff --git a/tests/vars/global_variable.cc b/tests/vars/global_variable.cc index 404f5abf..00128c53 100644 --- a/tests/vars/global_variable.cc +++ b/tests/vars/global_variable.cc @@ -10,7 +10,7 @@ OUTPUT: "short_name": "global", "qualified_name": "global", "definition": "1:1:12", - "all_uses": ["1:1:12"] + "uses": ["1:1:12"] }] } */ \ No newline at end of file diff --git a/tests/vars/global_variable_decl_only.cc b/tests/vars/global_variable_decl_only.cc index 896d56d4..6762769e 100644 --- a/tests/vars/global_variable_decl_only.cc +++ b/tests/vars/global_variable_decl_only.cc @@ -10,7 +10,7 @@ OUTPUT: "short_name": "global", "qualified_name": "global", "declaration": "1:1:12", - "all_uses": ["1:1:12"] + "uses": ["1:1:12"] }] } */ \ No newline at end of file