more tests updates

This commit is contained in:
Jacob Dufault 2017-03-07 16:21:23 -08:00
parent 94b344dbe3
commit 6519dc1b8d
53 changed files with 144 additions and 189 deletions

View File

@ -20,8 +20,6 @@ OUTPUT:
"definition": "1:2:7",
"parents": [0],
"uses": ["*1:2:7"]
}],
"functions": [],
"variables": []
}]
}
*/

View File

@ -57,8 +57,6 @@ OUTPUT:
"definition": "1:13:7",
"parents": [0, 1, 2, 3],
"uses": ["*1:13:7", "*1:13:33", "*1:13:65"]
}],
"functions": [],
"variables": []
}]
}
*/

View File

@ -40,8 +40,6 @@ OUTPUT:
"definition": "1:4:7",
"parents": [1, 2],
"uses": ["*1:4:7"]
}],
"functions": [],
"variables": []
}]
}
*/

View File

@ -27,7 +27,7 @@ OUTPUT:
"funcs": [1],
"uses": ["*1:4:7"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@S@Root@F@foo#",
"short_name": "foo",
@ -45,7 +45,6 @@ OUTPUT:
"declaring_type": 1,
"base": 0,
"uses": ["1:5:8"]
}],
"variables": []
}]
}
*/

View File

@ -14,7 +14,7 @@ OUTPUT:
"funcs": [0],
"uses": ["*1:1:7"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@S@IFoo@F@foo#",
"short_name": "foo",
@ -22,7 +22,6 @@ OUTPUT:
"definition": "1:2:16",
"declaring_type": 0,
"uses": ["1:2:16"]
}],
"variables": []
}]
}
*/

View File

@ -23,8 +23,7 @@ OUTPUT:
"vars": [0, 1, 2],
"uses": ["*1:2:3"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@U@vector3@Sa@FI@x",
"short_name": "x",

View File

@ -15,8 +15,7 @@ OUTPUT:
"vars": [0, 1],
"uses": ["*1:1:7"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@U@Foo@FI@a",
"short_name": "a",

View File

@ -21,7 +21,7 @@ OUTPUT:
"vars": [0, 1],
"uses": ["*1:1:7", "*1:6:1", "*1:8:10"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@act#*$@U@Foo#",
"short_name": "act",
@ -29,7 +29,7 @@ OUTPUT:
"definition": "1:8:6",
"uses": ["1:8:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@U@Foo@FI@a",
"short_name": "a",

View File

@ -10,8 +10,7 @@ void user() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@consume#*v#",
"short_name": "consume",
@ -36,7 +35,7 @@ OUTPUT:
"callees": ["1@1:6:13", "0@1:7:3", "1@1:7:12"],
"uses": ["1:5:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:func_usage_addr_func.cc@61@F@user#@x",
"short_name": "x",

View File

@ -19,7 +19,7 @@ OUTPUT:
"funcs": [0],
"uses": ["*1:1:8", "1:6:13"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@S@Foo@F@Used#",
"short_name": "Used",
@ -37,7 +37,7 @@ OUTPUT:
"callees": ["0@1:6:18"],
"uses": ["1:5:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:func_usage_addr_method.cc@53@F@user#@x",
"short_name": "x",

View File

@ -6,8 +6,7 @@ void caller() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@called#",
"short_name": "called",
@ -23,7 +22,6 @@ OUTPUT:
"definition": "1:2:6",
"callees": ["0@1:3:3"],
"uses": ["1:2:6"]
}],
"variables": []
}]
}
*/

View File

@ -19,7 +19,7 @@ OUTPUT:
"funcs": [0],
"uses": ["*1:1:8", "*1:6:3"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@S@Foo@F@Used#",
"short_name": "Used",
@ -37,7 +37,7 @@ OUTPUT:
"callees": ["0@1:7:6"],
"uses": ["1:5:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:func_usage_call_method.cc@53@F@user#@f",
"short_name": "f",

View File

@ -18,7 +18,7 @@ OUTPUT:
"vars": [0],
"uses": ["*1:5:7"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:func_usage_class_inline_var_def.cc@F@helper#",
"short_name": "helper",
@ -26,7 +26,7 @@ OUTPUT:
"definition": "1:1:12",
"uses": ["1:1:12", "1:6:11"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@FI@x",
"short_name": "x",

View File

@ -7,7 +7,7 @@ void usage() {
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -23,7 +23,6 @@ OUTPUT:
"definition": "1:3:6",
"callees": ["0@1:4:3"],
"uses": ["1:3:6"]
}],
"variables": []
}]
}
*/

View File

@ -18,7 +18,7 @@ OUTPUT:
"funcs": [0],
"uses": ["*1:1:8", "*1:6:3"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@S@Foo@F@foo#",
"short_name": "foo",
@ -36,7 +36,7 @@ OUTPUT:
"callees": ["0@1:7:6"],
"uses": ["1:5:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:func_usage_forward_decl_method.cc@53@F@usage#@f",
"short_name": "f",

View File

@ -9,8 +9,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@FT@>1#Taccept#t0.0#v#",
"short_name": "accept",
@ -26,7 +25,6 @@ OUTPUT:
"definition": "1:4:6",
"callees": ["0@1:5:3", "0@1:6:3"],
"uses": ["1:4:6"]
}],
"variables": []
}]
}
*/

