Improve String and RegExp implementations.

dart/frog/leg/lib/mockimpl.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.
 
 // Mocks of classes and interfaces that Leg cannot read directly.
 
 // TODO(ahe): Remove this file.
 
 class JSSyntaxRegExp implements RegExp {
   final String pattern;
   final bool multiLine;
   final bool ignoreCase;
   final RegExpWrapper _re;
 
-  const JSSyntaxRegExp(String pattern, [bool multiLine, bool ignoreCase])
+  const JSSyntaxRegExp(String pattern,
+                       [bool multiLine = false, bool ignoreCase = false])
     // TODO(ahe): Redirect to _internal when that is supported.

[ngeoffray, 2012/02/21 12:15:53]

I believe that is implemented now.

     : this.pattern = pattern,
       this.multiLine = multiLine,
       this.ignoreCase = ignoreCase,
       this._re = const RegExpWrapper(pattern, multiLine, ignoreCase, false);
 
   const JSSyntaxRegExp._internal(String pattern, bool multiLine,
                                  bool ignoreCase, bool global)
     : this.pattern = pattern,
       this.multiLine = multiLine,
       this.ignoreCase = ignoreCase,
       this._re = const RegExpWrapper(pattern, multiLine, ignoreCase, global);
 
   Match firstMatch(String str) {
     List<String> m = _re.exec(str);
     if (m === null) return null;
     var matchStart = RegExpWrapper.matchStart(m);
-    return new MatchImplementation(pattern, str, matchStart,
-                                   _re.lastIndex(), m);
+    // m.lastIndex only works with flag 'g'.
+    var matchEnd = matchStart + m[0].length;
+    return new MatchImplementation(pattern, str, matchStart, matchEnd, m);
   }
 
   bool hasMatch(String str) => _re.test(str);
 
   String stringMatch(String str) {
     var match = firstMatch(str);
     return match === null ? null : match.group(0);
   }
 
-  Iterable<Match> allMatches(String str) => new _AllMatchesIterable(this, str);
+  Iterable<Match> allMatches(String str) {
+    checkString(str);
+    return new _AllMatchesIterable(this, str);
+  }
 
   /**
    * Returns a new RegExp with the same pattern as this one and with the
    * "global" flag set. This allows us to match this RegExp against a string
    * multiple times, to support things like [allMatches] and
    * [String.replaceAll].
    *
    * Note that the returned RegExp disobeys the normal API in that it maintains
    * state about the location of the last match.
    */
@@ skipping 11 matching lines @@
       List<String> this._groups);
 
   final String pattern;
   final String str;
   final int _start;
   final int _end;
   final List<String> _groups;
 
   int start() => _start;
   int end() => _end;
-  String group(int group) => _groups[group];
-  String operator [](int group) => _groups[group];
-  int groupCount() => _groups.length;
+  String group(int index) => stringify(_groups[index]);

[ngeoffray, 2012/02/21 12:15:53]

stringify is a weird name for here. I would implement the logic in this method,
since that's mostly trying to match a spec.

+  String operator [](int index) => group(index);
+  int groupCount() => _groups.length - 1;
 
   List<String> groups(List<int> groups) {
     List<String> out = [];
-    for (int group in groups) {
-      out.add(_groups[group]);
+    for (int i in groups) {
+      out.add(group(i));
     }
     return out;
   }
 }
 
 class _AllMatchesIterable implements Iterable<Match> {
   final JSSyntaxRegExp _re;
   final String _str;
 
   const _AllMatchesIterable(this._re, this._str);
@@ skipping 290 matching lines @@
     }
     String twoDigitMinutes =
         twoDigits(inMinutes.remainder(Duration.MINUTES_PER_HOUR));
     String twoDigitSeconds =
         twoDigits(inSeconds.remainder(Duration.SECONDS_PER_MINUTE));
     String threeDigitMs =
         threeDigits(inMilliseconds.remainder(Duration.MILLISECONDS_PER_SECOND));
     return "${inHours}:${twoDigitMinutes}:${twoDigitSeconds}.${threeDigitMs}";
   }
 }