- Remove type arguments from internal classes and interfaces.

lib/utf/utf_core.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.
 
 /**
  * Provide a list of Unicode codepoints for a given string.
  */
 List<int> stringToCodepoints(String str) {
   List<int> codepoints;
   // TODO _is16BitCodeUnit() is used to work around a bug with frog/dartc
@@ skipping 58 matching lines @@
 final int UNICODE_UTF16_HI_MASK = 0xffc00;
 final int UNICODE_UTF16_LO_MASK = 0x3ff;
 
 /**
  * Encode code points as UTF16 code units.
  */
 List<int> _codepointsToUtf16CodeUnits(
     List<int> codepoints, [int offset = 0, int length,
     int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
 
-  _ListRange<int> listRange = new _ListRange<int>(codepoints, offset, length);
+  _ListRange listRange = new _ListRange(codepoints, offset, length);
   int encodedLength = 0;
   for (int value in listRange) {
     if ((value >= 0 && value < UNICODE_UTF16_RESERVED_LO) ||
         (value > UNICODE_UTF16_RESERVED_HI && value <= UNICODE_PLANE_ONE_MAX)) {
       encodedLength++;
     } else if (value > UNICODE_PLANE_ONE_MAX &&
         value <= UNICODE_VALID_RANGE_MAX) {
       encodedLength += 2;
     } else {
       encodedLength++;
@@ skipping 21 matching lines @@
   }
   return codeUnitsBuffer;
 }
 
 /**
  * Decodes the utf16 codeunits to codepoints.
  */
 List<int> _utf16CodeUnitsToCodepoints(
     List<int> utf16CodeUnits, [int offset = 0, int length,
     int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
-  _ListRangeIterator<int> source =
-      (new _ListRange<int>(utf16CodeUnits, offset, length)).iterator();
+  _ListRangeIterator source =
+      (new _ListRange(utf16CodeUnits, offset, length)).iterator();
   Utf16CodeUnitDecoder decoder = new Utf16CodeUnitDecoder
       .fromListRangeIterator(source, replacementCodepoint);
   List<int> codepoints = new List<int>(source.remaining);
   int i = 0;
   while (decoder.hasNext()) {
     codepoints[i++] = decoder.next();
   }
   if (i == codepoints.length) {
     return codepoints;
   } else {
     List<int> codepointTrunc = new List<int>(i);
     codepointTrunc.setRange(0, i, codepoints);
     return codepointTrunc;
   }
 }
 
 /**
  * An Iterator<int> of codepoints built on an Iterator of UTF-16 code units.
  * The parameters can override the default Unicode replacement character. Set
  * the replacementCharacter to null to throw an IllegalArgumentException
  * rather than replace the bad value.
  */
 class Utf16CodeUnitDecoder implements Iterator<int> {
-  final _ListRangeIterator<int> utf16CodeUnitIterator;
+  final _ListRangeIterator utf16CodeUnitIterator;
   final int replacementCodepoint;
 
   Utf16CodeUnitDecoder(List<int> utf16CodeUnits, [int offset = 0, int length,
       int this.replacementCodepoint =
       UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) :
       utf16CodeUnitIterator = (new _ListRange(utf16CodeUnits, offset, length))
           .iterator();
 
   Utf16CodeUnitDecoder.fromListRangeIterator(
-      _ListRangeIterator<int> this.utf16CodeUnitIterator,
+      _ListRangeIterator this.utf16CodeUnitIterator,
       int this.replacementCodepoint);
 
   Iterator<int> iterator() => this;
 
   bool hasNext() => utf16CodeUnitIterator.hasNext();
 
   int next() {
     int value = utf16CodeUnitIterator.next();
     if (value < 0) {
       if (replacementCodepoint != null) {
@@ skipping 35 matching lines @@
           "Invalid UTF16 at ${utf16CodeUnitIterator.position}");
     }
   }
 }
 
 /**
  * _ListRange in an internal type used to create a lightweight Interable on a
  * range within a source list. DO NOT MODIFY the underlying list while
  * iterating over it. The results of doing so are undefined.
  */
-class _ListRange<T> implements Iterable<T> {
-  final List<T> _source;
+class _ListRange implements Iterable {
+  final List _source;
   final int _offset;
   final int _length;
 
-  _ListRange(List<T> source, [int offset = 0, int length]) :
-      this._source = source, this._offset = offset,
+  _ListRange(source, [offset = 0, length]) :
+      this._source = source,
+      this._offset = offset,
       this._length = (length == null ? source.length - offset : length) {
     if (_offset < 0 || _offset > _source.length) {
       throw new IndexOutOfRangeException("offset out of range (< 0)");
     }
     if (_length != null && (_length < 0)) {
       throw new IndexOutOfRangeException("length out of range (< 0)");
     }
     if (_length + _offset > _source.length) {
       throw new IndexOutOfRangeException("offset + length > source.length");
     }
   }
 
-  _ListRangeIterator<T> iterator() =>
+  _ListRangeIterator iterator() =>
       new _ListRangeIteratorImpl(_source, _offset, _offset + _length);
 
   int get length() => _length;
 }
 
 /**
  * The _ListRangeIterator provides more capabilities than a standard iterator,
  * including the ability to get the current position, count remaining items,
  * and move forward/backward within the iterator.
  */
-interface _ListRangeIterator<T> extends Iterator<T> {
+interface _ListRangeIterator extends Iterator<int> {
   bool hasNext();
-  T next();
+  int next();
   int get position();
-  void backup([int by]);
+  void backup([by]);
   int get remaining();
-  void skip([int count]);
+  void skip([count]);
 }
 
-class _ListRangeIteratorImpl<T> implements _ListRangeIterator<T> {
-  final List<T> _source;
+class _ListRangeIteratorImpl implements _ListRangeIterator {
+  final List<int> _source;
   int _offset;
   final int _end;
 
-  _ListRangeIteratorImpl(List<T> source, int offset, int end) :
-      _source = source, _offset = offset, _end = end;
+  _ListRangeIteratorImpl(this._source, this._offset, this._end);
 
   bool hasNext() => _offset < _end;
-  T next() => _source[_offset++];
+
+  int next() => _source[_offset++];
+
   int get position() => _offset;
+
   void backup([int by = 1]) {
     _offset -= by;
   }
+
   int get remaining() => _end - _offset;
+
   void skip([int count = 1]) {
     _offset += count;
   }
 }