View File

@ -25,7 +25,7 @@ OUTPUT:
"definition": "1:4:8",
"uses": ["*1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@return_type#",
"short_name": "return_type",
@ -33,7 +33,7 @@ OUTPUT:
"definition": "1:9:16",
"uses": ["1:9:16"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_as_template_parameter.cc@f0",
"short_name": "f0",

View File

@ -102,7 +102,7 @@ OUTPUT:
"funcs": [3],
"uses": ["*1:64:7", "1:79:21"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@as_return_type#*$@S@unique_ptr>#$@S@S1#$@S@S2#",
"short_name": "as_return_type",
@ -133,7 +133,7 @@ OUTPUT:
"declaring_type": 3,
"uses": ["1:65:23", "1:79:26"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@f",
"short_name": "f",

View File

@ -20,8 +20,7 @@ OUTPUT:
"usr": "c:@S@S",
"uses": ["1:4:8", "*1:6:19"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_as_template_parameter_simple.cc@foo",
"short_name": "foo",

View File

@ -12,8 +12,7 @@ OUTPUT:
"definition": "1:1:8",
"uses": ["*1:1:8", "*1:3:8"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@t",
"short_name": "t",

View File

@ -29,8 +29,7 @@ OUTPUT:
"vars": [0, 1],
"uses": ["*1:4:8"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@FI@a",
"short_name": "a",

View File

@ -21,7 +21,7 @@ OUTPUT:
"definition": "1:2:8",
"uses": ["*1:2:8", "*1:6:3"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@Foo#",
"short_name": "Foo",
@ -29,7 +29,7 @@ OUTPUT:
"definition": "1:4:6",
"uses": ["1:4:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_declare_local.cc@67@F@Foo#@a",
"short_name": "a",

View File

@ -18,7 +18,7 @@ OUTPUT:
"definition": "1:2:8",
"uses": ["*1:2:8", "*1:4:26"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#",
"short_name": "foo",
@ -26,7 +26,7 @@ OUTPUT:
"definition": "1:4:6",
"uses": ["1:4:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_declare_param.cc@60@F@foo#*$@S@ForwardType#$@S@ImplementedType#@f",
"short_name": "f",

View File

@ -16,7 +16,7 @@ OUTPUT:
"usr": "c:@S@Foo",
"uses": ["1:1:8", "1:3:10", "1:3:18", "*1:4:10", "*1:4:18"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#*$@S@Foo#S0_#",
"short_name": "foo",
@ -25,7 +25,7 @@ OUTPUT:
"definition": "1:4:6",
"uses": ["1:3:6", "1:4:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_declare_param_prototype.cc@49@F@foo#*$@S@Foo#S0_#@f",
"short_name": "f",

View File

@ -8,14 +8,13 @@ OUTPUT:
"usr": "c:@S@ForwardType",
"uses": ["1:1:8", "*1:2:10"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#*$@S@ForwardType#",
"short_name": "foo",
"qualified_name": "foo",
"definition": "1:2:6",
"uses": ["1:2:6"]
}],
"variables": []
}]
}
*/

View File

@ -17,7 +17,7 @@ OUTPUT:
"definition": "1:1:8",
"uses": ["*1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#&$@S@Type#&1S1_#",
"short_name": "foo",
@ -25,7 +25,7 @@ OUTPUT:
"definition": "1:3:6",
"uses": ["1:3:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_declare_qualifiers.cc@28@F@foo#&$@S@Type#&1S1_#@a0",
"short_name": "a0",

View File

@ -8,8 +8,7 @@ OUTPUT:
"usr": "c:@S@Type",
"uses": ["1:1:8", "*1:2:8"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_declare_static.cc@t",
"short_name": "t",

View File

@ -33,7 +33,7 @@ OUTPUT:
"funcs": [1, 2],
"uses": ["*1:7:7", "1:12:7", "1:13:6"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -74,7 +74,6 @@ OUTPUT:
"declarations": ["1:17:14"],
"definition": "1:18:14",
"uses": ["1:17:14", "1:18:14"]
}],
"variables": []
}]
}
*/

View File

@ -49,7 +49,7 @@ OUTPUT:
"definition": "1:5:7",
"uses": ["*1:5:7"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@accept#*$@S@Foo#",
"short_name": "accept",
@ -77,7 +77,6 @@ OUTPUT:
"qualified_name": "accept3",
"definition": "1:10:6",
"uses": ["1:10:6"]
}],
"variables": []
}]
}
*/

View File

@ -27,8 +27,6 @@ OUTPUT:
"definition": "1:5:19",
"alias_of": 0,
"uses": ["*1:5:19"]
}],
"functions": [],
"variables": []
}]
}
*/

