Support Safari 6.1's new stack trace format in pkg/stack_trace.

pkg/stack_trace/lib/src/frame.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.
 
 library frame;
 
 
 import 'package:path/path.dart' as path;
 
 import 'trace.dart';
 
 // #1      Foo._bar (file:///home/nweiz/code/stuff.dart:42:21)
 final _vmFrame = new RegExp(
     r'^#\d+\s+([^\s].*) \((.+?):(\d+)(?::(\d+))?\)$');
 
 //     at VW.call$0 (http://pub.dartlang.org/stuff.dart.js:560:28)
 //     at http://pub.dartlang.org/stuff.dart.js:560:28
 final _v8Frame = new RegExp(
     r'^\s*at (?:([^\s].*?)(?: \[as [^\]]+\])? '
     r'\((.+):(\d+):(\d+)\)|(.+):(\d+):(\d+))$');
 
+/// foo$bar$0@http://pub.dartlang.org/stuff.dart.js:560:28
+/// http://pub.dartlang.org/stuff.dart.js:560:28
+final _safariFrame = new RegExp(r"^(?:([0-9A-Za-z_$]*)@)?(.*):(\d*):(\d*)$");
+
 // .VW.call$0@http://pub.dartlang.org/stuff.dart.js:560
 // .VW.call$0("arg")@http://pub.dartlang.org/stuff.dart.js:560
 // .VW.call$0/name<@http://pub.dartlang.org/stuff.dart.js:560
 final _firefoxFrame = new RegExp(
     r'^([^@(/]*)(?:\(.*\))?((?:/[^/]*)*)(?:\(.*\))?@(.*):(\d+)$');
 
 // foo/bar.dart 10:11 in Foo._bar
 // http://dartlang.org/foo/bar.dart in Foo._bar
 final _friendlyFrame = new RegExp(
     r'^([^\s]+)(?: (\d+)(?::(\d+))?)?\s+([^\d][^\s]*)$');
@@ skipping 130 matching lines @@
     var member = match[1];
     member += new List.filled('/'.allMatches(match[2]).length, ".<fn>").join();
     if (member == '') member = '<fn>';
 
     // Some Firefox members have initial dots. We remove them for consistency
     // with other platforms.
     member = member.replaceFirst(_initialDot, '');
     return new Frame(uri, int.parse(match[4]), null, member);
   }
 
-  /// Parses a string representation of a Safari stack frame.
+  /// Parses a string representation of a Safari 6.0 stack frame.
   ///
-  /// Safari 6+ frames look just like Firefox frames. Prior to Safari 6, stack
-  /// traces can't be retrieved.
-  factory Frame.parseSafari(String frame) => new Frame.parseFirefox(frame);
+  /// Safari 6.0 frames look just like Firefox frames. Prior to Safari 6.0,
+  /// stack traces can't be retrieved.
+  factory Frame.parseSafari6_0(String frame) => new Frame.parseFirefox(frame);
+
+  /// Parses a string representation of a Safari 6.1+ stack frame.
+  factory Frame.parseSafari6_1(String frame) {
+    var match = _safariFrame.firstMatch(frame);
+    if (match == null) {
+      throw new FormatException(
+          "Couldn't parse Safari stack trace line '$frame'.");
+    }
+
+    var uri = Uri.parse(match[2]);
+    var member = match[1];
+    if (member == null) member = '<fn>';
+    var line = match[3] == '' ? null : int.parse(match[3]);
+    var column = match[4] == '' ? null : int.parse(match[4]);
+    return new Frame(uri, line, column, member);
+  }
 
   /// Parses this package's string representation of a stack frame.
   factory Frame.parseFriendly(String frame) {
     var match = _friendlyFrame.firstMatch(frame);
     if (match == null) {
       throw new FormatException(
           "Couldn't parse package:stack_trace stack trace line '$frame'.");
     }
 
     var uri = Uri.parse(match[1]);
     // If there's no scheme, this is a relative URI. We should interpret it as
     // relative to the current working directory.
     if (uri.scheme == '') {
       uri = path.toUri(path.absolute(path.fromUri(uri)));
     }
 
     var line = match[2] == null ? null : int.parse(match[2]);
     var column = match[3] == null ? null : int.parse(match[3]);
     return new Frame(uri, line, column, match[4]);
   }
 
   Frame(this.uri, this.line, this.column, this.member);
 
   String toString() => '$location in $member';
 }