Use kinds "class side" and "instance side".

dart/tests/try/poi/serialize_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Test that poi.dart can serialize a scope.
 
 library trydart.serialize_test;
 
 import 'dart:io' show
     Platform;
@@ skipping 56 matching lines @@
 void main() {
   asyncTest(testInteresting);
 }
 
 final expectedInteresting = {
   "name": "fisk",
   "kind": "function",
   "type": "() -> dynamic",
   "enclosing": {
     "name": "Foo",
-    "kind": "class",
+    "kind": "class side",
     "members": [
+      {
+        "kind": "generative_constructor",
+        "type": "() -> Foo"
+      }
     ],
     "enclosing": {
-      "name": "this(Foo)",
-      "kind": "class",
+      "name": "Foo",
+      "kind": "instance side",
       "members": [
         {
           "name": "fisk",
           "kind": "function",
           "type": "() -> dynamic"
         },
         {
           "name": "hest",
           "kind": "function",
           "type": "() -> dynamic"
         },
-        {
-          "kind": "generative_constructor",
-          "type": "() -> Foo"
-        }
       ],
       "enclosing": {
         "name": "interesting",
         "kind": "library",
         "members": [
           {
             "name": "Foo",
             "kind": "class"
           },
           {
@@ skipping 11 matching lines @@
     }
   }
 };
 
 final expectedSubclass = {
   "name": "instanceMethod2",
   "kind": "function",
   "type": "() -> dynamic",
   "enclosing": {
     "name": "C",
-    "kind": "class",
+    "kind": "class side",
     "members": [
       {
         "name": "staticMethod1",
         "kind": "function",
         "type": "() -> dynamic"
       },
       {
         "name": "staticMethod2",
         "kind": "function",
         "type": "() -> dynamic"
+      },
+      {
+        "kind": "generative_constructor",
+        "type": "() -> C"
       }
     ],
     "enclosing": {
-      "name": "this(C)",
-      "kind": "class",
+      "name": "C",
+      "kind": "instance side",
       "members": [
         {
           "name": "instanceMethod1",
           "kind": "function",
           "type": "() -> dynamic"
         },
         {
           "name": "instanceMethod2",
           "kind": "function",
           "type": "() -> dynamic"
-        },
-        {
-          "kind": "generative_constructor",
-          "type": "() -> C"
         }
       ],
       "enclosing": {
         "name": "subclass",
         "kind": "library",
         "members": [
           {
             "name": "S",
             "kind": "class"
           },
@@ skipping 18 matching lines @@
               "name": "Foo",
               "kind": "class"
             },
             {
               "name": "main",
               "kind": "function",
               "type": "() -> dynamic"
             },
           ]..addAll(coreImports),
           "enclosing": {
-            "name": "this(S)",
-            "kind": "class",
+            "name": "S",
+            "kind": "instance side",
             "members": [
               {
                 "name": "superMethod1",
                 "kind": "function",
                 "type": "() -> dynamic"
               },
               {
                 "name": "superMethod2",
                 "kind": "function",
                 "type": "() -> dynamic"
               },
-              {
-                "kind": "generative_constructor",
-                "type": "() -> S"
-              }
             ],
             "enclosing": {
-              "name": "this(P)",
-              "kind": "class",
+              "name": "P",
+              "kind": "instance side",
               "members": [
                 {
                   "name": "pMethod1",
                   "kind": "function",
                   "type": "() -> dynamic"
                 },
                 {
                   "name": "pMethod2",
                   "kind": "function",
                   "type": "() -> dynamic"
                 },
                 {
                   "name": "_pMethod1",
                   "kind": "function",
                   "type": "() -> dynamic"
                 },
                 {
                   "name": "_pMethod2",
                   "kind": "function",
                   "type": "() -> dynamic"
                 },
-                {
-                  "kind": "generative_constructor",
-                  "type": "() -> P"
-                }
               ],
               "enclosing": object,
             }
           }
         }
       }
     }
   }
 };
 
@@ skipping 240 matching lines @@
     "name": "Type",
     "kind": "class"
   },
   {
     "name": "Uri",
     "kind": "class"
   }
 ];
 
 final object = {
-  "name": "this(Object)",
-  "kind": "class",
+  "name": "Object",
+  "kind": "instance side",
   "members": [
     {
-      "kind": "generative_constructor",
-      "type": "() -> dynamic"
-    },
-    {
       "name": "==",
       "kind": "function",
       "type": "(dynamic) -> bool"
     },
     {
       "name": "hashCode",
       "kind": "getter"
     },
     {
       "name": "toString",
       "kind": "function",
       "type": "() -> String"
     },
     {
       "name": "noSuchMethod",
       "kind": "function",
       "type": "(Invocation) -> dynamic"
     },
     {
       "name": "runtimeType",
       "kind": "getter"
     }
   ]
 };