Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 15:45:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename serialized output, update tests.

Browse Source
This commit is contained in:
Jacob Dufault 2017-04-21 00:04:56 -07:00
parent bb25640d91
commit 89e6b3cd43
31 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/serializer.cc
View File

@ -136,7 +136,7 @@ void Reflect(TVisitor& visitor, IndexedTypeDef& value) {
REFLECT_MEMBER2("types", value.def.types); REFLECT_MEMBER2("types", value.def.types);
REFLECT_MEMBER2("funcs", value.def.funcs); REFLECT_MEMBER2("funcs", value.def.funcs);
REFLECT_MEMBER2("vars", value.def.vars); REFLECT_MEMBER2("vars", value.def.vars);
REFLECT_MEMBER2("instantiations", value.instances); REFLECT_MEMBER2("instances", value.instances);
REFLECT_MEMBER2("uses", value.uses); REFLECT_MEMBER2("uses", value.uses);
REFLECT_MEMBER_END(); REFLECT_MEMBER_END();
} }

2
tests/constructors/constructor.cc
View File

@ -19,7 +19,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-4:2", "definition_extent": "1:1-4:2",
"funcs": [0], "funcs": [0],
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["1:7-1:10", "3:3-3:6", "7:3-7:6", "8:3-8:6", "8:17-8:20"] "uses": ["1:7-1:10", "3:3-3:6", "7:3-7:6", "8:3-8:6", "8:17-8:20"]
}], }],
"funcs": [{ "funcs": [{

2
tests/constructors/destructor.cc
View File

@ -24,7 +24,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-5:2", "definition_extent": "1:1-5:2",
"funcs": [0, 1], "funcs": [0, 1],
"instantiations": [0], "instances": [0],
"uses": ["1:7-1:10", "3:3-3:6", "4:3-4:7", "8:3-8:6"] "uses": ["1:7-1:10", "3:3-3:6", "4:3-4:7", "8:3-8:6"]
}], }],
"funcs": [{ "funcs": [{

2
tests/enums/enum_usage.cc
View File

@ -16,7 +16,7 @@ OUTPUT:
"definition_spelling": "1:12-1:15", "definition_spelling": "1:12-1:15",
"definition_extent": "1:1-4:2", "definition_extent": "1:1-4:2",
"vars": [0, 1], "vars": [0, 1],
"instantiations": [2], "instances": [2],
"uses": ["1:12-1:15", "6:1-6:4", "6:9-6:12"] "uses": ["1:12-1:15", "6:1-6:4", "6:9-6:12"]
}], }],
"vars": [{ "vars": [{

4
tests/foobar.cc
View File

@ -34,7 +34,7 @@ OUTPUT:
"detailed_name": "Foo", "detailed_name": "Foo",
"definition_spelling": "5:8-5:11", "definition_spelling": "5:8-5:11",
"definition_extent": "5:1-7:2", "definition_extent": "5:1-7:2",
"instantiations": [1], "instances": [1],
"uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"] "uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"]
}, { }, {
"id": 3, "id": 3,
@ -43,7 +43,7 @@ OUTPUT:
"detailed_name": "Foo::Inner", "detailed_name": "Foo::Inner",
"definition_spelling": "6:10-6:15", "definition_spelling": "6:10-6:15",
"definition_extent": "6:3-6:18", "definition_extent": "6:3-6:18",
"instantiations": [0], "instances": [0],
"uses": ["6:10-6:15", "9:9-9:14"] "uses": ["6:10-6:15", "9:9-9:14"]
}], }],
"vars": [{ "vars": [{

2
tests/outline/outline.cc
View File

@ -22,7 +22,7 @@ OUTPUT:
}, { }, {
"id": 1, "id": 1,
"usr": "c:@N@std@ST>2#T#T@vector", "usr": "c:@N@std@ST>2#T#T@vector",
"instantiations": [2], "instances": [2],
"uses": ["6:8-6:14"] "uses": ["6:8-6:14"]
}], }],
"vars": [{ "vars": [{

4
tests/outline/outline2.cc
View File

@ -27,12 +27,12 @@ OUTPUT:
}, { }, {
"id": 1, "id": 1,
"usr": "c:@N@std@T@string", "usr": "c:@N@std@T@string",
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["7:8-7:14", "8:8-8:14", "9:20-9:26"] "uses": ["7:8-7:14", "8:8-8:14", "9:20-9:26"]
}, { }, {
"id": 2, "id": 2,
"usr": "c:@N@std@ST>2#T#T@vector", "usr": "c:@N@std@ST>2#T#T@vector",
"instantiations": [2], "instances": [2],
"uses": ["9:8-9:14", "12:6-12:12"] "uses": ["9:8-9:14", "12:6-12:12"]
}], }],
"funcs": [{ "funcs": [{

2
tests/templates/implicit_variable_instantiation.cc
View File

@ -24,7 +24,7 @@ OUTPUT:
"detailed_name": "ns::VarType", "detailed_name": "ns::VarType",
"definition_spelling": "2:8-2:15", "definition_spelling": "2:8-2:15",
"definition_extent": "2:3-2:18", "definition_extent": "2:3-2:18",
"instantiations": [0], "instances": [0],
"uses": ["2:8-2:15", "6:22-6:29", "6:44-6:51", "10:18-10:25"] "uses": ["2:8-2:15", "6:22-6:29", "6:44-6:51", "10:18-10:25"]
}, { }, {
"id": 1, "id": 1,

2
tests/templates/namespace_template_type_usage_folded_into_one.cc
View File

@ -16,7 +16,7 @@ OUTPUT:
"detailed_name": "ns::Foo", "detailed_name": "ns::Foo",
"definition_spelling": "3:9-3:12", "definition_spelling": "3:9-3:12",
"definition_extent": "3:3-3:15", "definition_extent": "3:3-3:15",
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["3:9-3:12", "5:3-5:6", "6:3-6:6"] "uses": ["3:9-3:12", "5:3-5:6", "6:3-6:6"]
}], }],
"vars": [{ "vars": [{

2
tests/templates/template_class_type_usage_folded_into_one.cc
View File

@ -61,7 +61,7 @@ OUTPUT:
"detailed_name": "Foo::Inner", "detailed_name": "Foo::Inner",
"definition_spelling": "6:10-6:15", "definition_spelling": "6:10-6:15",
"definition_extent": "6:3-6:18", "definition_extent": "6:3-6:18",
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["6:10-6:15", "9:9-9:14", "10:9-10:14"] "uses": ["6:10-6:15", "9:9-9:14", "10:9-10:14"]
}], }],
"vars": [{ "vars": [{

2
tests/templates/template_type_usage_folded_into_one.cc
View File

@ -14,7 +14,7 @@ OUTPUT:
"detailed_name": "Foo", "detailed_name": "Foo",
"definition_spelling": "2:7-2:10", "definition_spelling": "2:7-2:10",
"definition_extent": "2:1-2:13", "definition_extent": "2:1-2:13",
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["2:7-2:10", "4:1-4:4", "5:1-5:4"] "uses": ["2:7-2:10", "4:1-4:4", "5:1-5:4"]
}], }],
"vars": [{ "vars": [{

2
tests/unions/union_usage.cc
View File

@ -22,7 +22,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-4:2", "definition_extent": "1:1-4:2",
"vars": [0, 1], "vars": [0, 1],
"instantiations": [2], "instances": [2],
"uses": ["1:7-1:10", "6:1-6:4", "8:10-8:13"] "uses": ["1:7-1:10", "6:1-6:4", "8:10-8:13"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/func_usage_call_method.cc
View File

@ -18,7 +18,7 @@ OUTPUT:
"definition_spelling": "1:8-1:11", "definition_spelling": "1:8-1:11",
"definition_extent": "1:1-3:2", "definition_extent": "1:1-3:2",
"funcs": [0], "funcs": [0],
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:11", "6:3-6:6"] "uses": ["1:8-1:11", "6:3-6:6"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/func_usage_forward_decl_method.cc
View File

@ -17,7 +17,7 @@ OUTPUT:
"definition_spelling": "1:8-1:11", "definition_spelling": "1:8-1:11",
"definition_extent": "1:1-3:2", "definition_extent": "1:1-3:2",
"funcs": [0], "funcs": [0],
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:11", "6:3-6:6"] "uses": ["1:8-1:11", "6:3-6:6"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/type_usage_as_template_parameter.cc
View File

@ -16,7 +16,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@ST>1#T@unique_ptr", "usr": "c:@ST>1#T@unique_ptr",
"instantiations": [0, 1, 2], "instances": [0, 1, 2],
"uses": ["2:7-2:17", "6:8-6:18", "7:8-7:18", "9:1-9:11", "10:3-10:13"] "uses": ["2:7-2:17", "6:8-6:18", "7:8-7:18", "9:1-9:11", "10:3-10:13"]
}, { }, {
"id": 1, "id": 1,

2
tests/usage/type_usage_as_template_parameter_complex.cc
View File

@ -84,7 +84,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@ST>2#T#T@unique_ptr", "usr": "c:@ST>2#T#T@unique_ptr",
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["2:7-2:17", "15:8-15:18", "15:19-15:29", "33:1-33:11", "33:12-33:22", "33:52-33:62", "54:3-54:13", "54:14-54:24", "65:3-65:13", "79:1-79:11"] "uses": ["2:7-2:17", "15:8-15:18", "15:19-15:29", "33:1-33:11", "33:12-33:22", "33:52-33:62", "54:3-54:13", "54:14-54:24", "65:3-65:13", "79:1-79:11"]
}, { }, {
"id": 1, "id": 1,

2
tests/usage/type_usage_as_template_parameter_simple.cc
View File

@ -15,7 +15,7 @@ OUTPUT:
"detailed_name": "unique_ptr", "detailed_name": "unique_ptr",
"definition_spelling": "2:7-2:17", "definition_spelling": "2:7-2:17",
"definition_extent": "2:1-2:20", "definition_extent": "2:1-2:20",
"instantiations": [0], "instances": [0],
"uses": ["2:7-2:17", "6:8-6:18"] "uses": ["2:7-2:17", "6:8-6:18"]
}, { }, {
"id": 1, "id": 1,

2
tests/usage/type_usage_declare_extern.cc
View File

@ -11,7 +11,7 @@ OUTPUT:
"detailed_name": "T", "detailed_name": "T",
"definition_spelling": "1:8-1:9", "definition_spelling": "1:8-1:9",
"definition_extent": "1:1-1:12", "definition_extent": "1:1-1:12",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:9", "3:8-3:9"] "uses": ["1:8-1:9", "3:8-3:9"]
}], }],
"vars": [{ "vars": [{

4
tests/usage/type_usage_declare_field.cc
View File

@ -12,7 +12,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@ForwardType", "usr": "c:@S@ForwardType",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:19", "5:3-5:14"] "uses": ["1:8-1:19", "5:3-5:14"]
}, { }, {
"id": 1, "id": 1,
@ -21,7 +21,7 @@ OUTPUT:
"detailed_name": "ImplementedType", "detailed_name": "ImplementedType",
"definition_spelling": "2:8-2:23", "definition_spelling": "2:8-2:23",
"definition_extent": "2:1-2:26", "definition_extent": "2:1-2:26",
"instantiations": [1], "instances": [1],
"uses": ["2:8-2:23", "6:3-6:18"] "uses": ["2:8-2:23", "6:3-6:18"]
}, { }, {
"id": 2, "id": 2,

4
tests/usage/type_usage_declare_local.cc
View File

@ -12,7 +12,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@ForwardType", "usr": "c:@S@ForwardType",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:19", "5:3-5:14"] "uses": ["1:8-1:19", "5:3-5:14"]
}, { }, {
"id": 1, "id": 1,
@ -21,7 +21,7 @@ OUTPUT:
"detailed_name": "ImplementedType", "detailed_name": "ImplementedType",
"definition_spelling": "2:8-2:23", "definition_spelling": "2:8-2:23",
"definition_extent": "2:1-2:26", "definition_extent": "2:1-2:26",
"instantiations": [1], "instances": [1],
"uses": ["2:8-2:23", "6:3-6:18"] "uses": ["2:8-2:23", "6:3-6:18"]
}], }],
"funcs": [{ "funcs": [{

4
tests/usage/type_usage_declare_param.cc
View File

@ -9,7 +9,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@ForwardType", "usr": "c:@S@ForwardType",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:19", "4:10-4:21"] "uses": ["1:8-1:19", "4:10-4:21"]
}, { }, {
"id": 1, "id": 1,
@ -18,7 +18,7 @@ OUTPUT:
"detailed_name": "ImplementedType", "detailed_name": "ImplementedType",
"definition_spelling": "2:8-2:23", "definition_spelling": "2:8-2:23",
"definition_extent": "2:1-2:26", "definition_extent": "2:1-2:26",
"instantiations": [1], "instances": [1],
"uses": ["2:8-2:23", "4:26-4:41"] "uses": ["2:8-2:23", "4:26-4:41"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/type_usage_declare_param_prototype.cc
View File

@ -14,7 +14,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@Foo", "usr": "c:@S@Foo",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:11", "3:10-3:13", "3:18-3:21", "4:10-4:13", "4:18-4:21"] "uses": ["1:8-1:11", "3:10-3:13", "3:18-3:21", "4:10-4:13", "4:18-4:21"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/type_usage_declare_qualifiers.cc
View File

@ -16,7 +16,7 @@ OUTPUT:
"detailed_name": "Type", "detailed_name": "Type",
"definition_spelling": "1:8-1:12", "definition_spelling": "1:8-1:12",
"definition_extent": "1:1-1:15", "definition_extent": "1:1-1:15",
"instantiations": [0, 1, 2, 3, 4, 5], "instances": [0, 1, 2, 3, 4, 5],
"uses": ["1:8-1:12", "3:10-3:14", "3:26-3:30", "4:3-4:7", "5:3-5:7", "6:9-6:13", "7:9-7:13"] "uses": ["1:8-1:12", "3:10-3:14", "3:26-3:30", "4:3-4:7", "5:3-5:7", "6:9-6:13", "7:9-7:13"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/type_usage_declare_static.cc
View File

@ -6,7 +6,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@Type", "usr": "c:@S@Type",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:12", "2:8-2:12"] "uses": ["1:8-1:12", "2:8-2:12"]
}], }],
"vars": [{ "vars": [{

2
tests/usage/type_usage_various.cc
View File

@ -20,7 +20,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-3:2", "definition_extent": "1:1-3:2",
"funcs": [0], "funcs": [0],
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["1:7-1:10", "2:3-2:6", "5:1-5:4", "5:6-5:9", "6:3-6:6", "10:8-10:11"] "uses": ["1:7-1:10", "2:3-2:6", "5:1-5:4", "5:6-5:9", "6:3-6:6", "10:8-10:11"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/var_usage_class_member.cc
View File

@ -28,7 +28,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-5:2", "definition_extent": "1:1-5:2",
"vars": [0, 1], "vars": [0, 1],
"instantiations": [2], "instances": [2],
"uses": ["1:7-1:10", "11:3-11:6"] "uses": ["1:7-1:10", "11:3-11:6"]
}], }],
"funcs": [{ "funcs": [{

2
tests/usage/var_usage_cstyle_cast.cc
View File

@ -17,7 +17,7 @@ OUTPUT:
"detailed_name": "VarType", "detailed_name": "VarType",
"definition_spelling": "1:6-1:13", "definition_spelling": "1:6-1:13",
"definition_extent": "1:1-1:16", "definition_extent": "1:1-1:16",
"instantiations": [0], "instances": [0],
"uses": ["1:6-1:13", "4:20-4:27", "4:42-4:49", "7:7-7:14"] "uses": ["1:6-1:13", "4:20-4:27", "4:42-4:49", "7:7-7:14"]
}, { }, {
"id": 1, "id": 1,

2
tests/vars/class_member.cc
View File

@ -12,7 +12,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-3:2", "definition_extent": "1:1-3:2",
"vars": [0], "vars": [0],
"instantiations": [0], "instances": [0],
"uses": ["1:7-1:10", "2:3-2:6"] "uses": ["1:7-1:10", "2:3-2:6"]
}], }],
"vars": [{ "vars": [{

2
tests/vars/class_static_member.cc
View File

@ -14,7 +14,7 @@ OUTPUT:
"definition_spelling": "1:7-1:10", "definition_spelling": "1:7-1:10",
"definition_extent": "1:1-3:2", "definition_extent": "1:1-3:2",
"vars": [0], "vars": [0],
"instantiations": [0], "instances": [0],
"uses": ["1:7-1:10", "2:10-2:13", "4:1-4:4", "4:6-4:9"] "uses": ["1:7-1:10", "2:10-2:13", "4:1-4:4", "4:6-4:9"]
}], }],
"vars": [{ "vars": [{

2
tests/vars/function_local.cc
View File

@ -10,7 +10,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@Foo", "usr": "c:@S@Foo",
"instantiations": [0], "instances": [0],
"uses": ["1:8-1:11", "4:3-4:6"] "uses": ["1:8-1:11", "4:3-4:6"]
}], }],
"funcs": [{ "funcs": [{

2
tests/vars/function_param.cc
View File

@ -8,7 +8,7 @@ OUTPUT:
"types": [{ "types": [{
"id": 0, "id": 0,
"usr": "c:@S@Foo", "usr": "c:@S@Foo",
"instantiations": [0, 1], "instances": [0, 1],
"uses": ["1:8-1:11", "3:10-3:13", "3:19-3:22"] "uses": ["1:8-1:11", "3:10-3:13", "3:19-3:22"]
}], }],
"funcs": [{ "funcs": [{