Fix regression in meta-serializing rules

pkg/serialization/lib/serialization.dart

 // Copyright (c) 2012, 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 provides a general-purpose serialization facility for Dart objects. A
  * [Serialization] is defined in terms of [SerializationRule]s and supports
  * reading and writing to different formats.
  *
  * ## Installing ##
@@ skipping 192 matching lines @@
  * [pub]: http://pub.dartlang.org
  * [pkg]: http://pub.dartlang.org/packages/serialization
  */
 library serialization;
 
 import 'src/mirrors_helpers.dart';
 import 'src/serialization_helpers.dart';
 import 'dart:async';
 import 'dart:json' as json;
 import 'dart:collection';
+import 'dart:uri';
 
 part 'src/reader_writer.dart';
 part 'src/serialization_rule.dart';
 part 'src/basic_rule.dart';
 part 'src/format.dart';
 
 /**
  * This class defines a particular serialization scheme, in terms of
  * [SerializationRule] instances, and supports reading and writing them.
  * See library comment for examples of usage.
@@ skipping 28 matching lines @@
   /**
    * When we write out data using this serialization, should we also write
    * out a description of the rules. This is on by default unless using
    * CustomRule subclasses, in which case it requires additional setup and
    * is off by default.
    */
   bool get selfDescribing {
     // TODO(alanknight): Should this be moved to the format?
     // TODO(alanknight): Allow self-describing in the presence of CustomRule.
     if (_selfDescribing != null) return _selfDescribing;
-    return !rules.any((x) => x is CustomRule);
+    _selfDescribing = !rules.any((x) => x is CustomRule && x is! SymbolRule);
+    return _selfDescribing;
   }
 
   /**
    * When we write out data using this serialization, should we also write
    * out a description of the rules. This is on by default unless using
    * CustomRule subclasses, in which case it requires additional setup and
    * is off by default.
    */
   void set selfDescribing(bool value) {
     _selfDescribing = value;
@@ skipping 40 matching lines @@
    * subclass.
    */
   // TODO(alanknight): Take a type rather than an instance. Issue 6282 and 6433.
   BasicRule addRuleFor(
       instanceOfType,
       {String constructor,
         List constructorFields,
         List<String> fields,
         List<String> excludeFields}) {
 
-    var rule;
-    rule = new BasicRule(
+    var rule = new BasicRule(
         turnInstanceIntoSomethingWeCanUse(
             instanceOfType),
         constructor, constructorFields, fields, excludeFields);
     addRule(rule);
     return rule;
   }
 
   /** Set up the default rules, for lists and primitives. */
   void addDefaultRules() {
     addRule(new PrimitiveRule());
@@ skipping 123 matching lines @@
       ..addRuleFor(new MapRule())
       ..addRuleFor(new PrimitiveRule())
       ..addRuleFor(new ListRuleEssential())
       ..addRuleFor(basicRule,
           constructorFields: ['type',
             'constructorName',
             'constructorFields', 'regularFields', []],
           fields: [])
       ..addRule(new NamedObjectRule())
       ..addRule(new MirrorRule())
-      ..addRule(new SymbolRule());
+      ..addRuleFor(new MirrorRule())
+      ..addRuleFor(new SymbolRule());
     meta.namedObjects = namedObjects;
     return meta;
   }
 
   /** Return true if our [namedObjects] collection has an entry for [object].*/
   bool _hasNameFor(object) {
     var sentinel = const _Sentinel();
     return _nameFor(object, () => sentinel) != sentinel;
   }
 
@@ skipping 10 matching lines @@
 }
 
 /**
  * An exception class for errors during serialization.
  */
 class SerializationException implements Exception {
   final String message;
   const SerializationException([this.message]);
   toString() => "SerializationException($message)";
 }