Pass SourceInformation through the CPS IR.

pkg/compiler/lib/src/io/source_information.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.
 
 library dart2js.source_information;
 
 import '../dart2jslib.dart' show SourceSpan;
 import '../elements/elements.dart' show AstElement;
 import '../scanner/scannerlib.dart' show Token;
 import '../tree/tree.dart' show Node;
@@ skipping 77 matching lines @@
     if (endToken.charOffset < sourceFile.length) {
       endSourcePosition =
           new TokenSourceLocation(sourceFile, endToken, name);
     }
     return new StartEndSourceInformation(sourcePosition, endSourcePosition);
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write('${startPosition.sourceUri}:');
-    sb.write('[${startPosition.line},${startPosition.column}]');
+    sb.write('[${startPosition.line + 1},${startPosition.column + 1}]');

[floitsch, 2015/02/24 19:58:12]

Is this just to make it easier to reason? That is, because editors start with
line/column 1 ?

Add a comment.

[Johnni Winther, 2015/03/02 11:48:14]

Done.

     if (endPosition != null) {
-      sb.write('-[${endPosition.line},${endPosition.column}]');
+      sb.write('-[${endPosition.line + 1},${endPosition.column + 1}]');
     }
     return sb.toString();
   }
 }
 
+/// [SourceInformation] that consists of an offset position into the source
+/// code.
+class PositionSourceInformation implements SourceInformation {
+  final SourceLocation sourcePosition;
+
+  PositionSourceInformation(this.sourcePosition);
+
+  @override
+  void beginMapping(CodeOutput output) {
+    output.setSourceLocation(sourcePosition);
+  }
+
+  @override
+  void endMapping(CodeOutput output) {
+    // Do nothing.
+  }
+
+  SourceSpan get sourceSpan {
+    Uri uri = sourcePosition.sourceUri;
+    int offset = sourcePosition.offset;
+    return new SourceSpan(uri, offset, offset);
+  }
+
+  int get hashCode {
+    return sourcePosition.hashCode * 17 & 0x7FFFFFFF;
+  }
+
+  bool operator ==(other) {
+    if (identical(this, other)) return true;
+    if (other is! PositionSourceInformation) return false;
+    return sourcePosition == other.sourcePosition;
+  }
+
+  String toString() {
+    StringBuffer sb = new StringBuffer();
+    sb.write('${sourcePosition.sourceUri}:');
+    sb.write('[${sourcePosition.line + 1},${sourcePosition.column + 1}]');
+    return sb.toString();
+  }
+}
+
 /// A location in a source file.
 abstract class SourceLocation {
   final SourceFile _sourceFile;
   int _line;
 
   SourceLocation(this._sourceFile) {
     assert(isValid);
   }
 
   /// The absolute URI of the source file of this source location.
@@ skipping 24 matching lines @@
   }
 
   bool operator ==(other) {
     if (identical(this, other)) return true;
     if (other is! SourceLocation) return false;
     return sourceUri == other.sourceUri &&
            offset == other.offset &&
            sourceName == other.sourceName;
   }
 
-  String toString() => '${sourceUri}:[${line},${column}]';
+  String toString() => '${sourceUri}:[${line + 1},${column + 1}]';
 }
 
 class TokenSourceLocation extends SourceLocation {
   final Token token;
   final String sourceName;
 
   TokenSourceLocation(SourceFile sourceFile, this.token, this.sourceName)
     : super(sourceFile);
 
   @override
   int get offset => token.charOffset;
 
   String toString() {
     return '${super.toString()}:$sourceName';
   }
 }