pkg/serialization: cleanup

pkg/serialization/lib/src/format.dart

 part of serialization;
 
 /**
  * An abstract class for serialization formats. Subclasses define how data
  * is read or written to a particular output mechanism.
  */
 abstract class Format {
 
   const Format();
 
@@ skipping 49 matching lines @@
     };
     return result;
   }
 
   /**
    * Read serialized data written from this format
    * and return the nested Map representation described in [generateOutput]. If
    * the data also includes rule definitions, then these will replace the rules
    * in the [Serialization] for [reader].
    */
-  Map<String, dynamic> read(topLevel, Reader reader) {
+  Map<String, dynamic> read(Map<String, dynamic> topLevel, Reader reader) {
     var ruleString = topLevel["rules"];
     reader.readRules(ruleString);
     reader._data = topLevel["data"];
     topLevel["roots"] = topLevel["roots"];
     return topLevel;
   }
 }
 
 /**
  * A format that stores the data in maps which can be converted into a JSON
@@ skipping 62 matching lines @@
    */
   Reference mapToReference(ReaderOrWriter parent, Map<String, int> ref) =>
       ref == null ? null : new Reference(parent, ref["rule"], ref["object"]);
 
   /**
    * Read serialized data written in this format
    * and return the nested Map representation described in [generateOutput]. If
    * the data also includes rule definitions, then these will replace the rules
    * in the [Serialization] for [reader].
    */
-  Map<String, dynamic> read(topLevel, Reader reader) {
+  Map<String, dynamic> read(Map<String, dynamic> topLevel, Reader reader) {
     super.read(topLevel, reader);
     forAllStates(reader,
         (ref) => ref is Map && ref["__Ref"] != null,
         (ref) => mapToReference(reader, ref));
     topLevel["roots"] = topLevel["roots"]
         .map((x) => x is Map<String, int> ? mapToReference(reader, x) : x)
         .toList();
     return topLevel;
   }
 }
@@ skipping 388 matching lines @@
       return new Reference(r, a, b);
     }
   }
 
   /** Return the next element from the input. */
   _next(Iterator input) {
     input.moveNext();
     return input.current;
   }
 }