Rewrite the pkg/yaml parser.

pkg/yaml/lib/src/yaml_node.dart

Index: pkg/yaml/lib/src/yaml_node.dart
diff --git a/pkg/yaml/lib/src/yaml_node.dart b/pkg/yaml/lib/src/yaml_node.dart
index 6320156e19febf53647698814f1f57e9ef91d511..027bc1b32011ce2c85878fe6be7366e6962e60d7 100644
--- a/pkg/yaml/lib/src/yaml_node.dart
+++ b/pkg/yaml/lib/src/yaml_node.dart
@@ -10,6 +10,7 @@ import 'package:collection/collection.dart';
 import 'package:source_span/source_span.dart';
 
 import 'null_span.dart';
+import 'style.dart';
 import 'yaml_node_wrapper.dart';
 
 /// An interface for parsed nodes from a YAML source tree.
@@ -26,7 +27,9 @@ abstract class YamlNode {
   ///
   /// [SourceSpan.message] can be used to produce a human-friendly message about
   /// this node.
-  SourceSpan get span;
+  SourceSpan get span => _span;
+
+  SourceSpan _span;
 
   /// The inner value of this node.
   ///
@@ -38,8 +41,6 @@ abstract class YamlNode {
 
 /// A read-only [Map] parsed from YAML.
 class YamlMap extends YamlNode with collection.MapMixin, UnmodifiableMapMixin  {
-  final SourceSpan span;
-
   /// A view of [this] where the keys and values are guaranteed to be
   /// [YamlNode]s.
   ///
@@ -50,6 +51,9 @@ class YamlMap extends YamlNode with collection.MapMixin, UnmodifiableMapMixin  {
   /// `dynamic` `map.nodes["foo"]` will still work.
   final Map<dynamic, YamlNode> nodes;
 
+  /// The style used for the map in the original document.
+  final CollectionStyle style;
+
   Map get value => this;
 
   Iterable get keys => nodes.keys.map((node) => node.value);
@@ -77,8 +81,10 @@ class YamlMap extends YamlNode with collection.MapMixin, UnmodifiableMapMixin  {
       new YamlMapWrapper(dartMap, sourceUrl);
 
   /// Users of the library should not use this constructor.
-  YamlMap.internal(Map<dynamic, YamlNode> nodes, this.span)
-      : nodes = new UnmodifiableMapView<dynamic, YamlNode>(nodes);
+  YamlMap.internal(Map<dynamic, YamlNode> nodes, SourceSpan span, this.style)
+      : nodes = new UnmodifiableMapView<dynamic, YamlNode>(nodes) {
+    _span = span;

[Bob Nystrom, 2014/10/31 20:03:29]

Put this in the initialization list.

[nweiz, 2014/11/04 22:19:38]

Dart won't allow it. Apparently you can't hop inheritance chains in
initialization lists. I guess this is because otherwise changing the superclass
from "var _span" to "set _span" would be a breaking change.

+  }
 
   operator [](key) {
     var node = nodes[key];
@@ -89,10 +95,11 @@ class YamlMap extends YamlNode with collection.MapMixin, UnmodifiableMapMixin  {
 // TODO(nweiz): Use UnmodifiableListMixin when issue 18970 is fixed.
 /// A read-only [List] parsed from YAML.
 class YamlList extends YamlNode with collection.ListMixin {
-  final SourceSpan span;
-
   final List<YamlNode> nodes;
 
+  /// The style used for the list in the original document.
+  final CollectionStyle style;
+
   List get value => this;
 
   int get length => nodes.length;
@@ -124,8 +131,10 @@ class YamlList extends YamlNode with collection.ListMixin {
       new YamlListWrapper(dartList, sourceUrl);
 
   /// Users of the library should not use this constructor.
-  YamlList.internal(List<YamlNode> nodes, this.span)
-      : nodes = new UnmodifiableListView<YamlNode>(nodes);
+  YamlList.internal(List<YamlNode> nodes, SourceSpan span, this.style)
+      : nodes = new UnmodifiableListView<YamlNode>(nodes) {
+    _span = span;

[Bob Nystrom, 2014/10/31 20:03:30]

Ditto.

+  }
 
   operator [](int index) => nodes[index].value;
 
@@ -136,10 +145,11 @@ class YamlList extends YamlNode with collection.ListMixin {
 
 /// A wrapped scalar value parsed from YAML.
 class YamlScalar extends YamlNode {
-  final SourceSpan span;
-
   final value;
 
+  /// The style used for the scalar in the original document.
+  final ScalarStyle style;
+
   /// Wraps a Dart value in a [YamlScalar].
   ///
   /// This scalar's [span] won't have useful location information. However, it
@@ -148,10 +158,21 @@ class YamlScalar extends YamlNode {
   ///
   /// [sourceUrl] may be either a [String], a [Uri], or `null`.
   YamlScalar.wrap(this.value, {sourceUrl})
-      : span = new NullSpan(sourceUrl);
+      : style = ScalarStyle.ANY {
+    _span = new NullSpan(sourceUrl);
+  }
 
   /// Users of the library should not use this constructor.
-  YamlScalar.internal(this.value, this.span);
+  YamlScalar.internal(this.value, SourceSpan span, this.style) {
+    _span = span;
+  }
 
   String toString() => value.toString();
 }
+
+/// Sets the source span of a [YamlNode].
+///
+/// This method is not exposed publicly.

[Bob Nystrom, 2014/10/31 20:03:29]

If you're using this pattern here, do you think it's worth using it for the
internal constructors too?

[nweiz, 2014/11/04 22:19:38]

Nope. Constructors are more complicated to wrap and easier to clearly mark as
internal.

+void setSpan(YamlNode node, SourceSpan span) {
+  node._span = span;
+}