Deprecate the source_maps span classes.

pkg/source_maps/lib/printer.dart

 // Copyright (c) 2013, 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.
 
 /// Contains a code printer that generates code by recording the source maps.
 library source_maps.printer;
 
+import 'package:source_span/source_span.dart' as source_span;
+
 import 'builder.dart';
 import 'span.dart';
+import 'src/span_wrapper.dart';
 
 const int _LF = 10;
 const int _CR = 13;
 
 /// A simple printer that keeps track of offset locations and records source
 /// maps locations.
 class Printer {
   final String filename;
   final StringBuffer _buff = new StringBuffer();
   final SourceMapBuilder _maps = new SourceMapBuilder();
@@ skipping 48 matching lines @@
     _column += total;
   }
 
   /// Marks that the current point in the target file corresponds to the [mark]
   /// in the source file, which can be either a [Location] or a [Span]. When the
   /// mark is an identifier's Span, this also records the name of the identifier
   /// in the source map information.
   void mark(mark) {
     var loc;
     var identifier = null;
-    if (mark is Location) {
-      loc = mark;
-    } else if (mark is Span) {
+    if (mark is Location || mark is source_span.SourceLocation) {
+      loc = LocationWrapper.wrap(mark);
+    } else if (mark is Span || mark is source_span.SourceSpan) {
+      mark = SpanWrapper.wrap(mark);
       loc = mark.start;
       if (mark.isIdentifier) identifier = mark.text;
     }
     _maps.addLocation(loc,
         new FixedLocation(_buff.length, null, _line, _column), identifier);
     _loc = loc;
   }
 }
 
 /// A more advanced printer that keeps track of offset locations to record
@@ skipping 26 matching lines @@
   /// [String], the value is appended directly, without doing any formatting
   /// changes. If you wish to add a line of code with automatic indentation, use
   /// [addLine] instead.  [NestedPrinter]s and [NestedItem]s are not processed
   /// until [build] gets called later on. We ensure that [build] emits every
   /// object in the order that they were added to this printer.
   ///
   /// The [location] and [span] parameters indicate the corresponding source map
   /// location of [object] in the original input. Only one, [location] or
   /// [span], should be provided at a time.
   ///
+  /// [location] can be either a [Location] or a [SourceLocation]. [span] can be
+  /// either a [Span] or a [SourceSpan]. Using a [Location] or a [Span] is
+  /// deprecated and will be unsupported in version 0.10.0.
+  ///
   /// Indicate [isOriginal] when [object] is copied directly from the user code.
   /// Setting [isOriginal] will make this printer propagate source map locations
   /// on every line-break.
-  void add(object, {Location location, Span span, bool isOriginal: false}) {
+  void add(object, {location, span, bool isOriginal: false}) {
     if (object is! String || location != null || span != null || isOriginal) {
       _flush();
       assert(location == null || span == null);
-      if (location != null) _items.add(location);
-      if (span != null) _items.add(span);
+      if (location != null) _items.add(LocationWrapper.wrap(location));
+      if (span != null) _items.add(SpanWrapper.wrap(span));
       if (isOriginal) _items.add(_ORIGINAL);
     }
 
     if (object is String) {
       _appendString(object);
     } else {
       _items.add(object);
     }
   }
 
   /// Append `2 * indent` spaces to this printer.
   void insertIndent() => _indent(indent);
 
   /// Add a [line], autoindenting to the current value of [indent]. Note,
   /// indentation is not inferred from the contents added to this printer. If a
   /// line starts or ends an indentation block, you need to also update [indent]
   /// accordingly. Also, indentation is not adapted for nested printers. If
   /// you add a [NestedPrinter] to this printer, its indentation is set
   /// separately and will not include any the indentation set here.
   ///
   /// The [location] and [span] parameters indicate the corresponding source map
   /// location of [object] in the original input. Only one, [location] or
   /// [span], should be provided at a time.
-  void addLine(String line, {Location location, Span span}) {
+  ///
+  /// [location] can be either a [Location] or a [SourceLocation]. [span] can be
+  /// either a [Span] or a [SourceSpan]. Using a [Location] or a [Span] is
+  /// deprecated and will be unsupported in version 0.10.0.
+  void addLine(String line, {location, span}) {
     if (location != null || span != null) {
       _flush();
       assert(location == null || span == null);
-      if (location != null) _items.add(location);
-      if (span != null) _items.add(span);
+      if (location != null) _items.add(LocationWrapper.wrap(location));
+      if (span != null) _items.add(SpanWrapper.wrap(span));
     }
     if (line == null) return;
     if (line != '') {
       // We don't indent empty lines.
       _indent(indent);
       _appendString(line);
     }
     _appendString('\n');
   }
 
@@ skipping 60 matching lines @@
       }
     }
   }
 }
 
 /// An item added to a [NestedPrinter].
 abstract class NestedItem {
   /// Write the contents of this item into [printer].
   void writeTo(Printer printer);
 }