Code review changes for r31644.

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+))?\)$');
+    r'^#\d+\s+(\S.*) \((.+?):(\d+)(?::(\d+))?\)$');
 
 //     at VW.call$0 (http://pub.dartlang.org/stuff.dart.js:560:28)
 //     at VW.call$0 (eval as fn
 //         (http://pub.dartlang.org/stuff.dart.js:560:28), efn:3:28)
 //     at http://pub.dartlang.org/stuff.dart.js:560:28
 final _v8Frame = new RegExp(
-    r'^\s*at (?:([^\s].*?)(?: \[as [^\]]+\])? \((.*)\)|(.*))$');
+    r'^\s*at (?:(\S.*?)(?: \[as [^\]]+\])? \((.*)\)|(.*))$');
 
 // http://pub.dartlang.org/stuff.dart.js:560:28
 final _v8UrlLocation = new RegExp(r'^(.*):(\d+):(\d+)$');
 
 // eval as function (http://pub.dartlang.org/stuff.dart.js:560:28), efn:3:28
 // eval as function (http://pub.dartlang.org/stuff.dart.js:560:28)
 // eval as function (eval as otherFunction
 //     (http://pub.dartlang.org/stuff.dart.js:560:28))
 final _v8EvalLocation = new RegExp(
-    r'^eval at (?:[^\s].*?) \((.*)\)(?:, .*?:\d+:\d+)?$');
+    r'^eval at (?:\S.*?) \((.*)\)(?:, .*?:\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]*)$');
+    r'^(\S+)(?: (\d+)(?::(\d+))?)?\s+([^\d]\S*)$');
 
 final _initialDot = new RegExp(r"^\.");
 
 /// A single stack frame. Each frame points to a precise location in Dart code.
 class Frame {
   /// The URI of the file in which the code is located.
   ///
   /// This URI will usually have the scheme `dart`, `file`, `http`, or `https`.
   final Uri uri;
 
@@ skipping 90 matching lines @@
   factory Frame.parseV8(String frame) {
     var match = _v8Frame.firstMatch(frame);
     if (match == null) {
       throw new FormatException("Couldn't parse V8 stack trace line '$frame'.");
     }
 
     // v8 location strings can be arbitrarily-nested, since it adds a layer of
     // nesting for each eval performed on that line.
     parseLocation(location, member) {
       var evalMatch = _v8EvalLocation.firstMatch(location);
-      if (evalMatch != null) return parseLocation(evalMatch[1], member);
-      
+      while (evalMatch != null) {
+        location = evalMatch[1];
+        evalMatch = _v8EvalLocation.firstMatch(location);
+      }
 
       var urlMatch = _v8UrlLocation.firstMatch(location);
       if (urlMatch == null) {
         throw new FormatException(
             "Couldn't parse V8 stack trace line '$frame'.");
       }
 
       return new Frame(
           _uriOrPathToUri(urlMatch[1]),
           int.parse(urlMatch[2]),
@@ skipping 102 matching lines @@
     // their stack frames. However, if we do get a relative path, we should
     // handle it gracefully.
     if (uriOrPath.contains('\\')) return path.windows.toUri(uriOrPath);
     return Uri.parse(uriOrPath);
   }
 
   Frame(this.uri, this.line, this.column, this.member);
 
   String toString() => '$location in $member';
 }