- Use simplified token location call where appropriate.

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 http://pub.dartlang.org/stuff.dart.js:560:28
 final _v8Frame = new RegExp(
     r'^\s*at (?:([^\s].*?)(?: \[as [^\]]+\])? '
     r'\((.+):(\d+):(\d+)\)|(.+):(\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
@@ skipping 77 matching lines @@
     // with "...".
     if (frame == '...') {
       return new Frame(new Uri(), null, null, '...');
     }
 
     var match = _vmFrame.firstMatch(frame);
     if (match == null) {
       throw new FormatException("Couldn't parse VM stack trace line '$frame'.");
     }
 
+    // Get the pieces out of the regexp match. Function, URI and line should
+    // always be found. The column is optional.
+    var member = match[1].replaceAll("<anonymous closure>", "<fn>");
     var uri = Uri.parse(match[2]);
-    var member = match[1].replaceAll("<anonymous closure>", "<fn>");
-    return new Frame(uri, int.parse(match[3]), int.parse(match[4]), member);
+    var line = int.parse(match[3]);
+    var col = null;

[Bob Nystrom, 2013/09/24 17:53:56]

"col" -> "column".

[Ivan Posva, 2013/09/24 20:55:11]

Done.

+    var col_match = match[4];

[Bob Nystrom, 2013/09/24 17:53:56]

"col_match" -> "columnMatch".

[nweiz, 2013/09/24 20:16:03]

This variable seems superfluous. Just use match[4] instead.

[Ivan Posva, 2013/09/24 20:55:11]

Done.

[Ivan Posva, 2013/09/24 20:55:11]

Every time you access that same array element, you duplicate more strings for no
reason.

[nweiz, 2013/09/24 20:57:11]

I care about that a couple orders of magnitude less than I care about code
cleanliness.

+    if (col_match != null) {
+      col = int.parse(col_match);
+    }
+    return new Frame(uri, line, col, member);
   }
 
   /// Parses a string representation of a Chrome/V8 stack frame.
   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 stack frames can be in two forms.
@@ skipping 60 matching lines @@
 
     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';
 }