Minor tweaks to the core library.

dart/frog/leg/lib/string_helper.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.
 
 class StringMatch implements Match {
   const StringMatch(int this._start,
                     String this.str,
                     String this.pattern);
 
   int start() => _start;
@@ skipping 14 matching lines @@
       result.add(group(g));
     }
     return result;
   }
 
   final int _start;
   final String str;
   final String pattern;
 }
 
-allMatchesInStringUnchecked(receiver, str) {
-  var result = new List();
-  var length = receiver.length;
-  if (length === 0) {
-    return result;
-  }
-
-  var strLength = str.length;
-  for (var i = 0; i < strLength;) {
-    var index = str.indexOf(receiver, i);
-    if (index < 0) {
-      return result;
+List<Match> allMatchesInStringUnchecked(String needle, String haystack) {
+  // Copied from StringBase.allMatches in
+  // ../../../runtime/lib/string.dart
+  List<Match> result = new List<Match>();
+  int length = haystack.length;
+  int patternLength = needle.length;
+  int startIndex = 0;
+  while (true) {
+    int position = haystack.indexOf(needle, startIndex);
+    if (position == -1) {
+      break;
     }
-    result.add(new StringMatch(index, str, receiver));
-    i = index + length;
+    result.add(new StringMatch(position, haystack, needle));
+    int endIndex = position + patternLength;
+    if (endIndex == length) {
+      break;
+    } else if (position == endIndex) {
+      ++startIndex;  // empty match, advance and restart
+    } else {
+      startIndex = endIndex;
+    }
   }
   return result;
 }
 
 stringContainsUnchecked(receiver, other, startIndex) {
   if (other is String) {
     return receiver.indexOf(other, startIndex) !== -1;
   } else if (other is JSSyntaxRegExp) {
     return other.hasMatch(receiver.substring(startIndex));
   } else {
@@ skipping 52 matching lines @@
 stringSplitUnchecked(receiver, pattern) {
   if (pattern is String) {
     return JS('List', @'#.split(#)', receiver, pattern);
   } else if (pattern is JSSyntaxRegExp) {
     var re = regExpGetNative(pattern);
     return JS('List', @'#.split(#)', receiver, re);
   } else {
     throw "StringImplementation.split(Pattern) UNIMPLEMENTED";
   }
 }