Make summary builder classes implement summary interfaces.

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 265 matching lines @@
       List<String> builderParams = _generateBuilder(cls);
       out();
       _generateEncodeFunction(cls, builderParams);
       out();
       _generateInterface(cls);
       out();
       _generateReader(cls);
       out();
       _generateImpl(cls);
       out();
+      _generateMixin(cls);
+      out();
     }
   }
 
   /**
    * Enclose [s] in quotes, escaping as necessary.
    */
   String quoted(String s) {
     return JSON.encode(s);
   }
 
   List<String> _generateBuilder(idlModel.ClassDeclaration cls) {
-    String builderName = cls.name + 'Builder';
+    String name = cls.name;
+    String builderName = name + 'Builder';
+    String mixinName = '_${name}Mixin';
     List<String> builderParams = <String>[];
-    out('class $builderName {');
+    out('class $builderName extends Object with $mixinName '
+        'implements $name {');
     indent(() {
       out('bool _finished = false;');
       // Generate fields.
       out();
       for (idlModel.FieldDeclaration field in cls.fields) {
         String fieldName = field.name;
         idlModel.FieldType type = field.type;
         String typeStr = encodedType(type);
         out('$typeStr _$fieldName;');
       }
       // Generate constructor.
       out();
       out('$builderName();');
-      // Generate setters.
+      // Generate getters and setters.
       for (idlModel.FieldDeclaration field in cls.fields) {
         String fieldName = field.name;
         String typeStr = encodedType(field.type);
+        String def = defaultValue(field.type);
+        String defSuffix = def == null ? '' : ' ?? $def';
+        out();
+        out('@override');
+        out('${dartType(field.type)} get $fieldName => _$fieldName$defSuffix;');
         out();
         outDoc(field.documentation);
         builderParams.add('$typeStr $fieldName');
         out('void set $fieldName($typeStr _value) {');
         indent(() {
           String stateFieldName = '_' + fieldName;
           out('assert(!_finished);');
           out('$stateFieldName = _value;');
         });
         out('}');
@@ skipping 112 matching lines @@
         out('builder.$fieldName = $fieldName;');
       }
       out('return builder;');
     });
     out('}');
   }
 
   void _generateImpl(idlModel.ClassDeclaration cls) {
     String name = cls.name;
     String implName = '_${name}Impl';
-    out('class $implName implements $name {');
+    String mixinName = '_${name}Mixin';
+    out('class $implName extends Object with $mixinName implements $name {');
     indent(() {
       out('final fb.BufferPointer _bp;');
       out();
       out('$implName(this._bp);');
       out();
       // Write cache fields.
       for (idlModel.FieldDeclaration field in cls.fields) {
         String returnType = dartType(field.type);
         String fieldName = field.name;
         out('$returnType _$fieldName;');
       }
-      out();
-      // Write toMap().
-      out('@override');
-      out('Map<String, Object> toMap() => {');
-      indent(() {
-        for (idlModel.FieldDeclaration field in cls.fields) {
-          String fieldName = field.name;
-          out('${quoted(fieldName)}: $fieldName,');
-        }
-      });
-      out('};');
       // Write getters.
       cls.fields.asMap().forEach((index, field) {
         String fieldName = field.name;
         idlModel.FieldType type = field.type;
         String typeName = type.typeName;
         // Prepare "readExpr" or "readCode" + "def"
         String readExpr;
         String readCode;
         String def = defaultValue(type);
         if (type.isList) {
@@ skipping 55 matching lines @@
         String fieldName = field.name;
         idlModel.FieldType type = field.type;
         out();
         outDoc(field.documentation);
         out('${dartType(type)} get $fieldName;');
       });
     });
     out('}');
   }
 
+  void _generateMixin(idlModel.ClassDeclaration cls) {
+    String name = cls.name;
+    String mixinName = '_${name}Mixin';
+    out('abstract class $mixinName implements $name {');
+    indent(() {
+      // Write toMap().
+      out('@override');
+      out('Map<String, Object> toMap() => {');
+      indent(() {
+        for (idlModel.FieldDeclaration field in cls.fields) {
+          String fieldName = field.name;
+          out('${quoted(fieldName)}: $fieldName,');
+        }
+      });
+      out('};');
+    });
+    out('}');
+  }
+
   void _generateReader(idlModel.ClassDeclaration cls) {
     String name = cls.name;
     String readerName = '_${name}Reader';
     String implName = '_${name}Impl';
     out('class $readerName extends fb.TableReader<$implName> {');
     indent(() {
       out('const $readerName();');
       out();
       out('@override');
       out('$implName createObject(fb.BufferPointer bp) => new $implName(bp);');
@@ skipping 17 matching lines @@
       return token.lexeme.split('\n').map((String line) {
         if (line.startsWith(indent)) {
           line = line.substring(indent.length);
         }
         return line;
       }).join('\n');
     }
     return null;
   }
 }