From 89e6b3cd43bb654074a34cc7907aac7a782aee39 Mon Sep 17 00:00:00 2001
From: Jacob Dufault <jacobdufault@gmail.com>
Date: Fri, 21 Apr 2017 00:04:56 -0700
Subject: [PATCH] Rename serialized output, update tests.

---
 src/serializer.cc                                             | 2 +-
 tests/constructors/constructor.cc                             | 2 +-
 tests/constructors/destructor.cc                              | 2 +-
 tests/enums/enum_usage.cc                                     | 2 +-
 tests/foobar.cc                                               | 4 ++--
 tests/outline/outline.cc                                      | 2 +-
 tests/outline/outline2.cc                                     | 4 ++--
 tests/templates/implicit_variable_instantiation.cc            | 2 +-
 .../namespace_template_type_usage_folded_into_one.cc          | 2 +-
 tests/templates/template_class_type_usage_folded_into_one.cc  | 2 +-
 tests/templates/template_type_usage_folded_into_one.cc        | 2 +-
 tests/unions/union_usage.cc                                   | 2 +-
 tests/usage/func_usage_call_method.cc                         | 2 +-
 tests/usage/func_usage_forward_decl_method.cc                 | 2 +-
 tests/usage/type_usage_as_template_parameter.cc               | 2 +-
 tests/usage/type_usage_as_template_parameter_complex.cc       | 2 +-
 tests/usage/type_usage_as_template_parameter_simple.cc        | 2 +-
 tests/usage/type_usage_declare_extern.cc                      | 2 +-
 tests/usage/type_usage_declare_field.cc                       | 4 ++--
 tests/usage/type_usage_declare_local.cc                       | 4 ++--
 tests/usage/type_usage_declare_param.cc                       | 4 ++--
 tests/usage/type_usage_declare_param_prototype.cc             | 2 +-
 tests/usage/type_usage_declare_qualifiers.cc                  | 2 +-
 tests/usage/type_usage_declare_static.cc                      | 2 +-
 tests/usage/type_usage_various.cc                             | 2 +-
 tests/usage/var_usage_class_member.cc                         | 2 +-
 tests/usage/var_usage_cstyle_cast.cc                          | 2 +-
 tests/vars/class_member.cc                                    | 2 +-
 tests/vars/class_static_member.cc                             | 2 +-
 tests/vars/function_local.cc                                  | 2 +-
 tests/vars/function_param.cc                                  | 2 +-
 31 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/serializer.cc b/src/serializer.cc
index f8389229..afcfa9e6 100644
--- a/src/serializer.cc
+++ b/src/serializer.cc
@@ -136,7 +136,7 @@ void Reflect(TVisitor& visitor, IndexedTypeDef& value) {
   REFLECT_MEMBER2("types", value.def.types);
   REFLECT_MEMBER2("funcs", value.def.funcs);
   REFLECT_MEMBER2("vars", value.def.vars);
-  REFLECT_MEMBER2("instantiations", value.instances);
+  REFLECT_MEMBER2("instances", value.instances);
   REFLECT_MEMBER2("uses", value.uses);
   REFLECT_MEMBER_END();
 }
diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc
index 3319f23d..896a09ad 100644
--- a/tests/constructors/constructor.cc
+++ b/tests/constructors/constructor.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-4:2",
       "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"]
     }],
   "funcs": [{
diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc
index daadd770..1cefe882 100644
--- a/tests/constructors/destructor.cc
+++ b/tests/constructors/destructor.cc
@@ -24,7 +24,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-5:2",
       "funcs": [0, 1],
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:7-1:10", "3:3-3:6", "4:3-4:7", "8:3-8:6"]
     }],
   "funcs": [{
diff --git a/tests/enums/enum_usage.cc b/tests/enums/enum_usage.cc
index e71591ef..aff847a4 100644
--- a/tests/enums/enum_usage.cc
+++ b/tests/enums/enum_usage.cc
@@ -16,7 +16,7 @@ OUTPUT:
       "definition_spelling": "1:12-1:15",
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
-      "instantiations": [2],
+      "instances": [2],
       "uses": ["1:12-1:15", "6:1-6:4", "6:9-6:12"]
     }],
   "vars": [{
diff --git a/tests/foobar.cc b/tests/foobar.cc
index 839bf430..e2c8d3d6 100644
--- a/tests/foobar.cc
+++ b/tests/foobar.cc
@@ -34,7 +34,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "5:8-5:11",
       "definition_extent": "5:1-7:2",
-      "instantiations": [1],
+      "instances": [1],
       "uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"]
     }, {
       "id": 3,
@@ -43,7 +43,7 @@ OUTPUT:
       "detailed_name": "Foo::Inner",
       "definition_spelling": "6:10-6:15",
       "definition_extent": "6:3-6:18",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["6:10-6:15", "9:9-9:14"]
     }],
   "vars": [{
diff --git a/tests/outline/outline.cc b/tests/outline/outline.cc
index c4bf92a8..340dfed0 100644
--- a/tests/outline/outline.cc
+++ b/tests/outline/outline.cc
@@ -22,7 +22,7 @@ OUTPUT:
     }, {
       "id": 1,
       "usr": "c:@N@std@ST>2#T#T@vector",
-      "instantiations": [2],
+      "instances": [2],
       "uses": ["6:8-6:14"]
     }],
   "vars": [{
diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc
index 42b49a12..5724aa5f 100644
--- a/tests/outline/outline2.cc
+++ b/tests/outline/outline2.cc
@@ -27,12 +27,12 @@ OUTPUT:
     }, {
       "id": 1,
       "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"]
     }, {
       "id": 2,
       "usr": "c:@N@std@ST>2#T#T@vector",
-      "instantiations": [2],
+      "instances": [2],
       "uses": ["9:8-9:14", "12:6-12:12"]
     }],
   "funcs": [{
diff --git a/tests/templates/implicit_variable_instantiation.cc b/tests/templates/implicit_variable_instantiation.cc
index 0bb93770..b556e3fe 100644
--- a/tests/templates/implicit_variable_instantiation.cc
+++ b/tests/templates/implicit_variable_instantiation.cc
@@ -24,7 +24,7 @@ OUTPUT:
       "detailed_name": "ns::VarType",
       "definition_spelling": "2:8-2:15",
       "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"]
     }, {
       "id": 1,
diff --git a/tests/templates/namespace_template_type_usage_folded_into_one.cc b/tests/templates/namespace_template_type_usage_folded_into_one.cc
index eca842f9..a9e52526 100644
--- a/tests/templates/namespace_template_type_usage_folded_into_one.cc
+++ b/tests/templates/namespace_template_type_usage_folded_into_one.cc
@@ -16,7 +16,7 @@ OUTPUT:
       "detailed_name": "ns::Foo",
       "definition_spelling": "3:9-3:12",
       "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"]
     }],
   "vars": [{
diff --git a/tests/templates/template_class_type_usage_folded_into_one.cc b/tests/templates/template_class_type_usage_folded_into_one.cc
index 52c61e58..2fcaca81 100644
--- a/tests/templates/template_class_type_usage_folded_into_one.cc
+++ b/tests/templates/template_class_type_usage_folded_into_one.cc
@@ -61,7 +61,7 @@ OUTPUT:
       "detailed_name": "Foo::Inner",
       "definition_spelling": "6:10-6:15",
       "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"]
     }],
   "vars": [{
diff --git a/tests/templates/template_type_usage_folded_into_one.cc b/tests/templates/template_type_usage_folded_into_one.cc
index 1acc2653..a8b745ed 100644
--- a/tests/templates/template_type_usage_folded_into_one.cc
+++ b/tests/templates/template_type_usage_folded_into_one.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "2:7-2:10",
       "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"]
     }],
   "vars": [{
diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc
index 68f01317..4d501722 100644
--- a/tests/unions/union_usage.cc
+++ b/tests/unions/union_usage.cc
@@ -22,7 +22,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
-      "instantiations": [2],
+      "instances": [2],
       "uses": ["1:7-1:10", "6:1-6:4", "8:10-8:13"]
     }],
   "funcs": [{
diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc
index 365f68b7..3c99f60b 100644
--- a/tests/usage/func_usage_call_method.cc
+++ b/tests/usage/func_usage_call_method.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:11",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:11", "6:3-6:6"]
     }],
   "funcs": [{
diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc
index e93876ba..4f612e6d 100644
--- a/tests/usage/func_usage_forward_decl_method.cc
+++ b/tests/usage/func_usage_forward_decl_method.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:11",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:11", "6:3-6:6"]
     }],
   "funcs": [{
diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc
index 8dbbb0a0..57a4e41e 100644
--- a/tests/usage/type_usage_as_template_parameter.cc
+++ b/tests/usage/type_usage_as_template_parameter.cc
@@ -16,7 +16,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "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"]
     }, {
       "id": 1,
diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc
index 7fc9420b..c8c2d6ca 100644
--- a/tests/usage/type_usage_as_template_parameter_complex.cc
+++ b/tests/usage/type_usage_as_template_parameter_complex.cc
@@ -84,7 +84,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "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"]
     }, {
       "id": 1,
diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc
index 18c437f0..e7cd25fc 100644
--- a/tests/usage/type_usage_as_template_parameter_simple.cc
+++ b/tests/usage/type_usage_as_template_parameter_simple.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "detailed_name": "unique_ptr",
       "definition_spelling": "2:7-2:17",
       "definition_extent": "2:1-2:20",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["2:7-2:17", "6:8-6:18"]
     }, {
       "id": 1,
diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc
index 3912024d..efaeec8a 100644
--- a/tests/usage/type_usage_declare_extern.cc
+++ b/tests/usage/type_usage_declare_extern.cc
@@ -11,7 +11,7 @@ OUTPUT:
       "detailed_name": "T",
       "definition_spelling": "1:8-1:9",
       "definition_extent": "1:1-1:12",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:9", "3:8-3:9"]
     }],
   "vars": [{
diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc
index 5711f4b8..064eb2ff 100644
--- a/tests/usage/type_usage_declare_field.cc
+++ b/tests/usage/type_usage_declare_field.cc
@@ -12,7 +12,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:19", "5:3-5:14"]
     }, {
       "id": 1,
@@ -21,7 +21,7 @@ OUTPUT:
       "detailed_name": "ImplementedType",
       "definition_spelling": "2:8-2:23",
       "definition_extent": "2:1-2:26",
-      "instantiations": [1],
+      "instances": [1],
       "uses": ["2:8-2:23", "6:3-6:18"]
     }, {
       "id": 2,
diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc
index 663df5bf..dd0b2ead 100644
--- a/tests/usage/type_usage_declare_local.cc
+++ b/tests/usage/type_usage_declare_local.cc
@@ -12,7 +12,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:19", "5:3-5:14"]
     }, {
       "id": 1,
@@ -21,7 +21,7 @@ OUTPUT:
       "detailed_name": "ImplementedType",
       "definition_spelling": "2:8-2:23",
       "definition_extent": "2:1-2:26",
-      "instantiations": [1],
+      "instances": [1],
       "uses": ["2:8-2:23", "6:3-6:18"]
     }],
   "funcs": [{
diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc
index 36919f0c..f6b8f9db 100644
--- a/tests/usage/type_usage_declare_param.cc
+++ b/tests/usage/type_usage_declare_param.cc
@@ -9,7 +9,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:19", "4:10-4:21"]
     }, {
       "id": 1,
@@ -18,7 +18,7 @@ OUTPUT:
       "detailed_name": "ImplementedType",
       "definition_spelling": "2:8-2:23",
       "definition_extent": "2:1-2:26",
-      "instantiations": [1],
+      "instances": [1],
       "uses": ["2:8-2:23", "4:26-4:41"]
     }],
   "funcs": [{
diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc
index 3a3d473d..f11532c0 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",
-      "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"]
     }],
   "funcs": [{
diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc
index d1c5eb87..9983c073 100644
--- a/tests/usage/type_usage_declare_qualifiers.cc
+++ b/tests/usage/type_usage_declare_qualifiers.cc
@@ -16,7 +16,7 @@ OUTPUT:
       "detailed_name": "Type",
       "definition_spelling": "1:8-1:12",
       "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"]
     }],
   "funcs": [{
diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc
index d96e1372..1374b055 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",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:12", "2:8-2:12"]
     }],
   "vars": [{
diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc
index f2c52f80..fe4dc2d6 100644
--- a/tests/usage/type_usage_various.cc
+++ b/tests/usage/type_usage_various.cc
@@ -20,7 +20,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "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"]
     }],
   "funcs": [{
diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc
index 665f5b9b..71c0de6b 100644
--- a/tests/usage/var_usage_class_member.cc
+++ b/tests/usage/var_usage_class_member.cc
@@ -28,7 +28,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-5:2",
       "vars": [0, 1],
-      "instantiations": [2],
+      "instances": [2],
       "uses": ["1:7-1:10", "11:3-11:6"]
     }],
   "funcs": [{
diff --git a/tests/usage/var_usage_cstyle_cast.cc b/tests/usage/var_usage_cstyle_cast.cc
index 02db8dfc..924c4631 100644
--- a/tests/usage/var_usage_cstyle_cast.cc
+++ b/tests/usage/var_usage_cstyle_cast.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "detailed_name": "VarType",
       "definition_spelling": "1:6-1:13",
       "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"]
     }, {
       "id": 1,
diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc
index e04b7899..7c43eb5d 100644
--- a/tests/vars/class_member.cc
+++ b/tests/vars/class_member.cc
@@ -12,7 +12,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "vars": [0],
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:7-1:10", "2:3-2:6"]
     }],
   "vars": [{
diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc
index a0e724d7..8dc62938 100644
--- a/tests/vars/class_static_member.cc
+++ b/tests/vars/class_static_member.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "vars": [0],
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:7-1:10", "2:10-2:13", "4:1-4:4", "4:6-4:9"]
     }],
   "vars": [{
diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc
index ed8e1f6e..1cd12f0e 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",
-      "instantiations": [0],
+      "instances": [0],
       "uses": ["1:8-1:11", "4:3-4:6"]
     }],
   "funcs": [{
diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc
index 4d2caa23..b40e5829 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",
-      "instantiations": [0, 1],
+      "instances": [0, 1],
       "uses": ["1:8-1:11", "3:10-3:13", "3:19-3:22"]
     }],
   "funcs": [{