View File

@ -21,7 +21,7 @@ OUTPUT:
"funcs": [0],
"uses": ["*1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@S@Foo@F@make#",
"short_name": "make",
@ -31,7 +31,7 @@ OUTPUT:
"declaring_type": 0,
"uses": ["1:2:8", "1:5:11"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:type_usage_various.cc@58@S@Foo@F@make#@f",
"short_name": "f",

View File

@ -26,7 +26,7 @@ OUTPUT:
"vars": [1, 0],
"uses": ["*1:5:8", "1:10:5", "1:14:22", "1:14:40"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@called#I#",
"short_name": "called",
@ -51,7 +51,7 @@ OUTPUT:
"callees": ["0@1:14:3", "1@1:14:14"],
"uses": ["1:12:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@static_var",
"short_name": "static_var",

View File

@ -9,8 +9,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@called#I#",
"short_name": "called",
@ -34,7 +33,6 @@ OUTPUT:
"definition": "1:5:6",
"callees": ["0@1:6:3", "1@1:6:10", "1@1:6:18"],
"uses": ["1:5:6"]
}],
"variables": []
}]
}
*/

View File

@ -11,7 +11,7 @@ void caller() {
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@called#",
"short_name": "called",
@ -28,7 +28,7 @@ OUTPUT:
"callees": ["0@1:4:13", "0@1:7:3"],
"uses": ["1:3:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:var_usage_call_function.cc@39@F@caller#@x",
"short_name": "x",

View File

@ -29,7 +29,7 @@ OUTPUT:
"vars": [0, 1],
"uses": ["*1:1:7", "*1:11:3"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@accept#I#",
"short_name": "accept",
@ -54,7 +54,7 @@ OUTPUT:
"callees": ["0@1:14:3", "0@1:15:3", "1@1:16:3", "0@1:17:3"],
"uses": ["1:10:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@FI@x",
"short_name": "x",

View File

@ -19,7 +19,7 @@ OUTPUT:
"definition": "1:1:8",
"uses": ["*1:1:8", "1:8:10"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@accept#I#",
"short_name": "accept",
@ -36,7 +36,7 @@ OUTPUT:
"callees": ["0@1:8:3"],
"uses": ["1:7:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@x",
"short_name": "x",

View File

@ -26,8 +26,7 @@ OUTPUT:
"vars": [0],
"uses": ["*1:3:8", "1:7:15"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Holder@static_var",
"short_name": "static_var",

View File

@ -6,8 +6,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -15,7 +14,7 @@ OUTPUT:
"definition": "1:3:6",
"uses": ["1:3:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@a",
"short_name": "a",

View File

@ -4,8 +4,7 @@ void foo(int a) {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#I#",
"short_name": "foo",
@ -13,7 +12,7 @@ OUTPUT:
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:var_usage_func_parameter.cc@9@F@foo#I#@a",
"short_name": "a",

View File

@ -5,8 +5,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -14,7 +13,7 @@ OUTPUT:
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:var_usage_local.cc@16@F@foo#@x",
"short_name": "x",

View File

@ -10,8 +10,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -19,7 +18,7 @@ OUTPUT:
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:var_usage_shadowed_local.cc@16@F@foo#@a",
"short_name": "a",

View File

@ -10,8 +10,7 @@ void foo(int a) {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#I#",
"short_name": "foo",
@ -19,7 +18,7 @@ OUTPUT:
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:var_usage_shadowed_parameter.cc@9@F@foo#I#@a",
"short_name": "a",

View File

@ -7,8 +7,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -16,7 +15,7 @@ OUTPUT:
"definition": "1:3:6",
"uses": ["1:3:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:var_usage_static.cc@a",
"short_name": "a",

View File

@ -13,8 +13,7 @@ OUTPUT:
"vars": [0],
"uses": ["*1:1:7", "*1:2:3"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@FI@member",
"short_name": "member",

View File

@ -15,8 +15,7 @@ OUTPUT:
"vars": [0],
"uses": ["*1:1:7", "*1:2:10", "*1:4:1", "1:4:6"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@member",
"short_name": "member",

View File

@ -12,8 +12,7 @@ OUTPUT:
"definition": "1:1:7",
"uses": ["*1:1:7"]
}],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@S@Foo@member",
"short_name": "member",

View File

@ -12,7 +12,7 @@ OUTPUT:
"usr": "c:@S@Foo",
"uses": ["1:1:8", "*1:4:3"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -20,7 +20,7 @@ OUTPUT:
"definition": "1:3:6",
"uses": ["1:3:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:function_local.cc@31@F@foo#@a",
"short_name": "a",

View File

@ -10,7 +10,7 @@ OUTPUT:
"usr": "c:@S@Foo",
"uses": ["1:1:8", "*1:3:10", "*1:3:19"]
}],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#*$@S@Foo#S0_#",
"short_name": "foo",
@ -18,7 +18,7 @@ OUTPUT:
"definition": "1:3:6",
"uses": ["1:3:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:function_param.cc@24@F@foo#*$@S@Foo#S0_#@p0",
"short_name": "p0",

View File

@ -2,15 +2,13 @@ void foo(int, int) {}
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#I#I#",
"short_name": "foo",
"qualified_name": "foo",
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": []
}]
}
*/

View File

@ -10,8 +10,7 @@ void foo() {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#",
"short_name": "foo",
@ -19,7 +18,7 @@ OUTPUT:
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:function_shadow_local.cc@16@F@foo#@a",
"short_name": "a",

View File

@ -4,8 +4,7 @@ void foo(int p) {
/*
OUTPUT:
{
"types": [],
"functions": [{
"funcs": [{
"id": 0,
"usr": "c:@F@foo#I#",
"short_name": "foo",
@ -13,7 +12,7 @@ OUTPUT:
"definition": "1:1:6",
"uses": ["1:1:6"]
}],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:function_shadow_param.cc@9@F@foo#I#@p",
"short_name": "p",

View File

@ -2,9 +2,7 @@ static int global = 0;
/*
OUTPUT:
{
"types": [],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:global_variable.cc@global",
"short_name": "global",

View File

@ -2,9 +2,7 @@ extern int global;
/*
OUTPUT:
{
"types": [],
"functions": [],
"variables": [{
"vars": [{
"id": 0,
"usr": "c:@global",
"short_name": "global",