Modify summary Builder classes to avoid the use of Object.

pkg/analyzer/tool/summary/generate.dart

 // Copyright (c) 2015, 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.
 
 /**
  * This file contains code to generate serialization/deserialization logic for
  * summaries based on an "IDL" description of the summary format (written in
  * stylized Dart).
  *
  * For each class in the "IDL" input, two corresponding classes are generated:
@@ skipping 117 matching lines @@
     } else {
       return null;
     }
   }
 
   /**
    * Generate a string representing the Dart type which should be used to
    * represent [type] while building a serialized data structure.
    */
   String encodedType(idlModel.FieldType type) {
+    String typeStr;
+    if (_idl.classes.containsKey(type.typeName)) {
+      typeStr = '${type.typeName}Builder';
+    } else {
+      typeStr = type.typeName;
+    }
     if (type.isList) {
-      if (type.typeName == 'int') {
-        return 'List<int>';
-      } else {
-        return 'List<Object>';
-      }
-    } else if (_idl.classes.containsKey(type.typeName)) {
-      return 'Object';
+      return 'List<$typeStr>';
     } else {
-      return dartType(type);
+      return typeStr;
     }
   }
 
   /**
    * Process the AST in [idlParsed] and store the resulting semantic model in
    * [_idl].  Also perform some error checking.
    */
   void extractIdl(CompilationUnit idlParsed) {
     _idl = new idlModel.Idl();
     for (CompilationUnitMember decl in idlParsed.declarations) {
@@ skipping 148 matching lines @@
       out('class ${name}Builder {');
       indent(() {
         out('final Map _json = {};');
         out();
         out('${name}Builder(builder.BuilderContext context);');
         cls.fields.forEach((String fieldName, idlModel.FieldType type) {
           out();
           String conversion = '_value';
           String condition = '';
           if (type.isList) {
-            conversion = '$conversion.toList()';
+            if (_idl.classes.containsKey(type.typeName)) {
+              conversion = '$conversion.map((b) => b.finish()).toList()';
+            } else {
+              conversion = '$conversion.toList()';
+            }
             condition = ' || _value.isEmpty';
           } else if (_idl.enums.containsKey(type.typeName)) {
             conversion = '$conversion.index';
             condition = ' || _value == ${defaultValue(type)}';
+          } else if (_idl.classes.containsKey(type.typeName)) {
+            conversion = '$conversion.finish()';
           }
           builderParams.add('${encodedType(type)} $fieldName');
           out('void set $fieldName(${encodedType(type)} _value) {');
           indent(() {
             out('assert(!_json.containsKey(${quoted(fieldName)}));');
             out('if (_value != null$condition) {');
             indent(() {
               out('_json[${quoted(fieldName)}] = $conversion;');
             });
             out('}');
           });
           out('}');
         });
+        if (cls.isTopLevel) {
+          out();
+          out('List<int> toBuffer() => UTF8.encode(JSON.encode(finish()));');
+        }
         out();
-        out('Object finish() => _json;');
+        out('Map finish() => _json;');
       });
       out('}');
       out();
-      out('Object encode$name(builder.BuilderContext builderContext, {${builderParams.join(', ')}}) {');
+      out('${name}Builder encode$name(builder.BuilderContext builderContext, {${builderParams.join(', ')}}) {');
       indent(() {
         out('${name}Builder builder = new ${name}Builder(builderContext);');
         cls.fields.forEach((String fieldName, idlModel.FieldType type) {
           out('builder.$fieldName = $fieldName;');
         });
-        out('return builder.finish();');
+        out('return builder;');
       });
       out('}');
       out();
     });
   }
 
   /**
    * Enclose [s] in quotes, escaping as necessary.
    */
   String quoted(String s) {
     return JSON.encode(s);
   }
 }