Fix source locations for inlined and patched functions.

lib/compiler/implementation/source_map_builder.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.
 
 #library('source_map_builder');
 
 #import('dart:json');
 
+#import('scanner/scannerlib.dart');
 #import('source_file.dart');
 
 class SourceMapBuilder {
   static const int VLQ_BASE_SHIFT = 5;
   static const int VLQ_BASE_MASK = (1 << 5) - 1;
   static const int VLQ_CONTINUATION_BIT = 1 << 5;
   static const int VLQ_CONTINUATION_MASK = 1 << 5;
   static const String BASE64_DIGITS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn'
                                       'opqrstuvwxyz0123456789+/';
 
@@ skipping 22 matching lines @@
 
     previousTargetLine = 0;
     previousTargetColumn = 0;
     previousSourceUrlIndex = 0;
     previousSourceLine = 0;
     previousSourceColumn = 0;
     previousSourceNameIndex = 0;
     firstEntryInLine = true;
   }
 
-  void addMapping(SourceFile sourceFile, int sourceOffset, String sourceName,
-                  int targetOffset) {
-    entries.add(new _Entry(sourceFile, sourceOffset, sourceName, targetOffset));
+  void addMapping(int targetOffset, SourceFileLocation sourceLocation) {
+    entries.add(new _Entry(sourceLocation, targetOffset));
   }
 
   String build(SourceFile targetFile) {
     StringBuffer buffer = new StringBuffer();
     buffer.add('{\n');
     buffer.add('  "version": 3,\n');
     buffer.add('  "mappings": "');
     entries.forEach((_Entry entry) => writeEntry(entry, targetFile, buffer));
     buffer.add('",\n');
     buffer.add('  "sources": ');
     JSON.printOn(sourceUrlList, buffer);
     buffer.add(',\n');
     buffer.add('  "names": ');
     JSON.printOn(sourceNameList, buffer);
     buffer.add('\n}\n');
     return buffer.toString();
   }
 
   void writeEntry(_Entry entry, SourceFile targetFile, StringBuffer output) {
     int targetLine = targetFile.getLine(entry.targetOffset);
     int targetColumn = targetFile.getColumn(targetLine, entry.targetOffset);
-    String sourceUrl;
-    int sourceLine;
-    int sourceColumn;
-    SourceFile sourceFile = entry.sourceFile;
-    // TODO(podivilov): make sure entries are always associated with the right
-    // source file.
-    if (sourceFile != null && entry.sourceOffset < sourceFile.text.length) {
-      sourceUrl = sourceFile.filename;
-      sourceLine = sourceFile.getLine(entry.sourceOffset);
-      sourceColumn = sourceFile.getColumn(sourceLine, entry.sourceOffset);
-    }
-    String sourceName = entry.sourceName;
 
     if (targetLine > previousTargetLine) {
       for (int i = previousTargetLine; i < targetLine; ++i) {
         output.add(';');
       }
       previousTargetLine = targetLine;
       previousTargetColumn = 0;
       firstEntryInLine = true;
     }
 
     if (!firstEntryInLine) {
       output.add(',');
     }
     firstEntryInLine = false;
 
     encodeVLQ(output, targetColumn - previousTargetColumn);
     previousTargetColumn = targetColumn;
 
-    if (sourceUrl === null) {
-      return;
-    }
+    if (entry.sourceLocation === null) return;
+
+    String sourceUrl = entry.sourceLocation.getSourceUrl();
+    int sourceLine = entry.sourceLocation.getLine();
+    int sourceColumn = entry.sourceLocation.getColumn();
+    String sourceName = entry.sourceLocation.getSourceName();
 
     int sourceUrlIndex = indexOf(sourceUrlList, sourceUrl, sourceUrlMap);
     encodeVLQ(output, sourceUrlIndex - previousSourceUrlIndex);
     previousSourceUrlIndex = sourceUrlIndex;
 
     encodeVLQ(output, sourceLine - previousSourceLine);
     previousSourceLine = sourceLine;
     encodeVLQ(output, sourceColumn - previousSourceColumn);
     previousSourceColumn = sourceColumn;
 
@@ skipping 26 matching lines @@
       int digit = value & VLQ_BASE_MASK;
       value >>= VLQ_BASE_SHIFT;
       if (value > 0) {
         digit |= VLQ_CONTINUATION_BIT;
       }
       output.add(BASE64_DIGITS[digit]);
     } while (value > 0);
   }
 }
 
 class _Entry {

[ahe, 2012/09/08 08:55:50]

Why is this class private?

[podivilov, 2012/09/10 11:13:23]

Done.

+  SourceFileLocation sourceLocation;
+  int targetOffset;
+
+  _Entry(this.sourceLocation, this.targetOffset);
+}
+
+class SourceFileLocation {
   SourceFile sourceFile;
-  int sourceOffset;
-  String sourceName;
-  int targetOffset;
-  _Entry(this.sourceFile, this.sourceOffset, this.sourceName,
-         this.targetOffset);
+  Token token;
+  int line;
+
+  SourceFileLocation(this.sourceFile, this.token) {
+    assert(token.charOffset < sourceFile.text.length);
+  }
+
+  String getSourceUrl() => sourceFile.filename;
+
+  int getLine() {
+    if (line == null) line = sourceFile.getLine(token.charOffset);
+    return line;
+  }
+
+  int getColumn() => sourceFile.getColumn(getLine(), token.charOffset);
+
+  String getSourceName() {
+    if (token.kind === IDENTIFIER_TOKEN) return token.slowToString();

[ahe, 2012/09/08 08:55:50]

This should be isIdentifier(token) which is defined in parser.dart. Feel free to
move it to token.dart or something so it is exported by scannerlib.

[podivilov, 2012/09/10 11:13:23]

Done.

+    return null;
+  }
 }